From 93b7de1ba64dfd58b0e8e9f75806ff9549da3c90 Mon Sep 17 00:00:00 2001 From: Ratnopam Chakrabarti Date: Sun, 29 Nov 2020 16:19:47 -0500 Subject: [PATCH] Update CAPG provider config Added CAPG specific envs to initialize ephemeral cluster with CAPG provider components Added support to replace env vars Relates-To: #425 Change-Id: I5d38a3f703683b68b18f4ccbaa52331de8484d6e --- .../versions-airshipctl.yaml | 3 +++ .../manager/manager_auth_proxy_patch.yaml | 2 +- .../v0.3.0/manager/manager_image_patch.yaml | 2 +- manifests/function/clusterctl/clusterctl.yaml | 2 ++ .../clusterctl/replacements/versions.yaml | 21 +++++++++++++++++++ .../phases/infrastructure-providers.json | 5 +++++ 6 files changed, 33 insertions(+), 2 deletions(-) diff --git a/manifests/function/airshipctl-base-catalogues/versions-airshipctl.yaml b/manifests/function/airshipctl-base-catalogues/versions-airshipctl.yaml index 5084ae5f3..f76df6efb 100644 --- a/manifests/function/airshipctl-base-catalogues/versions-airshipctl.yaml +++ b/manifests/function/airshipctl-base-catalogues/versions-airshipctl.yaml @@ -49,6 +49,9 @@ images: 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 + capg: + manager: gcr.io/k8s-staging-cluster-api-gcp/cluster-api-gcp-controller:master + auth_proxy: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.1 capi: manager: repository: us.gcr.io/k8s-artifacts-prod/cluster-api diff --git a/manifests/function/capg/v0.3.0/manager/manager_auth_proxy_patch.yaml b/manifests/function/capg/v0.3.0/manager/manager_auth_proxy_patch.yaml index 61cb5e7cb..6c9e0a053 100644 --- a/manifests/function/capg/v0.3.0/manager/manager_auth_proxy_patch.yaml +++ b/manifests/function/capg/v0.3.0/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.1 + image: ${CONTAINER_CAPG_AUTH_PROXY} args: - "--secure-listen-address=0.0.0.0:8443" - "--upstream=http://127.0.0.1:8080/" diff --git a/manifests/function/capg/v0.3.0/manager/manager_image_patch.yaml b/manifests/function/capg/v0.3.0/manager/manager_image_patch.yaml index 983e6cd81..3dab1b517 100644 --- a/manifests/function/capg/v0.3.0/manager/manager_image_patch.yaml +++ b/manifests/function/capg/v0.3.0/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-gcp/cluster-api-gcp-controller:master + - image: ${CONTAINER_CAPG_MANAGER} name: manager diff --git a/manifests/function/clusterctl/clusterctl.yaml b/manifests/function/clusterctl/clusterctl.yaml index 4167b0d8c..bea9c8039 100644 --- a/manifests/function/clusterctl/clusterctl.yaml +++ b/manifests/function/clusterctl/clusterctl.yaml @@ -73,3 +73,5 @@ additional-vars: 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 + CONTAINER_CAPG_MANAGER: gcr.io/k8s-staging-cluster-api-gcp/cluster-api-gcp-controller:master + CONTAINER_CAPG_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..eb57a054a 100644 --- a/manifests/function/clusterctl/replacements/versions.yaml +++ b/manifests/function/clusterctl/replacements/versions.yaml @@ -113,6 +113,27 @@ replacements: kind: Clusterctl name: clusterctl_init fieldrefs: ["{.additional-vars.CONTAINER_CAPO_AUTH_PROXY}"] +# Replace capg versions +- source: + objref: + kind: VariableCatalogue + name: versions-airshipctl + fieldref: "{.images.capg.manager}" + target: + objref: + kind: Clusterctl + name: clusterctl_init + fieldrefs: ["{.additional-vars.CONTAINER_CAPG_MANAGER}"] +- source: + objref: + kind: VariableCatalogue + name: versions-airshipctl + fieldref: "{.images.capg.auth_proxy}" + target: + objref: + kind: Clusterctl + name: clusterctl_init + fieldrefs: ["{.additional-vars.CONTAINER_CAPG_AUTH_PROXY}"] # Replace capi versions - source: objref: diff --git a/manifests/site/gcp-test-site/phases/infrastructure-providers.json b/manifests/site/gcp-test-site/phases/infrastructure-providers.json index bb14b5617..0e6fb40f6 100644 --- a/manifests/site/gcp-test-site/phases/infrastructure-providers.json +++ b/manifests/site/gcp-test-site/phases/infrastructure-providers.json @@ -14,5 +14,10 @@ "v0.3.0": "airshipctl/manifests/function/capg/v0.3.0" } } + }, +{ + "op": "replace", + "path": "/env-vars", + "value": true } ]