From 1f786853d12c4e9e392c643048cc4beda9e2365d Mon Sep 17 00:00:00 2001 From: shivi28 Date: Fri, 18 Feb 2022 14:19:28 +0530 Subject: [PATCH] Bump CAPI to v1.1.2 --- go.mod | 6 +++--- go.sum | 9 ++++----- test/e2e/data/e2e_conf.yaml | 26 +++++++++++++------------- test/e2e/data/e2e_eks_conf.yaml | 24 ++++++++++++------------ 4 files changed, 32 insertions(+), 33 deletions(-) diff --git a/go.mod b/go.mod index ede963a921..4f6c7387f1 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module sigs.k8s.io/cluster-api-provider-aws go 1.17 -replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.1.1 +replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.1.2 require ( github.com/alessio/shellescape v1.4.1 @@ -35,8 +35,8 @@ require ( k8s.io/klog/v2 v2.40.1 k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b sigs.k8s.io/aws-iam-authenticator v0.5.4 - sigs.k8s.io/cluster-api v1.1.1 - sigs.k8s.io/cluster-api/test v1.1.1 + sigs.k8s.io/cluster-api v1.1.2 + sigs.k8s.io/cluster-api/test v1.1.2 sigs.k8s.io/controller-runtime v0.11.1 sigs.k8s.io/yaml v1.3.0 ) diff --git a/go.sum b/go.sum index 60f48467b7..5b1aa8bc9e 100644 --- a/go.sum +++ b/go.sum @@ -1842,12 +1842,11 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyz sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.25/go.mod h1:Mlj9PNLmG9bZ6BHFwFKDo5afkpWyUISkb9Me0GnK66I= sigs.k8s.io/aws-iam-authenticator v0.5.4 h1:WH/HMr9H45tWtjJ8F2Z8veA6d6HZZdc3qK01Mc9mEkk= sigs.k8s.io/aws-iam-authenticator v0.5.4/go.mod h1:yJT7wNdiE+3Ib112cCFAmSzaUECXrWEuV2Y/Ms2TuM4= -sigs.k8s.io/cluster-api v1.1.1 h1:wU1J+Yyu9xDC5M2uACH4Ii8vrIk37oZiCKeMEfyL0pk= -sigs.k8s.io/cluster-api v1.1.1/go.mod h1:aSxmmNwDjmg9rDaL0RhRELpGX9uSTTwLF02AMtk/XGY= -sigs.k8s.io/cluster-api/test v1.1.1 h1:ic4dlDDY4wNUF5MaAb8mBryihtjCs/77fP/yzLUE8rc= -sigs.k8s.io/cluster-api/test v1.1.1/go.mod h1:ct7zQrWXsYIAhL/lMLFPfCAqGLDBTEzx+AtwIXpI45o= +sigs.k8s.io/cluster-api v1.1.2 h1:v00hk4crISOo2sKBhvOq0PC375BPk79Cpflt3Jtn7k8= +sigs.k8s.io/cluster-api v1.1.2/go.mod h1:aq0b2tkMHZDTnuLEU7KOZOiQ5Pg82s3vh/KH/X6c/mM= +sigs.k8s.io/cluster-api/test v1.1.2 h1:7kGGYqQc1Vn0p/geYXBDOypXJOwLQOcRz9WrFrTHmBY= +sigs.k8s.io/cluster-api/test v1.1.2/go.mod h1:dk1BBIkLLcvOPuwgKWJ4zfJryGbfCFAZJtWRYo9QrZw= sigs.k8s.io/controller-runtime v0.6.3/go.mod h1:WlZNXcM0++oyaQt4B7C2lEE5JYRs8vJUzRP4N4JpdAY= -sigs.k8s.io/controller-runtime v0.11.0/go.mod h1:KKwLiTooNGu+JmLZGn9Sl3Gjmfj66eMbCQznLP5zcqA= sigs.k8s.io/controller-runtime v0.11.1 h1:7YIHT2QnHJArj/dk9aUkYhfqfK5cIxPOX5gPECfdZLU= sigs.k8s.io/controller-runtime v0.11.1/go.mod h1:KKwLiTooNGu+JmLZGn9Sl3Gjmfj66eMbCQznLP5zcqA= sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 h1:fD1pz4yfdADVNfFmcP2aBEtudwUQ1AlLnRBALr33v3s= diff --git a/test/e2e/data/e2e_conf.yaml b/test/e2e/data/e2e_conf.yaml index b7197a4a7a..a992629624 100644 --- a/test/e2e/data/e2e_conf.yaml +++ b/test/e2e/data/e2e_conf.yaml @@ -27,11 +27,11 @@ images: loadBehavior: tryLoad - name: quay.io/jetstack/cert-manager-controller:v1.5.3 loadBehavior: tryLoad - - name: k8s.gcr.io/cluster-api/cluster-api-controller:v1.1.1 + - name: k8s.gcr.io/cluster-api/cluster-api-controller:v1.1.2 loadBehavior: tryLoad - - name: k8s.gcr.io/cluster-api/kubeadm-bootstrap-controller:v1.1.1 + - name: k8s.gcr.io/cluster-api/kubeadm-bootstrap-controller:v1.1.2 loadBehavior: tryLoad - - name: k8s.gcr.io/cluster-api/kubeadm-control-plane-controller:v1.1.1 + - name: k8s.gcr.io/cluster-api/kubeadm-control-plane-controller:v1.1.2 loadBehavior: tryLoad providers: @@ -60,8 +60,8 @@ providers: new: "imagePullPolicy: IfNotPresent" - old: --metrics-bind-addr=127.0.0.1:8080 new: --metrics-bind-addr=:8080 - - name: v1.1.1 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only. - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.1/core-components.yaml" + - name: v1.1.2 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only. + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.2/core-components.yaml" type: "url" contract: v1beta1 files: @@ -72,7 +72,7 @@ providers: - old: --metrics-bind-addr=127.0.0.1:8080 new: --metrics-bind-addr=:8080 - name: v1.1.99 # next; use manifest from source files - value: "https://storage.googleapis.com/artifacts.k8s-staging-cluster-api.appspot.com/components/nightly_main_20220214/core-components.yaml" + value: "https://storage.googleapis.com/artifacts.k8s-staging-cluster-api.appspot.com/components/nightly_main_20220216/core-components.yaml" type: "url" contract: v1beta1 files: @@ -107,8 +107,8 @@ providers: new: "imagePullPolicy: IfNotPresent" - old: --metrics-bind-addr=127.0.0.1:8080 new: --metrics-bind-addr=:8080 - - name: v1.1.1 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only. - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.1/bootstrap-components.yaml" + - name: v1.1.2 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only. + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.2/bootstrap-components.yaml" type: "url" contract: v1beta1 files: @@ -119,7 +119,7 @@ providers: - old: --metrics-bind-addr=127.0.0.1:8080 new: --metrics-bind-addr=:8080 - name: v1.1.99 # next; use manifest from source files - value: "https://storage.googleapis.com/artifacts.k8s-staging-cluster-api.appspot.com/components/nightly_main_20220214/bootstrap-components.yaml" + value: "https://storage.googleapis.com/artifacts.k8s-staging-cluster-api.appspot.com/components/nightly_main_20220216/bootstrap-components.yaml" type: "url" contract: v1beta1 files: @@ -156,8 +156,8 @@ providers: new: "imagePullPolicy: IfNotPresent" - old: --metrics-bind-addr=127.0.0.1:8080 new: --metrics-bind-addr=:8080 - - name: v1.1.1 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only. - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.1/control-plane-components.yaml" + - name: v1.1.2 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only. + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.2/control-plane-components.yaml" type: "url" contract: v1beta1 files: @@ -168,7 +168,7 @@ providers: - old: --metrics-bind-addr=127.0.0.1:8080 new: --metrics-bind-addr=:8080 - name: v1.1.99 # next; use manifest from source files - value: "https://storage.googleapis.com/artifacts.k8s-staging-cluster-api.appspot.com/components/nightly_main_20220214/control-plane-components.yaml" + value: "https://storage.googleapis.com/artifacts.k8s-staging-cluster-api.appspot.com/components/nightly_main_20220216/control-plane-components.yaml" type: "url" contract: v1beta1 files: @@ -267,7 +267,7 @@ variables: EXP_CLUSTER_RESOURCE_SET: "true" EXP_MACHINE_POOL: "true" CLUSTER_TOPOLOGY: "true" - INIT_WITH_BINARY_V1BETA1: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.1/clusterctl-{OS}-{ARCH}" + INIT_WITH_BINARY_V1BETA1: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.2/clusterctl-{OS}-{ARCH}" INIT_WITH_BINARY_V1ALPHA3: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.23/clusterctl-{OS}-{ARCH}" INIT_WITH_BINARY_V1ALPHA4: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.7/clusterctl-{OS}-{ARCH}" # INIT_WITH_KUBERNETES_VERSION are only used by the clusterctl upgrade test to initialize diff --git a/test/e2e/data/e2e_eks_conf.yaml b/test/e2e/data/e2e_eks_conf.yaml index 50806388ef..daaa9448a4 100644 --- a/test/e2e/data/e2e_eks_conf.yaml +++ b/test/e2e/data/e2e_eks_conf.yaml @@ -25,11 +25,11 @@ images: loadBehavior: tryLoad - name: quay.io/jetstack/cert-manager-controller:v1.5.3 loadBehavior: tryLoad - - name: k8s.gcr.io/cluster-api/cluster-api-controller:v1.1.1 + - name: k8s.gcr.io/cluster-api/cluster-api-controller:v1.1.2 loadBehavior: tryLoad - - name: k8s.gcr.io/cluster-api/kubeadm-bootstrap-controller:v1.1.1 + - name: k8s.gcr.io/cluster-api/kubeadm-bootstrap-controller:v1.1.2 loadBehavior: tryLoad - - name: k8s.gcr.io/cluster-api/kubeadm-control-plane-controller:v1.1.1 + - name: k8s.gcr.io/cluster-api/kubeadm-control-plane-controller:v1.1.2 loadBehavior: tryLoad @@ -59,8 +59,8 @@ providers: new: "imagePullPolicy: IfNotPresent" - old: --metrics-bind-addr=127.0.0.1:8080 new: --metrics-bind-addr=:8080 - - name: v1.1.1 - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.1/core-components.yaml" + - name: v1.1.2 + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.2/core-components.yaml" type: "url" contract: v1beta1 files: @@ -71,7 +71,7 @@ providers: - old: --metrics-bind-addr=127.0.0.1:8080 new: --metrics-bind-addr=:8080 - name: v1.1.99 # next; - value: "https://storage.googleapis.com/artifacts.k8s-staging-cluster-api.appspot.com/components/nightly_main_20220214/core-components.yaml" + value: "https://storage.googleapis.com/artifacts.k8s-staging-cluster-api.appspot.com/components/nightly_main_20220216/core-components.yaml" type: "url" contract: v1beta1 files: @@ -106,8 +106,8 @@ providers: new: "imagePullPolicy: IfNotPresent" - old: --metrics-bind-addr=127.0.0.1:8080 new: --metrics-bind-addr=:8080 - - name: v1.1.1 - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.1/bootstrap-components.yaml" + - name: v1.1.2 + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.2/bootstrap-components.yaml" type: "url" contract: v1beta1 files: @@ -118,7 +118,7 @@ providers: - old: --metrics-bind-addr=127.0.0.1:8080 new: --metrics-bind-addr=:8080 - name: v1.1.99 # next; - value: "https://storage.googleapis.com/artifacts.k8s-staging-cluster-api.appspot.com/components/nightly_main_20220214/bootstrap-components.yaml" + value: "https://storage.googleapis.com/artifacts.k8s-staging-cluster-api.appspot.com/components/nightly_main_20220216/bootstrap-components.yaml" type: "url" contract: v1beta1 files: @@ -154,8 +154,8 @@ providers: new: "imagePullPolicy: IfNotPresent" - old: --metrics-bind-addr=127.0.0.1:8080 new: --metrics-bind-addr=:8080 - - name: v1.1.1 - value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.1/control-plane-components.yaml" + - name: v1.1.2 + value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.2/control-plane-components.yaml" type: "url" contract: v1beta1 files: @@ -166,7 +166,7 @@ providers: - old: --metrics-bind-addr=127.0.0.1:8080 new: --metrics-bind-addr=:8080 - name: v1.1.99 # next; - value: "https://storage.googleapis.com/artifacts.k8s-staging-cluster-api.appspot.com/components/nightly_main_20220214/control-plane-components.yaml" + value: "https://storage.googleapis.com/artifacts.k8s-staging-cluster-api.appspot.com/components/nightly_main_20220216/control-plane-components.yaml" type: "url" contract: v1beta1 files: