Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update cluster-api to v1.4.0 #1177

Merged
merged 1 commit into from
Apr 4, 2023
Merged

Update cluster-api to v1.4.0 #1177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ go 1.19
replace (
github.com/onsi/ginkgo/v2 => github.com/onsi/ginkgo/v2 v2.9.1
github.com/onsi/gomega => github.com/onsi/gomega v1.27.4
sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.4.0-rc.0
sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.4.0
)

require (
Expand All @@ -33,8 +33,8 @@ require (
k8s.io/client-go v0.26.1
k8s.io/klog/v2 v2.80.1
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448
sigs.k8s.io/cluster-api v1.4.0-rc.0
sigs.k8s.io/cluster-api/test v1.4.0-rc.0
sigs.k8s.io/cluster-api v1.4.0
sigs.k8s.io/cluster-api/test v1.4.0
sigs.k8s.io/controller-runtime v0.14.5
)

Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1200,10 +1200,10 @@ k8s.io/utils v0.0.0-20221128185143-99ec85e7a448/go.mod h1:OLgZIPagt7ERELqWJFomSt
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.4.0-rc.0 h1:MzqOwbjmOb7XnYsjwo1eNijYhzbTWf1TfjJZ7nKQI+s=
sigs.k8s.io/cluster-api v1.4.0-rc.0/go.mod h1:6w9nUYSE1Mc0HkyjxyQoaDu8L9YmlpFFFn9n9Zvr9U4=
sigs.k8s.io/cluster-api/test v1.4.0-rc.0 h1:8TIV8282QXcfDlLd1S58oGfKOwh7CRA6V+uLBhIRS24=
sigs.k8s.io/cluster-api/test v1.4.0-rc.0/go.mod h1:IR6swYJ/bHq2XMhUwLR051vPlRNL5Wsjie/4s3+QRaQ=
sigs.k8s.io/cluster-api v1.4.0 h1:qkFt+yie4kDJQY4qD67rJR/S2dQ1IBZr/B2moYeVzWI=
sigs.k8s.io/cluster-api v1.4.0/go.mod h1:6w9nUYSE1Mc0HkyjxyQoaDu8L9YmlpFFFn9n9Zvr9U4=
sigs.k8s.io/cluster-api/test v1.4.0 h1:oUPPm4QG827iSUAB/341B72wsvnIRy95t8cE74zMtCY=
sigs.k8s.io/cluster-api/test v1.4.0/go.mod h1:IR6swYJ/bHq2XMhUwLR051vPlRNL5Wsjie/4s3+QRaQ=
sigs.k8s.io/controller-runtime v0.14.5 h1:6xaWFqzT5KuAQ9ufgUaj1G/+C4Y1GRkhrxl+BJ9i+5s=
sigs.k8s.io/controller-runtime v0.14.5/go.mod h1:WqIdsAY6JBsjfc/CqO0CORmNtoCtE4S6qbPc9s68h+0=
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=
Expand Down
4 changes: 2 additions & 2 deletions hack/tools/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.4.0-rc.0
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.4.0

require (
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46
Expand All @@ -13,7 +13,7 @@ require (
github.com/onsi/ginkgo/v2 v2.9.1
gotest.tools/gotestsum v1.8.2
k8s.io/code-generator v0.26.1
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20230314140816-47193a3b994d
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20230328130021-2c0771782941
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20211110210527-619e6b92dab9
sigs.k8s.io/controller-tools v0.11.3
sigs.k8s.io/kustomize/kustomize/v4 v4.5.7
Expand Down
8 changes: 4 additions & 4 deletions hack/tools/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1220,10 +1220,10 @@ mvdan.cc/unparam v0.0.0-20221223090309-7455f1af531d/go.mod h1:IeHQjmn6TOD+e4Z3RF
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.4.0-rc.0 h1:MzqOwbjmOb7XnYsjwo1eNijYhzbTWf1TfjJZ7nKQI+s=
sigs.k8s.io/cluster-api v1.4.0-rc.0/go.mod h1:6w9nUYSE1Mc0HkyjxyQoaDu8L9YmlpFFFn9n9Zvr9U4=
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20230314140816-47193a3b994d h1:zC9GR2H+dH5QeEPahEvCebSKdG+2vCcWXR9FUjNh36k=
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20230314140816-47193a3b994d/go.mod h1:wPzTJUNCrzspp367YIpqZPqditXEyktxuTVQRf3suWs=
sigs.k8s.io/cluster-api v1.4.0 h1:qkFt+yie4kDJQY4qD67rJR/S2dQ1IBZr/B2moYeVzWI=
sigs.k8s.io/cluster-api v1.4.0/go.mod h1:6w9nUYSE1Mc0HkyjxyQoaDu8L9YmlpFFFn9n9Zvr9U4=
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20230328130021-2c0771782941 h1:A7SfLmz0k3GmSS1Cs/EtPSDziOPKM022CvC6Qwcn7aY=
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20230328130021-2c0771782941/go.mod h1:wPzTJUNCrzspp367YIpqZPqditXEyktxuTVQRf3suWs=
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.11.3 h1:T1xzLkog9saiyQSLz1XOImu4OcbdXWytc5cmYsBeBiE=
Expand Down
12 changes: 6 additions & 6 deletions test/e2e/config/ibmcloud-e2e-powervs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,24 @@ providers:
- name: cluster-api
type: CoreProvider
versions:
- name: v1.4.0-rc.0
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.0-rc.0/core-components.yaml
- name: v1.4.0
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.0/core-components.yaml
type: url
files:
- sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml"
- name: kubeadm
type: BootstrapProvider
versions:
- name: v1.4.0-rc.0
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.0-rc.0/bootstrap-components.yaml
- name: v1.4.0
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.0/bootstrap-components.yaml
type: url
files:
- sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml"
- name: kubeadm
type: ControlPlaneProvider
versions:
- name: v1.4.0-rc.0
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.0-rc.0/control-plane-components.yaml
- name: v1.4.0
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.0/control-plane-components.yaml
type: url
files:
- sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml"
Expand Down
12 changes: 6 additions & 6 deletions test/e2e/config/ibmcloud-e2e-vpc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,24 @@ providers:
- name: cluster-api
type: CoreProvider
versions:
- name: v1.4.0-rc.0
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.0-rc.0/core-components.yaml
- name: v1.4.0
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.0/core-components.yaml
type: url
files:
- sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml"
- name: kubeadm
type: BootstrapProvider
versions:
- name: v1.4.0-rc.0
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.0-rc.0/bootstrap-components.yaml
- name: v1.4.0
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.0/bootstrap-components.yaml
type: url
files:
- sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml"
- name: kubeadm
type: ControlPlaneProvider
versions:
- name: v1.4.0-rc.0
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.0-rc.0/control-plane-components.yaml
- name: v1.4.0
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.0/control-plane-components.yaml
type: url
files:
- sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml"
Expand Down