Merge pull request #549 from cpanato/cpai048

update capi to release v0.4.8

Author: k8s-ci-robot

Tiltfile

@@ -16,7 +16,7 @@ settings = {
     "deploy_cert_manager": True,
     "preload_images_for_kind": True,
     "kind_cluster_name": "capg",
-    "capi_version": "v0.4.7",
+    "capi_version": "v0.4.8",
     "cert_manager_version": "v1.1.0",
     "kubernetes_version": "v1.21.4",
 }

go.mod

@@ -17,9 +17,9 @@ require (
 	k8s.io/component-base v0.22.2
 	k8s.io/klog/v2 v2.10.0
 	k8s.io/utils v0.0.0-20210820185131-d34e5cb4466e
-	sigs.k8s.io/cluster-api v0.4.7
-	sigs.k8s.io/cluster-api/test v0.4.7
+	sigs.k8s.io/cluster-api v0.4.8
+	sigs.k8s.io/cluster-api/test v0.4.8
 	sigs.k8s.io/controller-runtime v0.10.2
 )
 
-replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v0.4.7
+replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v0.4.8

go.sum

@@ -1526,10 +1526,10 @@ rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.14/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg=
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg=
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.22/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg=
-sigs.k8s.io/cluster-api v0.4.7 h1:XzIn48gZAEDyxP/fMcGqOfrgMSLwbcUMgyPRqMeZTjs=
-sigs.k8s.io/cluster-api v0.4.7/go.mod h1:KKycu4yJEm1sxKG5UaHX9ZnYxRiBzJsFjJVmvMQUP2k=
-sigs.k8s.io/cluster-api/test v0.4.7 h1:v+CNc+nW4lolK+mHdnUvQheSbiR6kcbA/8dKgu2VALI=
-sigs.k8s.io/cluster-api/test v0.4.7/go.mod h1:QSthG8w6jaeNE9hwDxntAspluG8xPJFzi1ptSGoNNbw=
+sigs.k8s.io/cluster-api v0.4.8 h1:CnkkFSeMHrranzfjqXuMwJmlq0wkoaJetbV/Njb7RBc=
+sigs.k8s.io/cluster-api v0.4.8/go.mod h1:KKycu4yJEm1sxKG5UaHX9ZnYxRiBzJsFjJVmvMQUP2k=
+sigs.k8s.io/cluster-api/test v0.4.8 h1:WoBn4u3tCfkpz606ysnfsNI/IsFueQVbj9CoMsoEFvs=
+sigs.k8s.io/cluster-api/test v0.4.8/go.mod h1:QSthG8w6jaeNE9hwDxntAspluG8xPJFzi1ptSGoNNbw=
 sigs.k8s.io/controller-runtime v0.9.7/go.mod h1:nExcHcQ2zvLMeoO9K7rOesGCmgu32srN5SENvpAEbGA=
 sigs.k8s.io/controller-runtime v0.10.2 h1:jW8qiY+yMnnPx6O9hu63tgcwaKzd1yLYui+mpvClOOc=
 sigs.k8s.io/controller-runtime v0.10.2/go.mod h1:CQp8eyUQZ/Q7PJvnIrB6/hgfTC1kBkGylwsLgOQi1WY=

hack/ci/e2e-conformance.sh

@@ -25,7 +25,7 @@ CLUSTER_NAME=${CLUSTER_NAME:-"test1"}
 CAPG_WORKER_CLUSTER_KUBECONFIG=${CAPG_WORKER_CLUSTER_KUBECONFIG:-"/tmp/kubeconfig"}
 GCP_NETWORK_NAME=${GCP_NETWORK_NAME:-"${CLUSTER_NAME}-mynetwork"}
 KUBERNETES_MAJOR_VERSION="1"
-KUBERNETES_MINOR_VERSION="20"
+KUBERNETES_MINOR_VERSION="21"
 KUBERNETES_PATCH_VERSION="9"
 KUBERNETES_VERSION="v${KUBERNETES_MAJOR_VERSION}.${KUBERNETES_MINOR_VERSION}.${KUBERNETES_PATCH_VERSION}"
 CONTROL_PLANE_MACHINE_COUNT=1

scripts/ci-e2e.sh

@@ -45,7 +45,7 @@ export TEST_NAME=${CLUSTER_NAME:-"capg-${RANDOM}"}
 export GCP_NETWORK_NAME=${GCP_NETWORK_NAME:-"${TEST_NAME}-mynetwork"}
 export GCP_B64ENCODED_CREDENTIALS=$(base64 -w0 "$GOOGLE_APPLICATION_CREDENTIALS")
 export KUBERNETES_MAJOR_VERSION="1"
-export KUBERNETES_MINOR_VERSION="20"
+export KUBERNETES_MINOR_VERSION="21"
 export KUBERNETES_PATCH_VERSION="9"
 export KUBERNETES_VERSION="v${KUBERNETES_MAJOR_VERSION}.${KUBERNETES_MINOR_VERSION}.${KUBERNETES_PATCH_VERSION}"
 # using prebuilt image from image-builder project the image is built everyday and the job is available here https://prow.k8s.io/?job=periodic-image-builder-gcp-all-nightly

test/e2e/config/gcp-ci.yaml

@@ -15,8 +15,8 @@ providers:
   - name: cluster-api
     type: CoreProvider
     versions:
-    - name: v0.4.7
-      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.7/core-components.yaml
+    - name: v0.4.8
+      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.8/core-components.yaml
       type: url
       files:
       - sourcePath: "../data/shared/v1alpha4/metadata.yaml"
@@ -28,8 +28,8 @@ providers:
   - name: kubeadm
     type: BootstrapProvider
     versions:
-    - name: v0.4.7
-      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.7/bootstrap-components.yaml
+    - name: v0.4.8
+      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.8/bootstrap-components.yaml
       type: url
       files:
       - sourcePath: "../data/shared/v1alpha4/metadata.yaml"
@@ -41,8 +41,8 @@ providers:
   - name: kubeadm
     type: ControlPlaneProvider
     versions:
-    - name: v0.4.7
-      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.7/control-plane-components.yaml
+    - name: v0.4.8
+      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.8/control-plane-components.yaml
       type: url
       files:
       - sourcePath: "../data/shared/v1alpha4/metadata.yaml"
@@ -54,7 +54,7 @@ providers:
   - name: gcp
     type: InfrastructureProvider
     versions:
-    - name: v0.4.7
+    - name: v0.4.8
       value: "${PWD}/config/default"
     files:
     - sourcePath: "${PWD}/metadata.yaml"
@@ -63,7 +63,7 @@ providers:
       targetName: "cluster-template.yaml"
 
 variables:
-  KUBERNETES_VERSION: "${KUBERNETES_VERSION:-v1.20.9}"
+  KUBERNETES_VERSION: "${KUBERNETES_VERSION:-v1.21.9}"
   EXP_CLUSTER_RESOURCE_SET: "true"
   # Cluster Addons
   CNI: "${PWD}/test/e2e/data/cni/calico/calico.yaml"