Image override for CAPG components

Change-Id: Ibc2c3174897de4417e274f2bb887ce2f8649148d
Relates-To: #431

manifests/function/airshipctl-base-catalogues/versions-airshipctl.yaml

@@ -54,8 +54,12 @@ images:
     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
+    manager:
-    auth_proxy: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.1
+      repository: gcr.io/k8s-staging-cluster-api-gcp
+      tag: master
+    auth_proxy:
+      repository: gcr.io/kubebuilder
+      tag: v0.4.1
   capi:
     manager:
       repository: us.gcr.io/k8s-artifacts-prod/cluster-api

manifests/function/capg/v0.3.0/manager/manager_auth_proxy_patch.yaml

@@ -10,7 +10,7 @@ spec:
     spec:
       containers:
       - name: kube-rbac-proxy
-        image: ${CONTAINER_CAPG_AUTH_PROXY}
+        image: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.1
         args:
         - "--secure-listen-address=0.0.0.0:8443"
         - "--upstream=http://127.0.0.1:8080/"

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: ${CONTAINER_CAPG_MANAGER}
+      - image: gcr.io/k8s-staging-cluster-api-gcp/cluster-api-gcp-controller:e2e
         name: manager

manifests/function/clusterctl/clusterctl.yaml

@@ -75,11 +75,15 @@ images:
   infrastructure-azure/kube-rbac-proxy:
     repository: "gcr.io/kubebuilder"
     tag: "v0.4.1"
+  infrastructure-gcp/cluster-api-gcp-controller:
+    repository: "gcr.io/k8s-staging-cluster-api-gcp"
+    tag: "master"
+  infrastructure-gcp/kube-rbac-proxy:
+    repository: "gcr.io/kubebuilder"
+    tag: "v0.4.1"
 
 
 # These default images can be overridden via the `replacements/` entrypoint
 additional-vars:
   CONTAINER_CAPO_MANAGER: gcr.io/k8s-staging-capi-openstack/capi-openstack-controller-amd64:v20200707-v0.3.1
   CONTAINER_CAPO_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

manifests/function/clusterctl/replacements/versions.yaml

@@ -123,7 +123,7 @@ replacements:
     objref:
       kind: Clusterctl
       name: clusterctl_init
-    fieldrefs: ["{.additional-vars.CONTAINER_CAPG_MANAGER}"]
+    fieldrefs: ["{.images.infrastructure-gcp/cluster-api-gcp-controller}"]
 - source:
     objref:
       kind: VariableCatalogue
@@ -133,7 +133,7 @@ replacements:
     objref:
       kind: Clusterctl
       name: clusterctl_init
-    fieldrefs: ["{.additional-vars.CONTAINER_CAPG_AUTH_PROXY}"]
+    fieldrefs: ["{.images.infrastructure-gcp/kube-rbac-proxy}"]
 # Replace capi versions
 - source:
     objref: