Skip to content

Commit 9e06faa

Browse files
authored
Merge pull request kubernetes#91240 from tosi3k/bump-am-version
Update kube-addon-manager to v9.1.1
2 parents b98d940 + 15e491e commit 9e06faa

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

cluster/gce/gci/configure-helper.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2544,6 +2544,7 @@ EOF
25442544

25452545
# Place addon manager pod manifest.
25462546
src_file="${src_dir}/kube-addon-manager.yaml"
2547+
sed -i -e "s@{{kubectl_prune_whitelist_override}}@${KUBECTL_PRUNE_WHITELIST_OVERRIDE:-}@g" "${src_file}"
25472548
sed -i -e "s@{{kubectl_extra_prune_whitelist}}@${ADDON_MANAGER_PRUNE_WHITELIST:-}@g" "${src_file}"
25482549
sed -i -e "s@{{runAsUser}}@${KUBE_ADDON_MANAGER_RUNASUSER:-2002}@g" "${src_file}"
25492550
sed -i -e "s@{{runAsGroup}}@${KUBE_ADDON_MANAGER_RUNASGROUP:-2002}@g" "${src_file}"

cluster/gce/manifests/kube-addon-manager.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ spec:
2323
- all
2424
# When updating version also bump it in:
2525
# - test/kubemark/resources/manifests/kube-addon-manager.yaml
26-
image: k8s.gcr.io/kube-addon-manager:v9.0.2
26+
image: k8s.gcr.io/kube-addon-manager:v9.1.1
2727
command:
2828
- /bin/bash
2929
- -c
@@ -43,6 +43,8 @@ spec:
4343
name: srvkube
4444
readOnly: true
4545
env:
46+
- name: KUBECTL_PRUNE_WHITELIST_OVERRIDE
47+
value: {{kubectl_prune_whitelist_override}}
4648
- name: KUBECTL_EXTRA_PRUNE_WHITELIST
4749
value: {{kubectl_extra_prune_whitelist}}
4850
- name: KUBECTL_OPTS

test/kubemark/resources/manifests/kube-addon-manager.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ spec:
99
hostNetwork: true
1010
containers:
1111
- name: kube-addon-manager
12-
image: {{kube_docker_registry}}/kube-addon-manager:v9.0.2
12+
image: {{kube_docker_registry}}/kube-addon-manager:v9.1.1
1313
command:
1414
- /bin/bash
1515
- -c

0 commit comments

Comments
 (0)