airship
/
airshipctl
Code Issues Proposed changes

Image override for CAPO components 

Change-Id: I1cdc3f17bf10cd4831670c5aabc509e639c9ebc3
Relates-To: #431
This commit is contained in:
Sirajudeen 2021-01-07 15:57:20 +00:00
parent 0b2c9925bf
commit 9f794360be
5 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/function/airshipctl-base-catalogues/versions-airshipctl.yaml
View File

@ -51,8 +51,12 @@ images:
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
manager:
repository: gcr.io/k8s-staging-capi-openstack
tag: v20200707-v0.3.1
auth_proxy:
repository: gcr.io/kubebuilder
tag: v0.4.1
capg:
manager:
repository: gcr.io/k8s-staging-cluster-api-gcp

2
manifests/function/capo/v0.3.1/manager/manager_auth_proxy_patch.yaml
View File

@ -10,7 +10,7 @@ spec:
spec:
containers:
- name: kube-rbac-proxy
image: ${CONTAINER_CAPO_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/"

2
manifests/function/capo/v0.3.1/manager/manager_image_patch.yaml
View File

@ -8,5 +8,5 @@ spec:
spec:
containers:
# Change the value of image field below to your controller image URL
- image: ${CONTAINER_CAPO_MANAGER}
- image: gcr.io/k8s-staging-capi-openstack/capi-openstack-controller-amd64:dev
name: manager

10
manifests/function/clusterctl/clusterctl.yaml
View File

@ -81,9 +81,13 @@ images:
infrastructure-gcp/kube-rbac-proxy:
repository: "gcr.io/kubebuilder"
tag: "v0.4.1"
infrastructure-openstack/capi-openstack-controller-amd64:
repository: "gcr.io/k8s-staging-capi-openstack"
tag: "v20200707-v0.3.1"
infrastructure-openstack/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
additional-vars: {}

4
manifests/function/clusterctl/replacements/versions.yaml
View File

@ -102,7 +102,7 @@ replacements:
objref:
kind: Clusterctl
name: clusterctl_init
fieldrefs: ["{.additional-vars.CONTAINER_CAPO_MANAGER}"]
fieldrefs: ["{.images.infrastructure-openstack/capi-openstack-controller-amd64}"]
- source:
objref:
kind: VariableCatalogue
@ -112,7 +112,7 @@ replacements:
objref:
kind: Clusterctl
name: clusterctl_init
fieldrefs: ["{.additional-vars.CONTAINER_CAPO_AUTH_PROXY}"]
fieldrefs: ["{.images.infrastructure-openstack/kube-rbac-proxy}"]
# Replace capg versions
- source:
objref: