Skip to content

Commit df4ac36

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #1361 from Nordix/lentzi90/bump-capi-v1.2.4
🌱 Bump CAPI to v1.2.4
2 parents 505b5d2 + 5225e57 commit df4ac36

File tree

4 files changed

+21
-22
lines changed

4 files changed

+21
-22
lines changed

‎Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,9 @@ e2e-image: docker-build
171171

172172
# Pull all the images references in test/e2e/data/e2e_conf.yaml
173173
test-e2e-image-prerequisites:
174-
docker pull gcr.io/k8s-staging-cluster-api/cluster-api-controller:v1.2.0
175-
docker pull gcr.io/k8s-staging-cluster-api/kubeadm-bootstrap-controller:v1.2.0
176-
docker pull gcr.io/k8s-staging-cluster-api/kubeadm-control-plane-controller:v1.2.0
174+
docker pull gcr.io/k8s-staging-cluster-api/cluster-api-controller:v1.2.4
175+
docker pull gcr.io/k8s-staging-cluster-api/kubeadm-bootstrap-controller:v1.2.4
176+
docker pull gcr.io/k8s-staging-cluster-api/kubeadm-control-plane-controller:v1.2.4
177177
docker pull quay.io/jetstack/cert-manager-cainjector:v1.8.2
178178
docker pull quay.io/jetstack/cert-manager-webhook:v1.8.2
179179
docker pull quay.io/jetstack/cert-manager-controller:v1.8.2

‎go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ require (
2626
k8s.io/component-base v0.24.2
2727
k8s.io/klog/v2 v2.60.1
2828
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
29-
sigs.k8s.io/cluster-api v1.2.0
30-
sigs.k8s.io/cluster-api/test v1.2.0
29+
sigs.k8s.io/cluster-api v1.2.4
30+
sigs.k8s.io/cluster-api/test v1.2.4
3131
sigs.k8s.io/controller-runtime v0.12.3
3232
sigs.k8s.io/yaml v1.3.0
3333
)
@@ -130,4 +130,4 @@ require (
130130
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
131131
)
132132

133-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.2.0
133+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.2.4

‎go.sum

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -214,8 +214,8 @@ github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5Kwzbycv
214214
github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
215215
github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
216216
github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
217-
github.com/flatcar-linux/container-linux-config-transpiler v0.9.2/go.mod h1:AGVTulMzeIKwurV9ExYH3UiokET1Ur65g+EIeRDMwzM=
218-
github.com/flatcar-linux/ignition v0.36.1/go.mod h1:0jS5n4AopgOdwgi7QDo5MFgkMx/fQUDYjuxlGJC1Txg=
217+
github.com/flatcar/container-linux-config-transpiler v0.9.4/go.mod h1:LxanhPvXkWgHG9PrkT4rX/p7YhUPdDGGsUdkNpV3L5U=
218+
github.com/flatcar/ignition v0.36.2/go.mod h1:uk1tpzLFRXus4RrvzgMI+IqmmB8a/RGFSBlI+tMTbbA=
219219
github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
220220
github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
221221
github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
@@ -1024,7 +1024,6 @@ golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuX
10241024
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
10251025
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
10261026
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
1027-
golang.org/x/text v0.3.1-0.20190321115727-fe223c5a2583/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
10281027
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
10291028
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
10301029
golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -1375,10 +1374,10 @@ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8
13751374
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
13761375
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
13771376
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30/go.mod h1:fEO7lRTdivWO2qYVCVG7dEADOMo/MLDCVr8So2g88Uw=
1378-
sigs.k8s.io/cluster-api v1.2.0 h1:jAKG78SQ6nUHfqbRD64FrYZR79P+J7/aiH17zbpsWcQ=
1379-
sigs.k8s.io/cluster-api v1.2.0/go.mod h1:oiuV+mlCV1QxDnuI+PfElFlAfuXHo9ZGVBojoihVtHY=
1380-
sigs.k8s.io/cluster-api/test v1.2.0 h1:l5rQajf3yg9kYbMTVpKX4y2j0SQixEdCqLx9ANrNvF8=
1381-
sigs.k8s.io/cluster-api/test v1.2.0/go.mod h1:JdMqpv9rEOFWQVQ8danpBduqxoQkZMiOvpIGJ7v8qjw=
1377+
sigs.k8s.io/cluster-api v1.2.4 h1:wxfm/p8y+Q3qWVkkIPAIVqabA5lJVvqoRA02Nhup3uk=
1378+
sigs.k8s.io/cluster-api v1.2.4/go.mod h1:YaLJOC9mSsIOpdbh7BpthGmC8uxIJADzrMMIGpgahfM=
1379+
sigs.k8s.io/cluster-api/test v1.2.4 h1:hdYZ8HcQU2kYguE90EreRtzh7Zg6/tG9vW6JafdKX6M=
1380+
sigs.k8s.io/cluster-api/test v1.2.4/go.mod h1:C+UT2CXWNu3eAoeI0HHI19ex90pAdzAqR6YjhxRNHyM=
13821381
sigs.k8s.io/controller-runtime v0.12.3 h1:FCM8xeY/FI8hoAfh/V4XbbYMY20gElh9yh+A98usMio=
13831382
sigs.k8s.io/controller-runtime v0.12.3/go.mod h1:qKsk4WE6zW2Hfj0G4v10EnNB2jMG1C+NTb8h+DwCoU0=
13841383
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 h1:kDi4JBNAsJWfz1aEXhO8Jg87JJaPNLh5tIzYHgStQ9Y=

‎test/e2e/data/e2e_conf.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
managementClusterName: capo-e2e
1313

1414
images:
15-
- name: gcr.io/k8s-staging-cluster-api/cluster-api-controller:v1.2.0
15+
- name: gcr.io/k8s-staging-cluster-api/cluster-api-controller:v1.2.4
1616
loadBehavior: tryLoad
17-
- name: gcr.io/k8s-staging-cluster-api/kubeadm-bootstrap-controller:v1.2.0
17+
- name: gcr.io/k8s-staging-cluster-api/kubeadm-bootstrap-controller:v1.2.4
1818
loadBehavior: tryLoad
19-
- name: gcr.io/k8s-staging-cluster-api/kubeadm-control-plane-controller:v1.2.0
19+
- name: gcr.io/k8s-staging-cluster-api/kubeadm-control-plane-controller:v1.2.4
2020
loadBehavior: tryLoad
2121
# Use local dev images built source tree;
2222
- name: gcr.io/k8s-staging-capi-openstack/capi-openstack-controller:e2e
@@ -32,8 +32,8 @@ providers:
3232
- name: cluster-api
3333
type: CoreProvider
3434
versions:
35-
- name: v1.2.0
36-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.0/core-components.yaml"
35+
- name: v1.2.4
36+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.4/core-components.yaml"
3737
type: url
3838
files:
3939
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
@@ -45,8 +45,8 @@ providers:
4545
- name: kubeadm
4646
type: BootstrapProvider
4747
versions:
48-
- name: v1.2.0
49-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.0/bootstrap-components.yaml"
48+
- name: v1.2.4
49+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.4/bootstrap-components.yaml"
5050
type: url
5151
files:
5252
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
@@ -58,8 +58,8 @@ providers:
5858
- name: kubeadm
5959
type: ControlPlaneProvider
6060
versions:
61-
- name: v1.2.0
62-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.0/control-plane-components.yaml"
61+
- name: v1.2.4
62+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.4/control-plane-components.yaml"
6363
type: url
6464
files:
6565
- sourcePath: "../data/shared/v1beta1/metadata.yaml"

0 commit comments

Comments
 (0)