airship/airshipctl
Code Issues Proposed changes

Merge "Align CAPO to use catalogue-driven versions"

Browse Source
This commit is contained in:
Zuul 2020-11-13 02:59:09 +00:00 committed by Gerrit Code Review
commit 411bbf899a
5 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,6 +34,9 @@ images:
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
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
capi:
manager: us.gcr.io/k8s-artifacts-prod/cluster-api/cluster-api-controller:v0.3.7
auth_proxy: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.1

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: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.1
image: ${CONTAINER_CAPO_AUTH_PROXY}
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: gcr.io/k8s-staging-capi-openstack/capi-openstack-controller-amd64:v20200707-v0.3.1
- image: ${CONTAINER_CAPO_MANAGER}
name: manager

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

@ -47,8 +47,10 @@ additional-vars:
CONTAINER_CABPK_MANAGER: us.gcr.io/k8s-artifacts-prod/cluster-api/kubeadm-bootstrap-controller:v0.3.7
CONTAINER_CAPI_MANAGER: us.gcr.io/k8s-artifacts-prod/cluster-api/cluster-api-controller:v0.3.7
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_CAPM3_AUTH_PROXY: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.0
CONTAINER_CACPK_AUTH_PROXY: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.1
CONTAINER_CABPK_AUTH_PROXY: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.1
CONTAINER_CAPI_AUTH_PROXY: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.1
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

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

@ -92,6 +92,27 @@ replacements:
kind: Clusterctl
name: clusterctl_init
fieldrefs: ["{.additional-vars.CONTAINER_CAPD_AUTH_PROXY}"]
# Replace capo versions
- source:
objref:
kind: VariableCatalogue
name: versions-airshipctl
fieldref: "{.images.capo.manager}"
target:
objref:
kind: Clusterctl
name: clusterctl_init
fieldrefs: ["{.additional-vars.CONTAINER_CAPO_MANAGER}"]
- source:
objref:
kind: VariableCatalogue
name: versions-airshipctl
fieldref: "{.images.capo.auth_proxy}"
target:
objref:
kind: Clusterctl
name: clusterctl_init
fieldrefs: ["{.additional-vars.CONTAINER_CAPO_AUTH_PROXY}"]
# Replace capi versions
- source:
objref: