From 165816eeffe42b772b08fb77b8707cf5cf983a24 Mon Sep 17 00:00:00 2001 From: Tracey Bogue Date: Tue, 14 Sep 2021 08:34:44 -0500 Subject: [PATCH] Update helm/source controller versions and add imagePullSecrets The new versions of the controllers are aligned with Kubernetes version 1.21 which will soon be the default. An imagePullSecrets entry has been added to both deployments to allow the image to be pulled after a switchover on DX. Testing: * Deployed AIO-DX system. * Verified that both helm and source controller pods were running. * Rebooted controller-0. * Verified that both helm and source controller pods came up on controller-1. Story: 2009138 Task: 43078 Signed-off-by: Tracey Bogue Change-Id: I1e35870d26069d6e15bc616587c316d9d2bc6d23 --- .../templates/fluxcd-deployments.yaml.j2 | 4 ++++ .../vars/k8s-v1.18.1/system-images.yml | 4 ++-- .../vars/k8s-v1.19.13/system-images.yml | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/playbookconfig/src/playbooks/roles/bootstrap/bringup-essential-services/templates/fluxcd-deployments.yaml.j2 b/playbookconfig/src/playbooks/roles/bootstrap/bringup-essential-services/templates/fluxcd-deployments.yaml.j2 index f74f37acb..3ca8f63ec 100644 --- a/playbookconfig/src/playbooks/roles/bootstrap/bringup-essential-services/templates/fluxcd-deployments.yaml.j2 +++ b/playbookconfig/src/playbooks/roles/bootstrap/bringup-essential-services/templates/fluxcd-deployments.yaml.j2 @@ -59,6 +59,8 @@ spec: volumeMounts: - mountPath: /tmp name: temp + imagePullSecrets: + - name: default-registry-key nodeSelector: node-role.kubernetes.io/master: "" terminationGracePeriodSeconds: 600 @@ -134,6 +136,8 @@ spec: name: data - mountPath: /tmp name: tmp + imagePullSecrets: + - name: default-registry-key nodeSelector: node-role.kubernetes.io/master: "" securityContext: diff --git a/playbookconfig/src/playbooks/roles/common/load-images-information/vars/k8s-v1.18.1/system-images.yml b/playbookconfig/src/playbooks/roles/common/load-images-information/vars/k8s-v1.18.1/system-images.yml index 543729dca..8dc1ab0f9 100644 --- a/playbookconfig/src/playbooks/roles/common/load-images-information/vars/k8s-v1.18.1/system-images.yml +++ b/playbookconfig/src/playbooks/roles/common/load-images-information/vars/k8s-v1.18.1/system-images.yml @@ -16,5 +16,5 @@ sriov_network_device_img: docker.io/starlingx/k8s-plugins-sriov-network-device:s # in the kubernetes github repo snapshot_controller_img: quay.io/k8scsi/snapshot-controller:v2.0.0-rc2 rvmc_img: docker.io/starlingx/rvmc:stx.5.0-v1.0.0 -flux_helm_controller_img: docker.io/fluxcd/helm-controller:v0.10.1 -flux_source_controller_img: docker.io/fluxcd/source-controller:v0.13.2 +flux_helm_controller_img: docker.io/fluxcd/helm-controller:v0.11.2 +flux_source_controller_img: docker.io/fluxcd/source-controller:v0.15.4 diff --git a/playbookconfig/src/playbooks/roles/common/load-images-information/vars/k8s-v1.19.13/system-images.yml b/playbookconfig/src/playbooks/roles/common/load-images-information/vars/k8s-v1.19.13/system-images.yml index 72023a1a2..eed816199 100644 --- a/playbookconfig/src/playbooks/roles/common/load-images-information/vars/k8s-v1.19.13/system-images.yml +++ b/playbookconfig/src/playbooks/roles/common/load-images-information/vars/k8s-v1.19.13/system-images.yml @@ -16,5 +16,5 @@ sriov_network_device_img: ghcr.io/k8snetworkplumbingwg/sriov-network-device-plug # in the kubernetes github repo snapshot_controller_img: quay.io/k8scsi/snapshot-controller:v2.0.0-rc2 rvmc_img: docker.io/starlingx/rvmc:stx.5.0-v1.0.0 -flux_helm_controller_img: docker.io/fluxcd/helm-controller:v0.10.1 -flux_source_controller_img: docker.io/fluxcd/source-controller:v0.13.2 +flux_helm_controller_img: docker.io/fluxcd/helm-controller:v0.11.2 +flux_source_controller_img: docker.io/fluxcd/source-controller:v0.15.4