Skip to content

Commit

Permalink
Force to use Quay.io Clusterctl v0.3.22 image
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
shon-phand committed Sep 28, 2021
1 parent 96d27cd commit fd4cf27
Show file tree
Hide file tree
Showing 3 changed files with 59 additions and 1 deletion.
45 changes: 45 additions & 0 deletions manifests/site/docker-test-site/phases/capi_provider_patch.yaml
Original file line number Diff line number Diff line change
@@ -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"
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
apiVersion: airshipit.org/v1alpha1
kind: GenericContainer
metadata:
name: clusterctl
spec:
image: quay.io/airshipit/clusterctl:eb9ac97ce207542e1e4d3b363963bfc5f0847096
9 changes: 8 additions & 1 deletion manifests/site/docker-test-site/phases/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit fd4cf27

Please sign in to comment.