airship/airshipctl
Code Issues Proposed changes

Image override for CAPD components

Browse Source 
* Follow-up commit of https://review.opendev.org/c/airship/airshipctl/+/766228
  for CAPD

Change-Id: I9aa2e012ff27bce90ad8fb9630a697d6123b971f
Relates-To: #431
This commit is contained in:
Sirajudeen 2020-12-15 23:51:16 +00:00
parent 0dde23481f
commit fba17f625e
5 changed files with 16 additions and 8 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

@ -44,8 +44,12 @@ images:
repository: gcr.io/kubebuilder
tag: v0.4.1
capd:
manager: gcr.io/k8s-staging-cluster-api/capd-manager:v20201019-v0.3.10-86-gc1647481f
auth_proxy: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.0
manager:
repository: gcr.io/k8s-staging-cluster-api
tag: v20201019-v0.3.10-86-gc1647481f
auth_proxy:
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

2
manifests/function/capd/v0.3.11/manager/manager_auth_proxy_patch.yaml
View File

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

2
manifests/function/capd/v0.3.11/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_CAPD_MANAGER}
- image: gcr.io/k8s-staging-cluster-api/capd-manager:master
name: manager

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

@ -63,13 +63,17 @@ images:
infrastructure-metal3/kube-rbac-proxy:
repository: "gcr.io/kubebuilder"
tag: "v0.4.0"
infrastructure-docker/capd-manager:
repository: "gcr.io/k8s-staging-cluster-api"
tag: "v20201019-v0.3.10-86-gc1647481f"
infrastructure-docker/kube-rbac-proxy:
repository: "gcr.io/kubebuilder"
tag: "v0.4.0"
# These default images can be overridden via the `replacements/` entrypoint
additional-vars:
CONTAINER_CAPD_MANAGER: gcr.io/k8s-staging-cluster-api/capd-manager:v20201019-v0.3.10-86-gc1647481f
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_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

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

@ -81,7 +81,7 @@ replacements:
objref:
kind: Clusterctl
name: clusterctl_init
fieldrefs: ["{.additional-vars.CONTAINER_CAPD_MANAGER}"]
fieldrefs: ["{.images.infrastructure-docker/capd-manager}"]
- source:
objref:
kind: VariableCatalogue
@ -91,7 +91,7 @@ replacements:
objref:
kind: Clusterctl
name: clusterctl_init
fieldrefs: ["{.additional-vars.CONTAINER_CAPD_AUTH_PROXY}"]
fieldrefs: ["{.images.infrastructure-docker/kube-rbac-proxy}"]
# Replace capo versions
- source:
objref: