diff --git a/go.mod b/go.mod index 7a3f44493..45039b728 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module sigs.k8s.io/cluster-api-provider-ibmcloud go 1.19 -replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.3.4 +replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.3.5 require ( github.com/IBM-Cloud/power-go-client v1.2.2 @@ -28,8 +28,8 @@ require ( k8s.io/client-go v0.25.0 k8s.io/klog/v2 v2.80.1 k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73 - sigs.k8s.io/cluster-api v1.3.4 - sigs.k8s.io/cluster-api/test v1.3.4 + sigs.k8s.io/cluster-api v1.3.5 + sigs.k8s.io/cluster-api/test v1.3.5 sigs.k8s.io/controller-runtime v0.13.1 ) diff --git a/go.sum b/go.sum index 8a3a4065a..9a0c1042d 100644 --- a/go.sum +++ b/go.sum @@ -1405,10 +1405,10 @@ k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/ 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.3.4 h1:YXxcXu+mhzvOPLHfF+OQ27jYzks3zMH3AxbFckER0Ug= -sigs.k8s.io/cluster-api v1.3.4/go.mod h1:9FNHNItE5c+klfDLNG3+ApSTX0H4yGAumdbFJMnk6Vc= -sigs.k8s.io/cluster-api/test v1.3.4 h1:T2ZThmIB/EZusMlHPdQ4g9VWiFwB6sIk8w65mMjcvkU= -sigs.k8s.io/cluster-api/test v1.3.4/go.mod h1:oRc0fAaj3ZPMuV0GTRQbseZ6IrNyDUB8ReKil5lkAtw= +sigs.k8s.io/cluster-api v1.3.5 h1:Chg56Piv5ip0AFRN83H1I8uIn6qsdk+mr9hdq5Cxkf0= +sigs.k8s.io/cluster-api v1.3.5/go.mod h1:9FNHNItE5c+klfDLNG3+ApSTX0H4yGAumdbFJMnk6Vc= +sigs.k8s.io/cluster-api/test v1.3.5 h1:+uY+oMwIK5NOH1S/VPCl5gl9TuUBRRdr/qiji4r1B7I= +sigs.k8s.io/cluster-api/test v1.3.5/go.mod h1:oRc0fAaj3ZPMuV0GTRQbseZ6IrNyDUB8ReKil5lkAtw= sigs.k8s.io/controller-runtime v0.13.1 h1:tUsRCSJVM1QQOOeViGeX3GMT3dQF1eePPw6sEE3xSlg= sigs.k8s.io/controller-runtime v0.13.1/go.mod h1:Zbz+el8Yg31jubvAEyglRZGdLAjplZl+PgtYNI6WNTI= sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k= diff --git a/hack/tools/go.mod b/hack/tools/go.mod index 7d8ff2b63..dbfb12b98 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.19 -replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.3.4 +replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.3.5 require ( github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 @@ -13,7 +13,7 @@ require ( github.com/onsi/ginkgo/v2 v2.6.0 gotest.tools/gotestsum v1.8.2 k8s.io/code-generator v0.25.0 - sigs.k8s.io/cluster-api/hack/tools v0.0.0-20230228182620-26d03d294353 + sigs.k8s.io/cluster-api/hack/tools v0.0.0-20230302154855-58770484dee6 sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20211110210527-619e6b92dab9 sigs.k8s.io/controller-tools v0.10.0 sigs.k8s.io/kustomize/kustomize/v4 v4.5.7 diff --git a/hack/tools/go.sum b/hack/tools/go.sum index a57f302e8..3611d9cd4 100644 --- a/hack/tools/go.sum +++ b/hack/tools/go.sum @@ -1210,10 +1210,10 @@ mvdan.cc/unparam v0.0.0-20220706161116-678bad134442/go.mod h1:F/Cxw/6mVrNKqrR2Yj 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.3.4 h1:YXxcXu+mhzvOPLHfF+OQ27jYzks3zMH3AxbFckER0Ug= -sigs.k8s.io/cluster-api v1.3.4/go.mod h1:9FNHNItE5c+klfDLNG3+ApSTX0H4yGAumdbFJMnk6Vc= -sigs.k8s.io/cluster-api/hack/tools v0.0.0-20230228182620-26d03d294353 h1:bha4SUiDOjwoX7YCpPsn50GEvKgDcK/SCt9QeWSyt0E= -sigs.k8s.io/cluster-api/hack/tools v0.0.0-20230228182620-26d03d294353/go.mod h1:odctE5j0T+gmXEAkLNXH6Sv4CE0cgHkdIDPqhTgg6IY= +sigs.k8s.io/cluster-api v1.3.5 h1:Chg56Piv5ip0AFRN83H1I8uIn6qsdk+mr9hdq5Cxkf0= +sigs.k8s.io/cluster-api v1.3.5/go.mod h1:9FNHNItE5c+klfDLNG3+ApSTX0H4yGAumdbFJMnk6Vc= +sigs.k8s.io/cluster-api/hack/tools v0.0.0-20230302154855-58770484dee6 h1:qh/HPtXjl7PJsjY5SoWuQJ5jb+lJXK37t6jOYocczEI= +sigs.k8s.io/cluster-api/hack/tools v0.0.0-20230302154855-58770484dee6/go.mod h1:odctE5j0T+gmXEAkLNXH6Sv4CE0cgHkdIDPqhTgg6IY= 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.10.0 h1:0L5DTDTFB67jm9DkfrONgTGmfc/zYow0ZaHyppizU2U= diff --git a/test/e2e/config/ibmcloud-e2e-powervs.yaml b/test/e2e/config/ibmcloud-e2e-powervs.yaml index c42ddbec3..7fc6729a8 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.3.4 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.4/core-components.yaml + - name: v1.3.5 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.5/core-components.yaml type: url files: - sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml" - name: kubeadm type: BootstrapProvider versions: - - name: v1.3.4 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.4/bootstrap-components.yaml + - name: v1.3.5 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.5/bootstrap-components.yaml type: url files: - sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml" - name: kubeadm type: ControlPlaneProvider versions: - - name: v1.3.4 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.4/control-plane-components.yaml + - name: v1.3.5 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.5/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 1abcf43a7..80c801053 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.3.4 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.4/core-components.yaml + - name: v1.3.5 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.5/core-components.yaml type: url files: - sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml" - name: kubeadm type: BootstrapProvider versions: - - name: v1.3.4 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.4/bootstrap-components.yaml + - name: v1.3.5 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.5/bootstrap-components.yaml type: url files: - sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml" - name: kubeadm type: ControlPlaneProvider versions: - - name: v1.3.4 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.4/control-plane-components.yaml + - name: v1.3.5 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.3.5/control-plane-components.yaml type: url files: - sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml"