From 7e79ef8fe08e38bf58d751ec0fa0dbb2b54adae1 Mon Sep 17 00:00:00 2001 From: Sirajudeen Date: Thu, 17 Sep 2020 18:32:35 +0000 Subject: [PATCH] Align CAPD to use catalogue-driven versions * Update CAPD manifest to inherit the clusterctl from functions and patch just the difference which is the infrastructure providers. Change-Id: I0702aa6127531792df17b5ff69a2dba2242d79ac --- .../function/capd/v0.3.11/manager/manager_auth_proxy_patch.yaml | 2 +- .../function/capd/v0.3.11/manager/manager_image_patch.yaml | 2 +- manifests/function/clusterctl/clusterctl.yaml | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) 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 42d3f1771..794f72b49 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: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.0 + image: ${CONTAINER_CAPD_AUTH_PROXY} 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 2b0a3fe80..7f334e41c 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: gcr.io/k8s-staging-cluster-api/capd-manager:master + - image: ${CONTAINER_CAPD_MANAGER} name: manager diff --git a/manifests/function/clusterctl/clusterctl.yaml b/manifests/function/clusterctl/clusterctl.yaml index 7380053a3..fde2f6602 100644 --- a/manifests/function/clusterctl/clusterctl.yaml +++ b/manifests/function/clusterctl/clusterctl.yaml @@ -39,7 +39,9 @@ additional-vars: CONTAINER_CACPK_MANAGER: us.gcr.io/k8s-artifacts-prod/cluster-api/kubeadm-control-plane-controller:v0.3.7 CONTAINER_CABPK_MANAGER: us.gcr.io/k8s-artifacts-prod/cluster-api/kubeadm-bootstrap-controller:v0.3.7 CONTAINER_CAPI_MANAGER: us.gcr.io/k8s-artifacts-prod/cluster-api/cluster-api-controller:v0.3.7 + CONTAINER_CAPD_MANAGER: gcr.io/k8s-staging-cluster-api/capd-manager:v20201019-v0.3.10-86-gc1647481f CONTAINER_CAPM3_AUTH_PROXY: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.0 CONTAINER_CACPK_AUTH_PROXY: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.1 CONTAINER_CABPK_AUTH_PROXY: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.1 CONTAINER_CAPI_AUTH_PROXY: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.1 + CONTAINER_CAPD_AUTH_PROXY: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.0