From 966abda18bd90f89ea6db3abf007063abca6a80b Mon Sep 17 00:00:00 2001 From: Amulya Meka Date: Wed, 9 Oct 2024 10:56:22 +0530 Subject: [PATCH] Update cluster-api to v1.8.4 (#1998) --- go.mod | 6 +++--- go.sum | 8 ++++---- 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, 25 insertions(+), 25 deletions(-) diff --git a/go.mod b/go.mod index 9dbfb5631..dc8e7d685 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ go 1.22.0 replace ( github.com/onsi/ginkgo/v2 => github.com/onsi/ginkgo/v2 v2.19.0 github.com/onsi/gomega => github.com/onsi/gomega v1.33.1 - sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.8.3 + sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.8.4 ) require ( @@ -40,8 +40,8 @@ require ( k8s.io/component-base v0.30.3 k8s.io/klog/v2 v2.120.1 k8s.io/utils v0.0.0-20231127182322-b307cd553661 - sigs.k8s.io/cluster-api v1.8.3 - sigs.k8s.io/cluster-api/test v1.8.3 + sigs.k8s.io/cluster-api v1.8.4 + sigs.k8s.io/cluster-api/test v1.8.4 sigs.k8s.io/controller-runtime v0.18.5 sigs.k8s.io/yaml v1.4.0 ) diff --git a/go.sum b/go.sum index e0f4797c0..ad732c504 100644 --- a/go.sum +++ b/go.sum @@ -522,10 +522,10 @@ k8s.io/utils v0.0.0-20231127182322-b307cd553661 h1:FepOBzJ0GXm8t0su67ln2wAZjbQ6R k8s.io/utils v0.0.0-20231127182322-b307cd553661/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.0 h1:Tc9rS7JJoZ9sl3OpL4842oIk6lH7gWBb0JOmJ0ute7M= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.0/go.mod h1:1ewhL9l1gkPcU/IU/6rFYfikf+7Y5imWv7ARVbBOzNs= -sigs.k8s.io/cluster-api v1.8.3 h1:N6i25rF5QMadwVg2UPfuO6CzmNXjqnF2r1MAO+kcsro= -sigs.k8s.io/cluster-api v1.8.3/go.mod h1:pXv5LqLxuIbhGIXykyNKiJh+KrLweSBajVHHitPLyoY= -sigs.k8s.io/cluster-api/test v1.8.3 h1:kOGXedULJnZIcl7xHt/Kkaju5IRqkd12H6QSLAqX8LE= -sigs.k8s.io/cluster-api/test v1.8.3/go.mod h1:odnzMkDndCRPCWdwl0CRofyZyY857wN34bUih1MLKIc= +sigs.k8s.io/cluster-api v1.8.4 h1:jBKQH1H/HUdUFk8T6qDzIxZJfWw1F5ZP0ZpYQJDmTHs= +sigs.k8s.io/cluster-api v1.8.4/go.mod h1:pXv5LqLxuIbhGIXykyNKiJh+KrLweSBajVHHitPLyoY= +sigs.k8s.io/cluster-api/test v1.8.4 h1:0SVj0x/pZm5yaEkl2Rj7i3YXIbZ0vCGcUrwI26RGMgc= +sigs.k8s.io/cluster-api/test v1.8.4/go.mod h1:odnzMkDndCRPCWdwl0CRofyZyY857wN34bUih1MLKIc= sigs.k8s.io/controller-runtime v0.18.5 h1:nTHio/W+Q4aBlQMgbnC5hZb4IjIidyrizMai9P6n4Rk= sigs.k8s.io/controller-runtime v0.18.5/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= diff --git a/hack/tools/go.mod b/hack/tools/go.mod index 2fd6d5bbc..3ac753d33 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.22.0 -replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.8.3 +replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.8.4 require ( github.com/aquasecurity/trivy v0.55.1 @@ -15,7 +15,7 @@ require ( golang.org/x/vuln v1.1.3 gotest.tools/gotestsum v1.12.0 k8s.io/code-generator v0.30.3 - sigs.k8s.io/cluster-api/hack/tools v0.0.0-20240910140813-945c938ce3e0 + sigs.k8s.io/cluster-api/hack/tools v0.0.0-20241008052423-3cce0d973682 sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20211110210527-619e6b92dab9 sigs.k8s.io/controller-tools v0.15.0 sigs.k8s.io/kustomize/kustomize/v5 v5.4.3 diff --git a/hack/tools/go.sum b/hack/tools/go.sum index b522f63f7..9fb6613eb 100644 --- a/hack/tools/go.sum +++ b/hack/tools/go.sum @@ -2490,10 +2490,10 @@ oras.land/oras-go v1.2.5/go.mod h1:PuAwRShRZCsZb7g8Ar3jKKQR/2A/qN+pkYxIOd/FAoo= 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.8.3 h1:N6i25rF5QMadwVg2UPfuO6CzmNXjqnF2r1MAO+kcsro= -sigs.k8s.io/cluster-api v1.8.3/go.mod h1:pXv5LqLxuIbhGIXykyNKiJh+KrLweSBajVHHitPLyoY= -sigs.k8s.io/cluster-api/hack/tools v0.0.0-20240910140813-945c938ce3e0 h1:D9qhYkouDlUBA3aCZFbc01dWzbAqQ8CjdN59OaR6N5A= -sigs.k8s.io/cluster-api/hack/tools v0.0.0-20240910140813-945c938ce3e0/go.mod h1:3y+SxSal+CoGcM32IeS/wZ5Wdqio88t15+bnTYOzTew= +sigs.k8s.io/cluster-api v1.8.4 h1:jBKQH1H/HUdUFk8T6qDzIxZJfWw1F5ZP0ZpYQJDmTHs= +sigs.k8s.io/cluster-api v1.8.4/go.mod h1:pXv5LqLxuIbhGIXykyNKiJh+KrLweSBajVHHitPLyoY= +sigs.k8s.io/cluster-api/hack/tools v0.0.0-20241008052423-3cce0d973682 h1:a1w4OzUTbH8EzmZflWZfgTY6uSSlz6Ldmve7Zt3K+qc= +sigs.k8s.io/cluster-api/hack/tools v0.0.0-20241008052423-3cce0d973682/go.mod h1:3y+SxSal+CoGcM32IeS/wZ5Wdqio88t15+bnTYOzTew= 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.15.0 h1:4dxdABXGDhIa68Fiwaif0vcu32xfwmgQ+w8p+5CxoAI= diff --git a/test/e2e/config/ibmcloud-e2e-powervs.yaml b/test/e2e/config/ibmcloud-e2e-powervs.yaml index de22eec9c..91cbabb2d 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.8.3 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.3/core-components.yaml + - name: v1.8.4 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.4/core-components.yaml type: url files: - sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml" - name: kubeadm type: BootstrapProvider versions: - - name: v1.8.3 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.3/bootstrap-components.yaml + - name: v1.8.4 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.4/bootstrap-components.yaml type: url files: - sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml" - name: kubeadm type: ControlPlaneProvider versions: - - name: v1.8.3 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.3/control-plane-components.yaml + - name: v1.8.4 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.4/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 2246b808c..f6d5b818c 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.8.3 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.3/core-components.yaml + - name: v1.8.4 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.4/core-components.yaml type: url files: - sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml" - name: kubeadm type: BootstrapProvider versions: - - name: v1.8.3 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.3/bootstrap-components.yaml + - name: v1.8.4 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.4/bootstrap-components.yaml type: url files: - sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml" - name: kubeadm type: ControlPlaneProvider versions: - - name: v1.8.3 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.3/control-plane-components.yaml + - name: v1.8.4 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.4/control-plane-components.yaml type: url files: - sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml"