Skip to content

Commit 8a01f1e

Browse files
hrakhrak
committed
Upgrade cluster-api dependency to v1.2.12
Signed-off-by: Hans Rakers <[email protected]>
1 parent f1e4902 commit 8a01f1e

File tree

6 files changed

+22
-22
lines changed

6 files changed

+22
-22
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ kind-cluster: cluster-api ## Create a kind cluster with a local Docker repositor
237237
./cluster-api/hack/kind-install-for-capd.sh
238238

239239
cluster-api: ## Clone cluster-api repository for tilt use.
240-
git clone --branch v1.2.11 --depth 1 https://github.com/kubernetes-sigs/cluster-api.git
240+
git clone --branch v1.2.12 --depth 1 https://github.com/kubernetes-sigs/cluster-api.git
241241

242242
cluster-api/tilt-settings.json: hack/tilt-settings.json cluster-api
243243
cp ./hack/tilt-settings.json cluster-api

‎go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ require (
2121
k8s.io/client-go v0.25.3
2222
k8s.io/klog/v2 v2.80.1
2323
k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2
24-
sigs.k8s.io/cluster-api v1.2.11
24+
sigs.k8s.io/cluster-api v1.2.12
2525
sigs.k8s.io/controller-runtime v0.13.1
2626
)
2727

