From a61a57d7e1a2e7b1765ad05849f0bb53bcf87a1b Mon Sep 17 00:00:00 2001 From: Amulyam24 Date: Fri, 11 Feb 2022 16:30:44 +0530 Subject: [PATCH] Upate cluster-api to v1.1.1 --- go.mod | 6 +++--- go.sum | 8 ++++---- hack/tools/go.mod | 6 +++--- hack/tools/go.sum | 10 +++++----- test/e2e/config/ibmcloud-e2e-powervs.yaml | 12 ++++++------ test/e2e/config/ibmcloud-e2e-vpc.yaml | 12 ++++++------ 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/go.mod b/go.mod index bfd13123a..574ab8237 100644 --- a/go.mod +++ b/go.mod @@ -20,8 +20,8 @@ require ( k8s.io/client-go v0.23.0 k8s.io/klog/v2 v2.30.0 k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b - sigs.k8s.io/cluster-api v1.1.0 - sigs.k8s.io/cluster-api/test v1.1.0 + sigs.k8s.io/cluster-api v1.1.1 + sigs.k8s.io/cluster-api/test v1.1.1 sigs.k8s.io/controller-runtime v0.11.0 ) @@ -138,4 +138,4 @@ require ( sigs.k8s.io/yaml v1.3.0 // indirect ) -replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.1.0 +replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.1.1 diff --git a/go.sum b/go.sum index 73ab5371d..b42e56aad 100644 --- a/go.sum +++ b/go.sum @@ -1808,10 +1808,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.25/go.mod h1:Mlj9PNLmG9bZ6BHFwFKDo5afkpWyUISkb9Me0GnK66I= -sigs.k8s.io/cluster-api v1.1.0 h1:zJJzIUezEveYK3Ljmk/jku+DYd96RP5bZ181l2W9gVg= -sigs.k8s.io/cluster-api v1.1.0/go.mod h1:aSxmmNwDjmg9rDaL0RhRELpGX9uSTTwLF02AMtk/XGY= -sigs.k8s.io/cluster-api/test v1.1.0 h1:eBVFCWxu9/fb/By02uFjOreG9GAd9eax9uZKsCXP58s= -sigs.k8s.io/cluster-api/test v1.1.0/go.mod h1:ct7zQrWXsYIAhL/lMLFPfCAqGLDBTEzx+AtwIXpI45o= +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/controller-runtime v0.11.0 h1:DqO+c8mywcZLFJWILq4iktoECTyn30Bkj0CwgqMpZWQ= sigs.k8s.io/controller-runtime v0.11.0/go.mod h1:KKwLiTooNGu+JmLZGn9Sl3Gjmfj66eMbCQznLP5zcqA= sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 h1:fD1pz4yfdADVNfFmcP2aBEtudwUQ1AlLnRBALr33v3s= diff --git a/hack/tools/go.mod b/hack/tools/go.mod index 2565ce06f..4497052ce 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.6.4 k8s.io/code-generator v0.23.0 - sigs.k8s.io/cluster-api/hack/tools v0.0.0-20220202130822-e2aafb60cdf7 + sigs.k8s.io/cluster-api/hack/tools v0.0.0-20220210155947-810c2a67e71e sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20211110210527-619e6b92dab9 sigs.k8s.io/controller-tools v0.8.0 sigs.k8s.io/kustomize/kustomize/v4 v4.4.1 @@ -223,6 +223,6 @@ require ( ) replace ( - sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.1.0 - sigs.k8s.io/cluster-api/test => sigs.k8s.io/cluster-api/test v1.1.0 + sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.1.1 + sigs.k8s.io/cluster-api/test => sigs.k8s.io/cluster-api/test v1.1.1 ) diff --git a/hack/tools/go.sum b/hack/tools/go.sum index 2088e3d04..bdecc6f84 100644 --- a/hack/tools/go.sum +++ b/hack/tools/go.sum @@ -2175,11 +2175,11 @@ 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.25/go.mod h1:Mlj9PNLmG9bZ6BHFwFKDo5afkpWyUISkb9Me0GnK66I= -sigs.k8s.io/cluster-api v1.1.0 h1:zJJzIUezEveYK3Ljmk/jku+DYd96RP5bZ181l2W9gVg= -sigs.k8s.io/cluster-api v1.1.0/go.mod h1:aSxmmNwDjmg9rDaL0RhRELpGX9uSTTwLF02AMtk/XGY= -sigs.k8s.io/cluster-api/hack/tools v0.0.0-20220202130822-e2aafb60cdf7 h1:8dNBbmhEQHuBAw0I9rk7SCq1OpFayi7Mp2j6NHPilMU= -sigs.k8s.io/cluster-api/hack/tools v0.0.0-20220202130822-e2aafb60cdf7/go.mod h1:3KC1uX5VvwJsfTPRz07ZgQUWFsKPfJG1lYYjpD6yIz8= -sigs.k8s.io/cluster-api/test v1.1.0/go.mod h1:ct7zQrWXsYIAhL/lMLFPfCAqGLDBTEzx+AtwIXpI45o= +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/hack/tools v0.0.0-20220210155947-810c2a67e71e h1:IEZxbOqMQsj7JQEwPZOb3o5Nmo7jxgkE4Z5PXgH3VS4= +sigs.k8s.io/cluster-api/hack/tools v0.0.0-20220210155947-810c2a67e71e/go.mod h1:3KC1uX5VvwJsfTPRz07ZgQUWFsKPfJG1lYYjpD6yIz8= +sigs.k8s.io/cluster-api/test v1.1.1/go.mod h1:ct7zQrWXsYIAhL/lMLFPfCAqGLDBTEzx+AtwIXpI45o= sigs.k8s.io/controller-runtime v0.11.0 h1:DqO+c8mywcZLFJWILq4iktoECTyn30Bkj0CwgqMpZWQ= sigs.k8s.io/controller-runtime v0.11.0/go.mod h1:KKwLiTooNGu+JmLZGn9Sl3Gjmfj66eMbCQznLP5zcqA= sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20211110210527-619e6b92dab9 h1:ylYUI5uaq/guUFerFRVG81FHSA5/3+fERCE1RQbQUZ4= diff --git a/test/e2e/config/ibmcloud-e2e-powervs.yaml b/test/e2e/config/ibmcloud-e2e-powervs.yaml index 30b31ac7a..0cf017d61 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.1.0 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.0/core-components.yaml + - name: v1.1.1 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.1/core-components.yaml type: url files: - sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml" - name: kubeadm type: BootstrapProvider versions: - - name: v1.1.0 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.0/bootstrap-components.yaml + - name: v1.1.1 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.1/bootstrap-components.yaml type: url files: - sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml" - name: kubeadm type: ControlPlaneProvider versions: - - name: v1.1.0 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.0/control-plane-components.yaml + - name: v1.1.1 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.1/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 4bf1deecb..2d0ba87ec 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.0.2 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.0.2/core-components.yaml + - name: v1.1.1 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.1/core-components.yaml type: url files: - sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml" - name: kubeadm type: BootstrapProvider versions: - - name: v1.0.2 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.0.2/bootstrap-components.yaml + - name: v1.1.1 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.1/bootstrap-components.yaml type: url files: - sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml" - name: kubeadm type: ControlPlaneProvider versions: - - name: v1.0.2 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.0.2/control-plane-components.yaml + - name: v1.1.1 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.1/control-plane-components.yaml type: url files: - sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml"