From fba17f625e57a8f982804ba3e7516f0df39efe63 Mon Sep 17 00:00:00 2001 From: Sirajudeen Date: Tue, 15 Dec 2020 23:51:16 +0000 Subject: [PATCH] Image override for CAPD components * Follow-up commit of https://review.opendev.org/c/airship/airshipctl/+/766228 for CAPD Change-Id: I9aa2e012ff27bce90ad8fb9630a697d6123b971f Relates-To: #431 --- .../airshipctl-base-catalogues/versions-airshipctl.yaml | 8 ++++++-- .../capd/v0.3.11/manager/manager_auth_proxy_patch.yaml | 2 +- .../capd/v0.3.11/manager/manager_image_patch.yaml | 2 +- manifests/function/clusterctl/clusterctl.yaml | 8 ++++++-- manifests/function/clusterctl/replacements/versions.yaml | 4 ++-- 5 files changed, 16 insertions(+), 8 deletions(-) diff --git a/manifests/function/airshipctl-base-catalogues/versions-airshipctl.yaml b/manifests/function/airshipctl-base-catalogues/versions-airshipctl.yaml index 5084ae5f3..334486ab5 100644 --- a/manifests/function/airshipctl-base-catalogues/versions-airshipctl.yaml +++ b/manifests/function/airshipctl-base-catalogues/versions-airshipctl.yaml @@ -44,8 +44,12 @@ images: repository: gcr.io/kubebuilder tag: v0.4.1 capd: - manager: gcr.io/k8s-staging-cluster-api/capd-manager:v20201019-v0.3.10-86-gc1647481f - auth_proxy: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.0 + manager: + repository: gcr.io/k8s-staging-cluster-api + tag: v20201019-v0.3.10-86-gc1647481f + auth_proxy: + repository: gcr.io/kubebuilder + tag: v0.4.0 capo: manager: gcr.io/k8s-staging-capi-openstack/capi-openstack-controller-amd64:v20200707-v0.3.1 auth_proxy: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.1 diff --git a/manifests/function/capd/v0.3.11/manager/manager_auth_proxy_patch.yaml b/manifests/function/capd/v0.3.11/manager/manager_auth_proxy_patch.yaml index 794f72b49..42d3f1771 100644 --- a/manifests/function/capd/v0.3.11/manager/manager_auth_proxy_patch.yaml +++ b/manifests/function/capd/v0.3.11/manager/manager_auth_proxy_patch.yaml @@ -10,7 +10,7 @@ spec: spec: containers: - name: kube-rbac-proxy - image: ${CONTAINER_CAPD_AUTH_PROXY} + image: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.0 args: - "--secure-listen-address=0.0.0.0:8443" - "--upstream=http://127.0.0.1:8080/" diff --git a/manifests/function/capd/v0.3.11/manager/manager_image_patch.yaml b/manifests/function/capd/v0.3.11/manager/manager_image_patch.yaml index 7f334e41c..2b0a3fe80 100644 --- a/manifests/function/capd/v0.3.11/manager/manager_image_patch.yaml +++ b/manifests/function/capd/v0.3.11/manager/manager_image_patch.yaml @@ -8,5 +8,5 @@ spec: spec: containers: # Change the value of image field below to your controller image URL - - image: ${CONTAINER_CAPD_MANAGER} + - image: gcr.io/k8s-staging-cluster-api/capd-manager:master name: manager diff --git a/manifests/function/clusterctl/clusterctl.yaml b/manifests/function/clusterctl/clusterctl.yaml index 4167b0d8c..22b4ad903 100644 --- a/manifests/function/clusterctl/clusterctl.yaml +++ b/manifests/function/clusterctl/clusterctl.yaml @@ -63,13 +63,17 @@ images: infrastructure-metal3/kube-rbac-proxy: repository: "gcr.io/kubebuilder" tag: "v0.4.0" + infrastructure-docker/capd-manager: + repository: "gcr.io/k8s-staging-cluster-api" + tag: "v20201019-v0.3.10-86-gc1647481f" + infrastructure-docker/kube-rbac-proxy: + repository: "gcr.io/kubebuilder" + tag: "v0.4.0" # These default images can be overridden via the `replacements/` entrypoint additional-vars: - CONTAINER_CAPD_MANAGER: gcr.io/k8s-staging-cluster-api/capd-manager:v20201019-v0.3.10-86-gc1647481f CONTAINER_CAPO_MANAGER: gcr.io/k8s-staging-capi-openstack/capi-openstack-controller-amd64:v20200707-v0.3.1 CONTAINER_CAPZ_MANAGER: gcr.io/k8s-staging-cluster-api-azure/cluster-api-azure-controller:v0.4.9 - CONTAINER_CAPD_AUTH_PROXY: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.0 CONTAINER_CAPO_AUTH_PROXY: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.1 CONTAINER_CAPZ_AUTH_PROXY: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.1 diff --git a/manifests/function/clusterctl/replacements/versions.yaml b/manifests/function/clusterctl/replacements/versions.yaml index 26b65126f..90a049eda 100644 --- a/manifests/function/clusterctl/replacements/versions.yaml +++ b/manifests/function/clusterctl/replacements/versions.yaml @@ -81,7 +81,7 @@ replacements: objref: kind: Clusterctl name: clusterctl_init - fieldrefs: ["{.additional-vars.CONTAINER_CAPD_MANAGER}"] + fieldrefs: ["{.images.infrastructure-docker/capd-manager}"] - source: objref: kind: VariableCatalogue @@ -91,7 +91,7 @@ replacements: objref: kind: Clusterctl name: clusterctl_init - fieldrefs: ["{.additional-vars.CONTAINER_CAPD_AUTH_PROXY}"] + fieldrefs: ["{.images.infrastructure-docker/kube-rbac-proxy}"] # Replace capo versions - source: objref: