From e43256b5b58d28923ccf69610f9e8ff15c927b89 Mon Sep 17 00:00:00 2001 From: k8s-infra-cherrypick-robot <90416843+k8s-infra-cherrypick-robot@users.noreply.github.com> Date: Thu, 15 Sep 2022 00:09:22 -0700 Subject: [PATCH] Update cluster-api to v1.2.2 (#868) Co-authored-by: Amulyam24 --- go.mod | 6 +++--- go.sum | 8 ++++---- hack/tools/go.mod | 2 +- hack/tools/go.sum | 4 ++-- test/e2e/config/ibmcloud-e2e-powervs.yaml | 12 ++++++------ test/e2e/config/ibmcloud-e2e-vpc.yaml | 12 ++++++------ 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/go.mod b/go.mod index ec6b53c81..602cbd422 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module sigs.k8s.io/cluster-api-provider-ibmcloud go 1.18 -replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.2.1 +replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.2.2 require ( github.com/IBM-Cloud/power-go-client v1.1.12 @@ -24,8 +24,8 @@ require ( k8s.io/client-go v0.24.4 k8s.io/klog/v2 v2.60.1 k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 - sigs.k8s.io/cluster-api v1.2.1 - sigs.k8s.io/cluster-api/test v1.2.1 + sigs.k8s.io/cluster-api v1.2.2 + sigs.k8s.io/cluster-api/test v1.2.2 sigs.k8s.io/controller-runtime v0.12.3 ) diff --git a/go.sum b/go.sum index f62a3dbec..6fcbb8d04 100644 --- a/go.sum +++ b/go.sum @@ -1449,10 +1449,10 @@ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30/go.mod h1:fEO7lRTdivWO2qYVCVG7dEADOMo/MLDCVr8So2g88Uw= -sigs.k8s.io/cluster-api v1.2.1 h1:/DbsSy04mP8x/B7pzMv8vbIolE4Jh0icnJhlsh1Nlug= -sigs.k8s.io/cluster-api v1.2.1/go.mod h1:oiuV+mlCV1QxDnuI+PfElFlAfuXHo9ZGVBojoihVtHY= -sigs.k8s.io/cluster-api/test v1.2.1 h1:NiVPpS0BMax38CY8apwPBhagTbQX3vf9kiUb2fGBGWI= -sigs.k8s.io/cluster-api/test v1.2.1/go.mod h1:JdMqpv9rEOFWQVQ8danpBduqxoQkZMiOvpIGJ7v8qjw= +sigs.k8s.io/cluster-api v1.2.2 h1:acx31Eyv5s4xeublsbxWpRFjcQ5h4BmDPI0glm3sEoE= +sigs.k8s.io/cluster-api v1.2.2/go.mod h1:oiuV+mlCV1QxDnuI+PfElFlAfuXHo9ZGVBojoihVtHY= +sigs.k8s.io/cluster-api/test v1.2.2 h1:DUVmlCVQ0H7zY1doxzS1JuooUjXxTN80i9swc16tZd0= +sigs.k8s.io/cluster-api/test v1.2.2/go.mod h1:JdMqpv9rEOFWQVQ8danpBduqxoQkZMiOvpIGJ7v8qjw= sigs.k8s.io/controller-runtime v0.12.3 h1:FCM8xeY/FI8hoAfh/V4XbbYMY20gElh9yh+A98usMio= sigs.k8s.io/controller-runtime v0.12.3/go.mod h1:qKsk4WE6zW2Hfj0G4v10EnNB2jMG1C+NTb8h+DwCoU0= sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 h1:kDi4JBNAsJWfz1aEXhO8Jg87JJaPNLh5tIzYHgStQ9Y= diff --git a/hack/tools/go.mod b/hack/tools/go.mod index 6333581d3..6adfb1392 100644 --- a/hack/tools/go.mod +++ b/hack/tools/go.mod @@ -11,7 +11,7 @@ require ( github.com/onsi/ginkgo v1.16.5 gotest.tools/gotestsum v1.8.2 k8s.io/code-generator v0.24.4 - sigs.k8s.io/cluster-api/hack/tools v0.0.0-20220810171425-8b4214d72762 + sigs.k8s.io/cluster-api/hack/tools v0.0.0-20220912130527-3c462340b297 sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20211110210527-619e6b92dab9 sigs.k8s.io/controller-tools v0.9.2 sigs.k8s.io/kustomize/kustomize/v4 v4.5.7 diff --git a/hack/tools/go.sum b/hack/tools/go.sum index 3c6f03e8c..733278d76 100644 --- a/hack/tools/go.sum +++ b/hack/tools/go.sum @@ -1422,8 +1422,8 @@ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30/go.mod h1:fEO7lRTdivWO2qYVCVG7dEADOMo/MLDCVr8So2g88Uw= -sigs.k8s.io/cluster-api/hack/tools v0.0.0-20220810171425-8b4214d72762 h1:rSxmrTaNKlTEB1zz63un5Hk3kFY4RdMew4jktRHkwuQ= -sigs.k8s.io/cluster-api/hack/tools v0.0.0-20220810171425-8b4214d72762/go.mod h1:hJoKANoP/VEDT64J+z5/jL5rsmgGzl7xLXhbsmX6v1Q= +sigs.k8s.io/cluster-api/hack/tools v0.0.0-20220912130527-3c462340b297 h1:JkS3nNoy++rigFZcACDrjSgBAWehWfypycyaB3/ei38= +sigs.k8s.io/cluster-api/hack/tools v0.0.0-20220912130527-3c462340b297/go.mod h1:hJoKANoP/VEDT64J+z5/jL5rsmgGzl7xLXhbsmX6v1Q= sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20211110210527-619e6b92dab9 h1:ylYUI5uaq/guUFerFRVG81FHSA5/3+fERCE1RQbQUZ4= sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20211110210527-619e6b92dab9/go.mod h1:+sJcI1F0QI0Cv+8fp5rH5B2fK1LxzrAQqYnaPx9nY8I= sigs.k8s.io/controller-tools v0.9.2 h1:AkTE3QAdz9LS4iD3EJvHyYxBkg/g9fTbgiYsrcsFCcM= diff --git a/test/e2e/config/ibmcloud-e2e-powervs.yaml b/test/e2e/config/ibmcloud-e2e-powervs.yaml index 870c0d54b..a2b4642b9 100644 --- a/test/e2e/config/ibmcloud-e2e-powervs.yaml +++ b/test/e2e/config/ibmcloud-e2e-powervs.yaml @@ -9,24 +9,24 @@ providers: - name: cluster-api type: CoreProvider versions: - - name: v1.2.1 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.1/core-components.yaml + - name: v1.2.2 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.2/core-components.yaml type: url files: - sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml" - name: kubeadm type: BootstrapProvider versions: - - name: v1.2.1 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.1/bootstrap-components.yaml + - name: v1.2.2 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.2/bootstrap-components.yaml type: url files: - sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml" - name: kubeadm type: ControlPlaneProvider versions: - - name: v1.2.1 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.1/control-plane-components.yaml + - name: v1.2.2 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.2/control-plane-components.yaml type: url files: - sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml" diff --git a/test/e2e/config/ibmcloud-e2e-vpc.yaml b/test/e2e/config/ibmcloud-e2e-vpc.yaml index 48811c437..e18e93872 100644 --- a/test/e2e/config/ibmcloud-e2e-vpc.yaml +++ b/test/e2e/config/ibmcloud-e2e-vpc.yaml @@ -9,24 +9,24 @@ providers: - name: cluster-api type: CoreProvider versions: - - name: v1.2.1 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.1/core-components.yaml + - name: v1.2.2 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.2/core-components.yaml type: url files: - sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml" - name: kubeadm type: BootstrapProvider versions: - - name: v1.2.1 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.1/bootstrap-components.yaml + - name: v1.2.2 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.2/bootstrap-components.yaml type: url files: - sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml" - name: kubeadm type: ControlPlaneProvider versions: - - name: v1.2.1 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.1/control-plane-components.yaml + - name: v1.2.2 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.2/control-plane-components.yaml type: url files: - sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml"