From 09dd8c141521248027726417dfa70dd742e80486 Mon Sep 17 00:00:00 2001 From: Prajyot-Parab Date: Tue, 27 Feb 2024 22:49:02 +0530 Subject: [PATCH] Update cluster-api to v1.6.2 Signed-off-by: Prajyot-Parab --- go.mod | 8 ++++---- go.sum | 12 ++++++------ hack/tools/go.mod | 4 ++-- hack/tools/go.sum | 8 ++++---- test/e2e/config/ibmcloud-e2e-powervs.yaml | 12 ++++++------ test/e2e/config/ibmcloud-e2e-vpc.yaml | 12 ++++++------ 6 files changed, 28 insertions(+), 28 deletions(-) diff --git a/go.mod b/go.mod index c54f99f9f..8133672d8 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ go 1.21 replace ( github.com/onsi/ginkgo/v2 => github.com/onsi/ginkgo/v2 v2.13.1 github.com/onsi/gomega => github.com/onsi/gomega v1.30.0 - sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.6.1 + sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.6.2 ) require ( @@ -32,9 +32,9 @@ require ( k8s.io/client-go v0.28.4 k8s.io/klog/v2 v2.100.1 k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 - sigs.k8s.io/cluster-api v1.6.1 - sigs.k8s.io/cluster-api/test v1.6.1 - sigs.k8s.io/controller-runtime v0.16.3 + sigs.k8s.io/cluster-api v1.6.2 + sigs.k8s.io/cluster-api/test v1.6.2 + sigs.k8s.io/controller-runtime v0.16.5 sigs.k8s.io/yaml v1.4.0 ) diff --git a/go.sum b/go.sum index b3beaa66d..01cde4009 100644 --- a/go.sum +++ b/go.sum @@ -929,12 +929,12 @@ 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.1.2 h1:trsWhjU5jZrx6UvFu4WzQDrN7Pga4a7Qg+zcfcj64PA= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2/go.mod h1:+qG7ISXqCDVVcyO8hLn12AKVYYUjM7ftlqsqmrhMZE0= -sigs.k8s.io/cluster-api v1.6.1 h1:I34p/fwgRlEhs+o9cUhKXDwNNfPS3no0yJsd2bJyQVc= -sigs.k8s.io/cluster-api v1.6.1/go.mod h1:DaxwruDvSaEYq5q6FREDaGzX6UsAVUCA99Sp8vfMHyQ= -sigs.k8s.io/cluster-api/test v1.6.1 h1:9TffRPOuYNUyfHqdeWQtFhdK0oY+NAbvjlzbqK7chTw= -sigs.k8s.io/cluster-api/test v1.6.1/go.mod h1:+zOSrnG/2wI2XtWOkaVpVJ1BXumT/73zqRXZBYrclPQ= -sigs.k8s.io/controller-runtime v0.16.3 h1:2TuvuokmfXvDUamSx1SuAOO3eTyye+47mJCigwG62c4= -sigs.k8s.io/controller-runtime v0.16.3/go.mod h1:j7bialYoSn142nv9sCOJmQgDXQXxnroFU4VnX/brVJ0= +sigs.k8s.io/cluster-api v1.6.2 h1:ruUi4q/9jXFuI+hmnDjo9izHgrBk4bjfQXLKx678PQE= +sigs.k8s.io/cluster-api v1.6.2/go.mod h1:Anm4cA6R/AIP6KdIuVje8CdFc/TdGl+382bi5oPawRc= +sigs.k8s.io/cluster-api/test v1.6.2 h1:RjrYL8Ag9vBxfv++RWEKy/vgTukQYeYVJBMkWvylASc= +sigs.k8s.io/cluster-api/test v1.6.2/go.mod h1:qfkWBqONPAyOwsPFlS8tsrAq7pjKH55pCpKtjhEbUrk= +sigs.k8s.io/controller-runtime v0.16.5 h1:yr1cEJbX08xsTW6XEIzT13KHHmIyX8Umvme2cULvFZw= +sigs.k8s.io/controller-runtime v0.16.5/go.mod h1:j7bialYoSn142nv9sCOJmQgDXQXxnroFU4VnX/brVJ0= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/kind v0.20.0 h1:f0sc3v9mQbGnjBUaqSFST1dwIuiikKVGgoTwpoP33a8= diff --git a/hack/tools/go.mod b/hack/tools/go.mod index d39717aea..78ac8c2c5 100644 --- a/hack/tools/go.mod +++ b/hack/tools/go.mod @@ -2,7 +2,7 @@ module sigs.k8s.io/cluster-api-provider-ibmcloud/hack/tools go 1.21 -replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.6.1 +replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.6.2 require ( github.com/aquasecurity/trivy v0.48.3 @@ -15,7 +15,7 @@ require ( golang.org/x/vuln v1.0.4 gotest.tools/gotestsum v1.11.0 k8s.io/code-generator v0.28.4 - sigs.k8s.io/cluster-api/hack/tools v0.0.0-20240116152609-a150f715f5a6 + sigs.k8s.io/cluster-api/hack/tools v0.0.0-20240220100102-da795db4c7da sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20211110210527-619e6b92dab9 sigs.k8s.io/controller-tools v0.13.0 sigs.k8s.io/kustomize/kustomize/v5 v5.3.0 diff --git a/hack/tools/go.sum b/hack/tools/go.sum index 50438429c..10b9eb52b 100644 --- a/hack/tools/go.sum +++ b/hack/tools/go.sum @@ -2470,10 +2470,10 @@ oras.land/oras-go v1.2.4/go.mod h1:DYcGfb3YF1nKjcezfX2SNlDAeQFKSXmf+qrFmrh4324= 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/cluster-api v1.6.1 h1:I34p/fwgRlEhs+o9cUhKXDwNNfPS3no0yJsd2bJyQVc= -sigs.k8s.io/cluster-api v1.6.1/go.mod h1:DaxwruDvSaEYq5q6FREDaGzX6UsAVUCA99Sp8vfMHyQ= -sigs.k8s.io/cluster-api/hack/tools v0.0.0-20240116152609-a150f715f5a6 h1:3vOZYD9ROp5z3z1m05lgtNHERfEqn6wLvRRrS1YF0KE= -sigs.k8s.io/cluster-api/hack/tools v0.0.0-20240116152609-a150f715f5a6/go.mod h1:kutC7+SDho0qE9WwQQH8Uxm6txX5khBlYgZVro2xOL0= +sigs.k8s.io/cluster-api v1.6.2 h1:ruUi4q/9jXFuI+hmnDjo9izHgrBk4bjfQXLKx678PQE= +sigs.k8s.io/cluster-api v1.6.2/go.mod h1:Anm4cA6R/AIP6KdIuVje8CdFc/TdGl+382bi5oPawRc= +sigs.k8s.io/cluster-api/hack/tools v0.0.0-20240220100102-da795db4c7da h1:FKtxCIrLLLdcAw5/MirBRXb23IlSpq2yggmQ7S3P8rI= +sigs.k8s.io/cluster-api/hack/tools v0.0.0-20240220100102-da795db4c7da/go.mod h1:5eRvT6vw07kA/O6oIZAnLJSJ/9cSAxRJk1qbhhtX4IY= 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.13.0 h1:NfrvuZ4bxyolhDBt/rCZhDnx3M2hzlhgo5n3Iv2RykI= diff --git a/test/e2e/config/ibmcloud-e2e-powervs.yaml b/test/e2e/config/ibmcloud-e2e-powervs.yaml index 5b98d96e0..9ab823f2e 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.6.1 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.1/core-components.yaml + - name: v1.6.2 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.2/core-components.yaml type: url files: - sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml" - name: kubeadm type: BootstrapProvider versions: - - name: v1.6.1 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.1/bootstrap-components.yaml + - name: v1.6.2 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.2/bootstrap-components.yaml type: url files: - sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml" - name: kubeadm type: ControlPlaneProvider versions: - - name: v1.6.1 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.1/control-plane-components.yaml + - name: v1.6.2 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.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 01da8b748..18981c372 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.6.1 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.1/core-components.yaml + - name: v1.6.2 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.2/core-components.yaml type: url files: - sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml" - name: kubeadm type: BootstrapProvider versions: - - name: v1.6.1 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.1/bootstrap-components.yaml + - name: v1.6.2 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.2/bootstrap-components.yaml type: url files: - sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml" - name: kubeadm type: ControlPlaneProvider versions: - - name: v1.6.1 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.1/control-plane-components.yaml + - name: v1.6.2 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.2/control-plane-components.yaml type: url files: - sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml"