Skip to content

Commit cc12c52

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #5249 from nrb/capi-1.8.5
🌱 Bump CAPI to 1.8.6
2 parents ba78656 + 9b4d685 commit cc12c52

File tree

5 files changed

+30
-30
lines changed

5 files changed

+30
-30
lines changed

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ require (
5454
k8s.io/klog/v2 v2.120.1
5555
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
5656
sigs.k8s.io/aws-iam-authenticator v0.6.13
57-
sigs.k8s.io/cluster-api v1.8.4
58-
sigs.k8s.io/cluster-api/test v1.8.4
59-
sigs.k8s.io/controller-runtime v0.18.5
57+
sigs.k8s.io/cluster-api v1.8.6
58+
sigs.k8s.io/cluster-api/test v1.8.6
59+
sigs.k8s.io/controller-runtime v0.18.6
6060
sigs.k8s.io/yaml v1.4.0
6161
)
6262

‎go.sum‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@ github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
123123
github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
124124
github.com/coredns/caddy v1.1.1 h1:2eYKZT7i6yxIfGP3qLJoJ7HAsDJqYB+X68g4NYjSrE0=
125125
github.com/coredns/caddy v1.1.1/go.mod h1:A6ntJQlAWuQfFlsd9hvigKbo2WS0VUs2l1e2F+BawD4=
126-
github.com/coredns/corefile-migration v1.0.23 h1:Fp4FETmk8sT/IRgnKX2xstC2dL7+QdcU+BL5AYIN3Jw=
127-
github.com/coredns/corefile-migration v1.0.23/go.mod h1:8HyMhuyzx9RLZp8cRc9Uf3ECpEAafHOFxQWUPqktMQI=
126+
github.com/coredns/corefile-migration v1.0.24 h1:NL/zRKijhJZLYlNnMr891DRv5jXgfd3Noons1M6oTpc=
127+
github.com/coredns/corefile-migration v1.0.24/go.mod h1:56DPqONc3njpVPsdilEnfijCwNGC3/kTJLl7i7SPavY=
128128
github.com/coreos/go-json v0.0.0-20230131223807-18775e0fb4fb h1:rmqyI19j3Z/74bIRhuC59RB442rXUazKNueVpfJPxg4=
129129
github.com/coreos/go-json v0.0.0-20230131223807-18775e0fb4fb/go.mod h1:rcFZM3uxVvdyNmsAV2jopgPD1cs5SPWJWU5dOz2LUnw=
130130
github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4=
@@ -796,12 +796,12 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.0 h1:Tc9rS7JJoZ9sl
796796
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.0/go.mod h1:1ewhL9l1gkPcU/IU/6rFYfikf+7Y5imWv7ARVbBOzNs=
797797
sigs.k8s.io/aws-iam-authenticator v0.6.13 h1:QSQcAkpt/hF97Ogyoz6sj3WD2twTd2cmxFb4e6Rs9gA=
798798
sigs.k8s.io/aws-iam-authenticator v0.6.13/go.mod h1:CnvFyzR/xeLHmUY/BD0qW6q0wp6KIwXmFp4eTfrHdP8=
799-
sigs.k8s.io/cluster-api v1.8.4 h1:jBKQH1H/HUdUFk8T6qDzIxZJfWw1F5ZP0ZpYQJDmTHs=
800-
sigs.k8s.io/cluster-api v1.8.4/go.mod h1:pXv5LqLxuIbhGIXykyNKiJh+KrLweSBajVHHitPLyoY=
801-
sigs.k8s.io/cluster-api/test v1.8.4 h1:0SVj0x/pZm5yaEkl2Rj7i3YXIbZ0vCGcUrwI26RGMgc=
802-
sigs.k8s.io/cluster-api/test v1.8.4/go.mod h1:odnzMkDndCRPCWdwl0CRofyZyY857wN34bUih1MLKIc=
803-
sigs.k8s.io/controller-runtime v0.18.5 h1:nTHio/W+Q4aBlQMgbnC5hZb4IjIidyrizMai9P6n4Rk=
804-
sigs.k8s.io/controller-runtime v0.18.5/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg=
799+
sigs.k8s.io/cluster-api v1.8.6 h1:kQvvEvO7+SCLLXHFW7lRmDQK60g+WD5yCRl1OPzdy40=
800+
sigs.k8s.io/cluster-api v1.8.6/go.mod h1:RhIkNM1I2Of4xXCgPHtRDHNprVrLgFFeA8BQRRIy+Tk=
801+
sigs.k8s.io/cluster-api/test v1.8.6 h1:0T6qxN2o4hHK2gSB0X2m/iCzekVjJcwqxj3SSLWLTGs=
802+
sigs.k8s.io/cluster-api/test v1.8.6/go.mod h1:GSWpRlulF49kEjFPbnSWnhe7riWam4UGNSphLL8kctA=
803+
sigs.k8s.io/controller-runtime v0.18.6 h1:UnEoLBLDpQwzJ2jYh6aTdiMhGjNDR7IdFn9YEqHIccc=
804+
sigs.k8s.io/controller-runtime v0.18.6/go.mod h1:Dcsa9v8AEBWa3sQNJHsuWPT4ICv99irl5wj83NiC12U=
805805
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
806806
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
807807
sigs.k8s.io/kind v0.24.0 h1:g4y4eu0qa+SCeKESLpESgMmVFBebL0BDa6f777OIWrg=

