airship/airshipctl
Code Issues Proposed changes

Merge "Image override for cluster components"

Browse Source
This commit is contained in:
Zuul 2020-12-14 20:42:19 +00:00 committed by Gerrit Code Review
commit a980243565
19 changed files with 73 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,14 +23,26 @@ files:
images: images:
capm3: # Images specific to the camp3 function; etc. capm3: # Images specific to the camp3 function; etc.
manager: quay.io/metal3-io/cluster-api-provider-metal3:v0.3.2 manager:
auth_proxy: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.0 repository: quay.io/metal3-io
tag: v0.3.2
auth_proxy:
repository: gcr.io/kubebuilder
tag: v0.4.0
cacpk: cacpk:
manager: us.gcr.io/k8s-artifacts-prod/cluster-api/kubeadm-control-plane-controller:v0.3.7 manager:
auth_proxy: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.1 repository: us.gcr.io/k8s-artifacts-prod/cluster-api
tag: v0.3.7
auth_proxy:
repository: gcr.io/kubebuilder
tag: v0.4.1
cabpk: cabpk:
manager: us.gcr.io/k8s-artifacts-prod/cluster-api/kubeadm-bootstrap-controller:v0.3.7 manager:
auth_proxy: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.1 repository: us.gcr.io/k8s-artifacts-prod/cluster-api
tag: v0.3.7
auth_proxy:
repository: gcr.io/kubebuilder
tag: v0.4.1
capd: capd:
manager: gcr.io/k8s-staging-cluster-api/capd-manager:v20201019-v0.3.10-86-gc1647481f 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 auth_proxy: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.0
@ -38,8 +50,12 @@ images:
manager: gcr.io/k8s-staging-capi-openstack/capi-openstack-controller-amd64:v20200707-v0.3.1 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 auth_proxy: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.1
capi: capi:
manager: us.gcr.io/k8s-artifacts-prod/cluster-api/cluster-api-controller:v0.3.7 manager:
auth_proxy: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.1 repository: us.gcr.io/k8s-artifacts-prod/cluster-api
tag: v0.3.7
auth_proxy:
repository: gcr.io/kubebuilder
tag: v0.4.1
baremetal_operator: baremetal_operator:
ironic: # ironic Deployment ironic: # ironic Deployment
init_bootstrap: centos init_bootstrap: centos

2
manifests/function/cabpk/v0.3.3/manager/manager_auth_proxy_patch.yaml
View File

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

2
manifests/function/cabpk/v0.3.3/manager/manager_image_patch.yaml
View File

@ -7,5 +7,5 @@ spec:
template: template:
spec: spec:
containers: containers:
- image: ${CONTAINER_CABPK_MANAGER} - image: us.gcr.io/k8s-artifacts-prod/cluster-api/kubeadm-bootstrap-controller:v0.3.3
name: manager name: manager

2
manifests/function/cabpk/v0.3.7/manager/manager_auth_proxy_patch.yaml
View File

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

2
manifests/function/cabpk/v0.3.7/manager/manager_image_patch.yaml
View File

@ -7,5 +7,5 @@ spec:
template: template:
spec: spec:
containers: containers:
- image: ${CONTAINER_CABPK_MANAGER} - image: us.gcr.io/k8s-artifacts-prod/cluster-api/kubeadm-bootstrap-controller:v0.3.7
name: manager name: manager

2
manifests/function/cacpk/v0.3.3/manager/manager_auth_proxy_patch.yaml
View File

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

2
manifests/function/cacpk/v0.3.3/manager/manager_image_patch.yaml
View File

@ -7,5 +7,5 @@ spec:
template: template:
spec: spec:
containers: containers:
- image: ${CONTAINER_CACPK_MANAGER} - image: us.gcr.io/k8s-artifacts-prod/cluster-api/kubeadm-control-plane-controller:v0.3.3
name: manager name: manager

2
manifests/function/cacpk/v0.3.7/manager/manager_auth_proxy_patch.yaml
View File

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

