airship/airshipctl
Code Issues Proposed changes

Image override for CAPZ components

Browse Source 
* This is follow-up commit for image override (CAPZ)

  CAPM3, CAPI, CACPK, CABPK =>
		  https://review.opendev.org/c/airship/airshipctl/+/766228
  CAPD => https://review.opendev.org/c/airship/airshipctl/+/767235

* Also added the replacements to consume values from versions-airshipctl

Change-Id: I9c908c071a76b6fca0d0e03ea27b36517bf7052a
Relates-To: #431
This commit is contained in:
Sirajudeen 2020-12-16 16:02:51 +00:00
parent 932d92664e
commit de625b10d8
5 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,6 +63,13 @@ images:
auth_proxy:
repository: gcr.io/kubebuilder
tag: v0.4.1
capz:
manager:
repository: gcr.io/k8s-staging-cluster-api-azure
tag: v0.4.9
auth_proxy:
repository: gcr.io/kubebuilder
tag: v0.4.1
baremetal_operator:
ironic: # ironic Deployment
init_bootstrap: centos

2
manifests/function/capz/v0.4.9/manager/manager_auth_proxy_patch.yaml
View File

@ -10,7 +10,7 @@ spec:
spec:
containers:
- name: kube-rbac-proxy
image: ${CONTAINER_CAPZ_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/capz/v0.4.9/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_CAPZ_MANAGER}
- image: gcr.io/k8s-staging-cluster-api-azure/cluster-api-azure-controller:latest
name: manager

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

@ -69,13 +69,17 @@ images:
infrastructure-docker/kube-rbac-proxy:
repository: "gcr.io/kubebuilder"
tag: "v0.4.0"
infrastructure-azure/cluster-api-azure-controller:
repository: "gcr.io/k8s-staging-cluster-api-azure"
tag: "v0.4.9"
infrastructure-azure/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_CAPZ_MANAGER: gcr.io/k8s-staging-cluster-api-azure/cluster-api-azure-controller:v0.4.9
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

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

@ -156,6 +156,28 @@ replacements:
name: clusterctl_init
fieldrefs: ["{.images.cluster-api/kube-rbac-proxy}"]
# Replace capz versions
- source:
objref:
kind: VariableCatalogue
name: versions-airshipctl
fieldref: "{.images.capz.manager}"
target:
objref:
kind: Clusterctl
name: clusterctl_init
fieldrefs: ["{.images.infrastructure-azure/cluster-api-azure-controller}"]
- source:
objref:
kind: VariableCatalogue
name: versions-airshipctl
fieldref: "{.images.capz.auth_proxy}"
target:
objref:
kind: Clusterctl
name: clusterctl_init
fieldrefs: ["{.images.infrastructure-azure/kube-rbac-proxy}"]
# Replace the cert-manager image repository in the Clusterctl
- source:
objref: