From fd4cf27fbfb1dcbf903b6415abc2f1198c7f69cc Mon Sep 17 00:00:00 2001 From: Shon Date: Thu, 23 Sep 2021 16:27:53 +0000 Subject: [PATCH] Force to use Quay.io Clusterctl v0.3.22 image * added patches to pin clusterctl image to v0.3.22 and CAPI components to v1alpha3 version in docker-test-site Closes: #642 Change-Id: I43d04845d8b2a8f9244736f891893af39d81c200 --- .../phases/capi_provider_patch.yaml | 45 +++++++++++++++++++ .../phases/clusterctl_image_patch.yaml | 6 +++ .../phases/kustomization.yaml | 9 +++- 3 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 manifests/site/docker-test-site/phases/capi_provider_patch.yaml create mode 100644 manifests/site/docker-test-site/phases/clusterctl_image_patch.yaml diff --git a/manifests/site/docker-test-site/phases/capi_provider_patch.yaml b/manifests/site/docker-test-site/phases/capi_provider_patch.yaml new file mode 100644 index 000000000..9c8afb6d1 --- /dev/null +++ b/manifests/site/docker-test-site/phases/capi_provider_patch.yaml @@ -0,0 +1,45 @@ +apiVersion: airshipit.org/v1alpha1 +kind: Clusterctl +metadata: + name: clusterctl_init + +init-options: + bootstrap-providers: kubeadm:v0.3.7 + control-plane-providers: kubeadm:v0.3.7 + core-provider: cluster-api:v0.3.7 + +providers: +- name: docker + type: InfrastructureProvider + url: airshipctl/manifests/function/capd/v0.3.11 +- name: kubeadm + type: BootstrapProvider + url: airshipctl/manifests/function/cabpk/v0.3.7 +- name: cluster-api + type: CoreProvider + url: airshipctl/manifests/function/capi/v0.3.7 +- name: kubeadm + type: ControlPlaneProvider + url: airshipctl/manifests/function/cacpk/v0.3.7 + +images: + cert-manager: + 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" diff --git a/manifests/site/docker-test-site/phases/clusterctl_image_patch.yaml b/manifests/site/docker-test-site/phases/clusterctl_image_patch.yaml new file mode 100644 index 000000000..43023064e --- /dev/null +++ b/manifests/site/docker-test-site/phases/clusterctl_image_patch.yaml @@ -0,0 +1,6 @@ +apiVersion: airshipit.org/v1alpha1 +kind: GenericContainer +metadata: + name: clusterctl +spec: + image: quay.io/airshipit/clusterctl:eb9ac97ce207542e1e4d3b363963bfc5f0847096 diff --git a/manifests/site/docker-test-site/phases/kustomization.yaml b/manifests/site/docker-test-site/phases/kustomization.yaml index 03bf4f247..aee79912b 100644 --- a/manifests/site/docker-test-site/phases/kustomization.yaml +++ b/manifests/site/docker-test-site/phases/kustomization.yaml @@ -12,6 +12,13 @@ patchesStrategicMerge: - plan_patch.yaml - cluster_map_patch.yaml - executor_patch.yaml + # clusterctl_image_patch.yaml replaces localhost/clusterctl:latest image to clusterctl v0.3.22 utility image + # capi_provider_patch.yaml pins v1alpha3 CAPI components providers and images for docker-test-site + - clusterctl_image_patch.yaml + - capi_provider_patch.yaml transformers: - - ../../../function/clusterctl/replacements + # Commenting clusterctl replacements to used v1alpha3 CAPI component images + # This needsto uncomment again once docker provider is upgraded to v1alpha4 + # and above 2 patches can be deleted + # - ../../../function/clusterctl/replacements - ../../../phases/replacements