2
manifests/function/cacpk/v0.3.7/manager/manager_image_patch.yaml
View File

@ -7,5 +7,5 @@ spec:
template: template:
spec: spec:
containers: containers:
- image: ${CONTAINER_CACPK_MANAGER} - image: us.gcr.io/k8s-artifacts-prod/cluster-api/kubeadm-control-plane-controller:v0.3.7
name: manager name: manager

2
manifests/function/capi/v0.3.3/manager/manager_auth_proxy_patch.yaml
View File

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

2
manifests/function/capi/v0.3.3/manager/manager_image_patch.yaml
View File

@ -7,5 +7,5 @@ spec:
template: template:
spec: spec:
containers: containers:
- image: ${CONTAINER_CAPI_MANAGER} - image: us.gcr.io/k8s-artifacts-prod/cluster-api/cluster-api-controller:v0.3.3
name: manager name: manager

2
manifests/function/capi/v0.3.7/manager/manager_auth_proxy_patch.yaml
View File

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

2
manifests/function/capi/v0.3.7/manager/manager_image_patch.yaml
View File

@ -7,5 +7,5 @@ spec:
template: template:
spec: spec:
containers: containers:
- image: ${CONTAINER_CAPI_MANAGER} - image: us.gcr.io/k8s-artifacts-prod/cluster-api/cluster-api-controller:v0.3.7
name: manager name: manager

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

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

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

@ -8,5 +8,5 @@ spec:
spec: spec:
containers: containers:
# Change the value of image field below to your controller image URL # Change the value of image field below to your controller image URL
- image: ${CONTAINER_CAPM3_MANAGER} - image: quay.io/metal3-io/cluster-api-provider-metal3:v0.3.1
name: manager name: manager

2
manifests/function/capm3/v0.3.2/manager/manager_auth_proxy_patch.yaml
View File

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

2
manifests/function/capm3/v0.3.2/manager/manager_image_patch.yaml
View File

@ -8,5 +8,5 @@ spec:
spec: spec:
containers: containers:
# Change the value of image field below to your controller image URL # Change the value of image field below to your controller image URL
- image: ${CONTAINER_CAPM3_MANAGER} - image: quay.io/metal3-io/cluster-api-provider-metal3:v0.3.2
name: manager name: manager

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

@ -39,20 +39,37 @@ providers:
images: images:
cert-manager: cert-manager:
repository: "quay.io/jetstack" repository: "quay.io/jetstack"
cluster-api/cluster-api-controller:
repository: "us.gcr.io/k8s-artifacts-prod/cluster-api"
tag: "v0.3.7"
cluster-api/kube-rbac-proxy:
repository: "gcr.io/kubebuilder"
tag: "v0.4.1"
bootstrap-kubeadm/kubeadm-bootstrap-controller:
repository: "us.gcr.io/k8s-artifacts-prod/cluster-api"
tag: "v0.3.7"
bootstrap-kubeadm/kube-rbac-proxy:
repository: "gcr.io/kubebuilder"
tag: "v0.4.1"
control-plane-kubeadm/kubeadm-control-plane-controller:
repository: "us.gcr.io/k8s-artifacts-prod/cluster-api"
tag: "v0.3.7"
control-plane-kubeadm/kube-rbac-proxy:
repository: "gcr.io/kubebuilder"
tag: "v0.4.1"
infrastructure-metal3/cluster-api-provider-metal3:
repository: "quay.io/metal3-io"
tag: "v0.3.2"
infrastructure-metal3/kube-rbac-proxy:
repository: "gcr.io/kubebuilder"
tag: "v0.4.0"
# These default images can be overridden via the `replacements/` entrypoint # These default images can be overridden via the `replacements/` entrypoint
additional-vars: additional-vars:
CONTAINER_CAPM3_MANAGER: quay.io/metal3-io/cluster-api-provider-metal3:v0.3.2
CONTAINER_CACPK_MANAGER: us.gcr.io/k8s-artifacts-prod/cluster-api/kubeadm-control-plane-controller:v0.3.7
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_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_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_CAPZ_MANAGER: gcr.io/k8s-staging-cluster-api-azure/cluster-api-azure-controller:v0.4.9
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_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_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_CAPZ_AUTH_PROXY: gcr.io/kubebuilder/kube-rbac-proxy:v0.4.1

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

