Skip to content

Commit

Permalink
Pick up the latest startup-script image
Browse files Browse the repository at this point in the history
[ upstream commit 5c9b66c ]

[ backporter's note: Fixed conflict in the
install/kubernetes/Makefile.values and regenerated relevant documents. ]

Upgrading this image is not automated yet.

Ref: #25773
Ref: cilium/image-tools#218
Ref: https://quay.io/repository/cilium/startup-script?tab=tags

Signed-off-by: Michi Mutsuzaki <michi@isovalent.com>
Signed-off-by: Yutaro Hayakawa <yutaro.hayakawa@isovalent.com>
  • Loading branch information
michi-covalent authored and dylandreimerink committed Jun 9, 2023
1 parent 186cb98 commit 71728fd
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Documentation/helm-values.rst

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion install/kubernetes/Makefile.values
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export CERTGEN_VERSION:=v0.1.5@sha256:0c2b71bb3469990e7990e7e26243617aa344b5a69a
export CILIUM_ETCD_OPERATOR_REPO:=quay.io/cilium/cilium-etcd-operator
export CILIUM_ETCD_OPERATOR_VERSION:=v2.0.7@sha256:04b8327f7f992693c2cb483b999041ed8f92efc8e14f2a5f3ab95574a65ea2dc
export CILIUM_NODEINIT_REPO:=quay.io/cilium/startup-script
export CILIUM_NODEINIT_VERSION:=62bfbe88c17778aad7bef9fa57ff9e2d4a9ba0d8
export CILIUM_NODEINIT_VERSION:=62093c5c233ea914bfa26a10ba41f8780d9b737f
export CILIUM_OPERATOR_BASE_REPO:=quay.io/cilium/operator

export ETCD_REPO:=quay.io/coreos/etcd
Expand Down
2 changes: 1 addition & 1 deletion install/kubernetes/cilium/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ contributors across the globe, there is almost always someone available to help.
| nodeinit.extraEnv | object | `{}` | Additional nodeinit environment variables. |
| nodeinit.extraHostPathMounts | list | `[]` | Additional nodeinit host path mounts. |
| nodeinit.extraInitContainers | list | `[]` | Additional nodeinit init containers. |
| nodeinit.image | object | `{"override":null,"pullPolicy":"IfNotPresent","repository":"quay.io/cilium/startup-script","tag":"62bfbe88c17778aad7bef9fa57ff9e2d4a9ba0d8"}` | node-init image. |
| nodeinit.image | object | `{"override":null,"pullPolicy":"IfNotPresent","repository":"quay.io/cilium/startup-script","tag":"62093c5c233ea914bfa26a10ba41f8780d9b737f"}` | node-init image. |
| nodeinit.nodeSelector | object | `{}` | Node labels for nodeinit pod assignment ref: https://kubernetes.io/docs/user-guide/node-selection/ |
| nodeinit.podAnnotations | object | `{}` | Annotations to be added to node-init pods. |
| nodeinit.podDisruptionBudget | object | `{"enabled":true,"maxUnavailable":2}` | PodDisruptionBudget settings ref: https://kubernetes.io/docs/concepts/workloads/pods/disruptions/ |
Expand Down
2 changes: 1 addition & 1 deletion install/kubernetes/cilium/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1569,7 +1569,7 @@ nodeinit:
image:
override: ~
repository: "quay.io/cilium/startup-script"
tag: "62bfbe88c17778aad7bef9fa57ff9e2d4a9ba0d8"
tag: "62093c5c233ea914bfa26a10ba41f8780d9b737f"
pullPolicy: "IfNotPresent"

# -- The priority class to use for the nodeinit pod.
Expand Down

0 comments on commit 71728fd

Please sign in to comment.