‎test/e2e/data/e2e_conf.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ images:
2626
loadBehavior: tryLoad
2727
- name: quay.io/jetstack/cert-manager-controller:v1.15.1
2828
loadBehavior: tryLoad
29-
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.8.4
29+
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.8.6
3030
loadBehavior: tryLoad
31-
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.8.4
31+
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.8.6
3232
loadBehavior: tryLoad
33-
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.8.4
33+
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.8.6
3434
loadBehavior: tryLoad
3535

3636
providers:
@@ -48,8 +48,8 @@ providers:
4848
new: "imagePullPolicy: IfNotPresent"
4949
- old: --metrics-bind-addr=127.0.0.1:8080
5050
new: --metrics-bind-addr=:8080
51-
- name: v1.8.4 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
52-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.4/core-components.yaml"
51+
- name: v1.8.6 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
52+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.6/core-components.yaml"
5353
type: "url"
5454
contract: v1beta1
5555
files:
@@ -75,8 +75,8 @@ providers:
7575
new: "imagePullPolicy: IfNotPresent"
7676
- old: --metrics-bind-addr=127.0.0.1:8080
7777
new: --metrics-bind-addr=:8080
78-
- name: v1.8.4 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
79-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.4/bootstrap-components.yaml"
78+
- name: v1.8.6 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
79+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.6/bootstrap-components.yaml"
8080
type: "url"
8181
contract: v1beta1
8282
files:
@@ -102,8 +102,8 @@ providers:
102102
new: "imagePullPolicy: IfNotPresent"
103103
- old: --metrics-bind-addr=127.0.0.1:8080
104104
new: --metrics-bind-addr=:8080
105-
- name: v1.8.4 # latest published release in the v1beta1 series; this is used for v1beta1 --> v1beta1 latest clusterctl upgrades test only.
106-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.4/control-plane-components.yaml"
105+
- name: v1.8.6 # latest published release in the v1beta1 series; this is used for v1beta1 --> v1beta1 latest clusterctl upgrades test only.
106+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.6/control-plane-components.yaml"
107107
type: "url"
108108
contract: v1beta1
109109
files:

‎test/e2e/data/e2e_eks_conf.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,19 @@ images:
2323
loadBehavior: tryLoad
2424
- name: quay.io/jetstack/cert-manager-controller:v1.15.1
2525
loadBehavior: tryLoad
26-
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.8.4
26+
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.8.6
2727
loadBehavior: tryLoad
28-
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.8.4
28+
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.8.6
2929
loadBehavior: tryLoad
30-
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.8.4
30+
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.8.6
3131
loadBehavior: tryLoad
3232

3333
providers:
3434
- name: cluster-api
3535
type: CoreProvider
3636
versions:
37-
- name: v1.8.4
38-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.4/core-components.yaml"
37+
- name: v1.8.6
38+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.6/core-components.yaml"
3939
type: "url"
4040
contract: v1beta1
4141
files:
@@ -50,8 +50,8 @@ providers:
5050
files:
5151
- sourcePath: "./shared/v1beta1/metadata.yaml"
5252
versions:
53-
- name: v1.8.4
54-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.4/bootstrap-components.yaml"
53+
- name: v1.8.6
54+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.6/bootstrap-components.yaml"
5555
type: "url"
5656
contract: v1beta1
5757
files:
@@ -66,8 +66,8 @@ providers:
6666
files:
6767
- sourcePath: "./shared/v1beta1/metadata.yaml"
6868
versions:
69-
- name: v1.8.4
70-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.4/control-plane-components.yaml"
69+
- name: v1.8.6
70+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.6/control-plane-components.yaml"
7171
type: "url"
7272
contract: v1beta1
7373
files:

‎versions.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
MDBOOK_VERSION := v0.4.5
1616
PLANTUML_VERSION := 1.2020.16
1717
CERT_MANAGER_VERSION := v1.15.1
18-
CAPI_VERSION := v1.8.4
18+
CAPI_VERSION := v1.8.6
1919
KPROMO_VERSION := v4.0.4
2020
YQ_VERSION := v4.25.2
2121
GOLANGCI_LINT_VERSION := v1.53.3

0 commit comments

Comments
 (0)