From 15e491eb2f98c29a94847d52f0a65269dd86d5e1 Mon Sep 17 00:00:00 2001 From: Antoni Zawodny Date: Tue, 19 May 2020 11:45:09 +0200 Subject: [PATCH] Update kube-addon-manager to v9.1.1 --- cluster/gce/gci/configure-helper.sh | 1 + cluster/gce/manifests/kube-addon-manager.yaml | 4 +++- test/kubemark/resources/manifests/kube-addon-manager.yaml | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh index 31beef02235..058ff4e2c2e 100644 --- a/cluster/gce/gci/configure-helper.sh +++ b/cluster/gce/gci/configure-helper.sh @@ -2525,6 +2525,7 @@ EOF # Place addon manager pod manifest. src_file="${src_dir}/kube-addon-manager.yaml" + sed -i -e "s@{{kubectl_prune_whitelist_override}}@${KUBECTL_PRUNE_WHITELIST_OVERRIDE:-}@g" "${src_file}" sed -i -e "s@{{kubectl_extra_prune_whitelist}}@${ADDON_MANAGER_PRUNE_WHITELIST:-}@g" "${src_file}" sed -i -e "s@{{runAsUser}}@${KUBE_ADDON_MANAGER_RUNASUSER:-2002}@g" "${src_file}" sed -i -e "s@{{runAsGroup}}@${KUBE_ADDON_MANAGER_RUNASGROUP:-2002}@g" "${src_file}" diff --git a/cluster/gce/manifests/kube-addon-manager.yaml b/cluster/gce/manifests/kube-addon-manager.yaml index 92216140c46..bce6a3a34ec 100644 --- a/cluster/gce/manifests/kube-addon-manager.yaml +++ b/cluster/gce/manifests/kube-addon-manager.yaml @@ -23,7 +23,7 @@ spec: - all # When updating version also bump it in: # - test/kubemark/resources/manifests/kube-addon-manager.yaml - image: k8s.gcr.io/kube-addon-manager:v9.0.2 + image: k8s.gcr.io/kube-addon-manager:v9.1.1 command: - /bin/bash - -c @@ -43,6 +43,8 @@ spec: name: srvkube readOnly: true env: + - name: KUBECTL_PRUNE_WHITELIST_OVERRIDE + value: {{kubectl_prune_whitelist_override}} - name: KUBECTL_EXTRA_PRUNE_WHITELIST value: {{kubectl_extra_prune_whitelist}} - name: KUBECTL_OPTS diff --git a/test/kubemark/resources/manifests/kube-addon-manager.yaml b/test/kubemark/resources/manifests/kube-addon-manager.yaml index 10a96ba1082..2cd85b4b877 100644 --- a/test/kubemark/resources/manifests/kube-addon-manager.yaml +++ b/test/kubemark/resources/manifests/kube-addon-manager.yaml @@ -9,7 +9,7 @@ spec: hostNetwork: true containers: - name: kube-addon-manager - image: {{kube_docker_registry}}/kube-addon-manager:v9.0.2 + image: {{kube_docker_registry}}/kube-addon-manager:v9.1.1 command: - /bin/bash - -c