@ -18,7 +18,7 @@ replacements:
objref: objref:
kind: Clusterctl kind: Clusterctl
name: clusterctl_init name: clusterctl_init
fieldrefs: ["{.additional-vars.CONTAINER_CAPM3_MANAGER}"] fieldrefs: ["{.images.infrastructure-metal3/cluster-api-provider-metal3}"]
- source: - source:
objref: objref:
kind: VariableCatalogue kind: VariableCatalogue
@ -28,7 +28,7 @@ replacements:
objref: objref:
kind: Clusterctl kind: Clusterctl
name: clusterctl_init name: clusterctl_init
fieldrefs: ["{.additional-vars.CONTAINER_CAPM3_AUTH_PROXY}"] fieldrefs: ["{.images.infrastructure-metal3/kube-rbac-proxy}"]
# Replace cacpk versions # Replace cacpk versions
- source: - source:
objref: objref:
@ -39,7 +39,7 @@ replacements:
objref: objref:
kind: Clusterctl kind: Clusterctl
name: clusterctl_init name: clusterctl_init
fieldrefs: ["{.additional-vars.CONTAINER_CACPK_MANAGER}"] fieldrefs: ["{.images.control-plane-kubeadm/kubeadm-control-plane-controller}"]
- source: - source:
objref: objref:
kind: VariableCatalogue kind: VariableCatalogue
@ -49,7 +49,7 @@ replacements:
objref: objref:
kind: Clusterctl kind: Clusterctl
name: clusterctl_init name: clusterctl_init
fieldrefs: ["{.additional-vars.CONTAINER_CACPK_AUTH_PROXY}"] fieldrefs: ["{.images.control-plane-kubeadm/kube-rbac-proxy}"]
# Replace cabpk versions # Replace cabpk versions
- source: - source:
objref: objref:
@ -60,7 +60,7 @@ replacements:
objref: objref:
kind: Clusterctl kind: Clusterctl
name: clusterctl_init name: clusterctl_init
fieldrefs: ["{.additional-vars.CONTAINER_CABPK_MANAGER}"] fieldrefs: ["{.images.bootstrap-kubeadm/kubeadm-bootstrap-controller}"]
- source: - source:
objref: objref:
kind: VariableCatalogue kind: VariableCatalogue
@ -70,7 +70,7 @@ replacements:
objref: objref:
kind: Clusterctl kind: Clusterctl
name: clusterctl_init name: clusterctl_init
fieldrefs: ["{.additional-vars.CONTAINER_CABPK_AUTH_PROXY}"] fieldrefs: ["{.images.bootstrap-kubeadm/kube-rbac-proxy}"]
# Replace capd versions # Replace capd versions
- source: - source:
objref: objref:
@ -123,7 +123,7 @@ replacements:
objref: objref:
kind: Clusterctl kind: Clusterctl
name: clusterctl_init name: clusterctl_init
fieldrefs: ["{.additional-vars.CONTAINER_CAPI_MANAGER}"] fieldrefs: ["{.images.cluster-api/cluster-api-controller}"]
- source: - source:
objref: objref:
kind: VariableCatalogue kind: VariableCatalogue
@ -133,7 +133,7 @@ replacements:
objref: objref:
kind: Clusterctl kind: Clusterctl
name: clusterctl_init name: clusterctl_init
fieldrefs: ["{.additional-vars.CONTAINER_CAPI_AUTH_PROXY}"] fieldrefs: ["{.images.cluster-api/kube-rbac-proxy}"]
# Replace the cert-manager image repository in the Clusterctl # Replace the cert-manager image repository in the Clusterctl
- source: - source: