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
This commit is contained in:
parent
dbb006c02d
commit
93b7de1ba6
@ -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
|
||||
|
@ -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/"
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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:
|
||||
|
@ -14,5 +14,10 @@
|
||||
"v0.3.0": "airshipctl/manifests/function/capg/v0.3.0"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"op": "replace",
|
||||
"path": "/env-vars",
|
||||
"value": true
|
||||
}
|
||||
]
|
||||
|
Loading…
x
Reference in New Issue
Block a user