@@ -102,6 +102,6 @@ require (
102102

103103
replace github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.0.0 // Indirect upgrade to address https://github.com/advisories/GHSA-w73w-5m7g-f7qc
104104

105-
replace sigs.k8s.io/cluster-api/test => sigs.k8s.io/cluster-api/test v1.2.11
105+
replace sigs.k8s.io/cluster-api/test => sigs.k8s.io/cluster-api/test v1.2.12
106106

107-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.2.11
107+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.2.12

‎go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1047,8 +1047,8 @@ k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2/go.mod h1:OLgZIPagt7ERELqWJFomSt
10471047
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
10481048
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
10491049
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
1050-
sigs.k8s.io/cluster-api v1.2.11 h1:rtx6fp05qESvtALUGIizUAci0kmiEoVBG786C05L1jU=
1051-
sigs.k8s.io/cluster-api v1.2.11/go.mod h1:VB4qC2t1WjqzBtJvxx3VImb/hLpdXjiWxkdd7OX29mA=
1050+
sigs.k8s.io/cluster-api v1.2.12 h1:/1iFgWUR3Z+KZU9B4PJegmlQQo6uzQXBZNgOk63SLu4=
1051+
sigs.k8s.io/cluster-api v1.2.12/go.mod h1:9+fLUuyRsKediKJYrbsyFj6Bmk59oopXpzj3g6/REM8=
10521052
sigs.k8s.io/controller-runtime v0.13.1 h1:tUsRCSJVM1QQOOeViGeX3GMT3dQF1eePPw6sEE3xSlg=
10531053
sigs.k8s.io/controller-runtime v0.13.1/go.mod h1:Zbz+el8Yg31jubvAEyglRZGdLAjplZl+PgtYNI6WNTI=
10541054
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=

‎test/e2e/config/cloudstack.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ images:
1515
## PLEASE KEEP THESE UP TO DATE WITH THE COMPONENTS
1616

1717
# Cluster API v1beta1 Preloads
18-
- name: gcr.io/k8s-staging-cluster-api/cluster-api-controller:v1.2.11
18+
- name: gcr.io/k8s-staging-cluster-api/cluster-api-controller:v1.2.12
1919
loadBehavior: tryLoad
20-
- name: gcr.io/k8s-staging-cluster-api/kubeadm-bootstrap-controller:v1.2.11
20+
- name: gcr.io/k8s-staging-cluster-api/kubeadm-bootstrap-controller:v1.2.12
2121
loadBehavior: tryLoad
22-
- name: gcr.io/k8s-staging-cluster-api/kubeadm-control-plane-controller:v1.2.11
22+
- name: gcr.io/k8s-staging-cluster-api/kubeadm-control-plane-controller:v1.2.12
2323
loadBehavior: tryLoad
2424
- name: gcr.io/k8s-staging-cluster-api/capd-manager-amd64:v1.0.0
2525
loadBehavior: tryLoad
@@ -34,8 +34,8 @@ providers:
3434
- name: cluster-api
3535
type: CoreProvider
3636
versions:
37-
- name: v1.2.11
38-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.11/core-components.yaml"
37+
- name: v1.2.12
38+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.12/core-components.yaml"
3939
type: "url"
4040
contract: v1beta1
4141
replacements:
@@ -47,8 +47,8 @@ providers:
4747
- name: kubeadm
4848
type: BootstrapProvider
4949
versions:
50-
- name: v1.2.11
51-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.11/bootstrap-components.yaml"
50+
- name: v1.2.12
51+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.12/bootstrap-components.yaml"
5252
type: "url"
5353
contract: v1beta1
5454
replacements:
@@ -60,8 +60,8 @@ providers:
6060
- name: kubeadm
6161
type: ControlPlaneProvider
6262
versions:
63-
- name: v1.2.11
64-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.11/control-plane-components.yaml"
63+
- name: v1.2.12
64+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.12/control-plane-components.yaml"
6565
type: "url"
6666
contract: v1beta1
6767
replacements:

‎test/e2e/go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ require (
1212
k8s.io/api v0.25.3
1313
k8s.io/apimachinery v0.25.3
1414
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed
15-
sigs.k8s.io/cluster-api v1.2.11
16-
sigs.k8s.io/cluster-api/test v1.2.11
15+
sigs.k8s.io/cluster-api v1.2.12
16+
sigs.k8s.io/cluster-api/test v1.2.12
1717
sigs.k8s.io/controller-runtime v0.13.1
1818
)
1919

@@ -124,4 +124,4 @@ require (
124124
sigs.k8s.io/yaml v1.3.0 // indirect
125125
)
126126

127-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.2.11
127+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.2.12

‎test/e2e/go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -986,10 +986,10 @@ k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/
986986
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
987987
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
988988
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
989-
sigs.k8s.io/cluster-api v1.2.11 h1:rtx6fp05qESvtALUGIizUAci0kmiEoVBG786C05L1jU=
990-
sigs.k8s.io/cluster-api v1.2.11/go.mod h1:VB4qC2t1WjqzBtJvxx3VImb/hLpdXjiWxkdd7OX29mA=
991-
sigs.k8s.io/cluster-api/test v1.2.11 h1:lSkSs2q/eGCqNhnhdTdKQ+wz1l7emZB81bQJL367DOI=
992-
sigs.k8s.io/cluster-api/test v1.2.11/go.mod h1:iXCyt/916mWnKhU0xeCwgT7Xkn7jFbj/ArhIo07D8Kc=
989+
sigs.k8s.io/cluster-api v1.2.12 h1:/1iFgWUR3Z+KZU9B4PJegmlQQo6uzQXBZNgOk63SLu4=
990+
sigs.k8s.io/cluster-api v1.2.12/go.mod h1:9+fLUuyRsKediKJYrbsyFj6Bmk59oopXpzj3g6/REM8=
991+
sigs.k8s.io/cluster-api/test v1.2.12 h1:ylD8lUW6aZpmdkaAvRs6vBpN1zjiQuBr/kl6pya5FbY=
992+
sigs.k8s.io/cluster-api/test v1.2.12/go.mod h1:7rOSOBPkq5yqii/d/uf4EN/Ve4MWyYHGfQaCTTmlKsQ=
993993
sigs.k8s.io/controller-runtime v0.13.1 h1:tUsRCSJVM1QQOOeViGeX3GMT3dQF1eePPw6sEE3xSlg=
994994
sigs.k8s.io/controller-runtime v0.13.1/go.mod h1:Zbz+el8Yg31jubvAEyglRZGdLAjplZl+PgtYNI6WNTI=
995995
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2/go.mod h1:B+TnT182UBxE84DiCz4CVE26eOSDAeYCpfDnC2kdKMY=

0 commit comments

Comments
 (0)