Skip to content

🌱 Bump CAPI to 1.8.6 #5249

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.

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

Merged
merged 1 commit into from
Jan 29, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ require (
k8s.io/klog/v2 v2.120.1
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
sigs.k8s.io/aws-iam-authenticator v0.6.13
sigs.k8s.io/cluster-api v1.8.4
sigs.k8s.io/cluster-api/test v1.8.4
sigs.k8s.io/controller-runtime v0.18.5
sigs.k8s.io/cluster-api v1.8.6
sigs.k8s.io/cluster-api/test v1.8.6
sigs.k8s.io/controller-runtime v0.18.6
sigs.k8s.io/yaml v1.4.0
)

Expand Down
16 changes: 8 additions & 8 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
github.com/coredns/caddy v1.1.1 h1:2eYKZT7i6yxIfGP3qLJoJ7HAsDJqYB+X68g4NYjSrE0=
github.com/coredns/caddy v1.1.1/go.mod h1:A6ntJQlAWuQfFlsd9hvigKbo2WS0VUs2l1e2F+BawD4=
github.com/coredns/corefile-migration v1.0.23 h1:Fp4FETmk8sT/IRgnKX2xstC2dL7+QdcU+BL5AYIN3Jw=
github.com/coredns/corefile-migration v1.0.23/go.mod h1:8HyMhuyzx9RLZp8cRc9Uf3ECpEAafHOFxQWUPqktMQI=
github.com/coredns/corefile-migration v1.0.24 h1:NL/zRKijhJZLYlNnMr891DRv5jXgfd3Noons1M6oTpc=
github.com/coredns/corefile-migration v1.0.24/go.mod h1:56DPqONc3njpVPsdilEnfijCwNGC3/kTJLl7i7SPavY=
github.com/coreos/go-json v0.0.0-20230131223807-18775e0fb4fb h1:rmqyI19j3Z/74bIRhuC59RB442rXUazKNueVpfJPxg4=
github.com/coreos/go-json v0.0.0-20230131223807-18775e0fb4fb/go.mod h1:rcFZM3uxVvdyNmsAV2jopgPD1cs5SPWJWU5dOz2LUnw=
github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4=
Expand Down Expand Up @@ -796,12 +796,12 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.0 h1:Tc9rS7JJoZ9sl
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.0/go.mod h1:1ewhL9l1gkPcU/IU/6rFYfikf+7Y5imWv7ARVbBOzNs=
sigs.k8s.io/aws-iam-authenticator v0.6.13 h1:QSQcAkpt/hF97Ogyoz6sj3WD2twTd2cmxFb4e6Rs9gA=
sigs.k8s.io/aws-iam-authenticator v0.6.13/go.mod h1:CnvFyzR/xeLHmUY/BD0qW6q0wp6KIwXmFp4eTfrHdP8=
sigs.k8s.io/cluster-api v1.8.4 h1:jBKQH1H/HUdUFk8T6qDzIxZJfWw1F5ZP0ZpYQJDmTHs=
sigs.k8s.io/cluster-api v1.8.4/go.mod h1:pXv5LqLxuIbhGIXykyNKiJh+KrLweSBajVHHitPLyoY=
sigs.k8s.io/cluster-api/test v1.8.4 h1:0SVj0x/pZm5yaEkl2Rj7i3YXIbZ0vCGcUrwI26RGMgc=
sigs.k8s.io/cluster-api/test v1.8.4/go.mod h1:odnzMkDndCRPCWdwl0CRofyZyY857wN34bUih1MLKIc=
sigs.k8s.io/controller-runtime v0.18.5 h1:nTHio/W+Q4aBlQMgbnC5hZb4IjIidyrizMai9P6n4Rk=
sigs.k8s.io/controller-runtime v0.18.5/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg=
sigs.k8s.io/cluster-api v1.8.6 h1:kQvvEvO7+SCLLXHFW7lRmDQK60g+WD5yCRl1OPzdy40=
sigs.k8s.io/cluster-api v1.8.6/go.mod h1:RhIkNM1I2Of4xXCgPHtRDHNprVrLgFFeA8BQRRIy+Tk=
sigs.k8s.io/cluster-api/test v1.8.6 h1:0T6qxN2o4hHK2gSB0X2m/iCzekVjJcwqxj3SSLWLTGs=
sigs.k8s.io/cluster-api/test v1.8.6/go.mod h1:GSWpRlulF49kEjFPbnSWnhe7riWam4UGNSphLL8kctA=
sigs.k8s.io/controller-runtime v0.18.6 h1:UnEoLBLDpQwzJ2jYh6aTdiMhGjNDR7IdFn9YEqHIccc=
sigs.k8s.io/controller-runtime v0.18.6/go.mod h1:Dcsa9v8AEBWa3sQNJHsuWPT4ICv99irl5wj83NiC12U=
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
sigs.k8s.io/kind v0.24.0 h1:g4y4eu0qa+SCeKESLpESgMmVFBebL0BDa6f777OIWrg=
Expand Down
18 changes: 9 additions & 9 deletions test/e2e/data/e2e_conf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ images:
loadBehavior: tryLoad
- name: quay.io/jetstack/cert-manager-controller:v1.15.1
loadBehavior: tryLoad
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.8.4
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.8.6
loadBehavior: tryLoad
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.8.4
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.8.6
loadBehavior: tryLoad
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.8.4
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.8.6
loadBehavior: tryLoad

providers:
Expand All @@ -48,8 +48,8 @@ providers:
new: "imagePullPolicy: IfNotPresent"
- old: --metrics-bind-addr=127.0.0.1:8080
new: --metrics-bind-addr=:8080
- name: v1.8.4 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.4/core-components.yaml"
- name: v1.8.6 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.6/core-components.yaml"
type: "url"
contract: v1beta1
files:
Expand All @@ -75,8 +75,8 @@ providers:
new: "imagePullPolicy: IfNotPresent"
- old: --metrics-bind-addr=127.0.0.1:8080
new: --metrics-bind-addr=:8080
- name: v1.8.4 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.4/bootstrap-components.yaml"
- name: v1.8.6 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.6/bootstrap-components.yaml"
type: "url"
contract: v1beta1
files:
Expand All @@ -102,8 +102,8 @@ providers:
new: "imagePullPolicy: IfNotPresent"
- old: --metrics-bind-addr=127.0.0.1:8080
new: --metrics-bind-addr=:8080
- name: v1.8.4 # latest published release in the v1beta1 series; this is used for v1beta1 --> v1beta1 latest clusterctl upgrades test only.
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.4/control-plane-components.yaml"
- name: v1.8.6 # latest published release in the v1beta1 series; this is used for v1beta1 --> v1beta1 latest clusterctl upgrades test only.
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.6/control-plane-components.yaml"
type: "url"
contract: v1beta1
files:
Expand Down
18 changes: 9 additions & 9 deletions test/e2e/data/e2e_eks_conf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,19 @@ images:
loadBehavior: tryLoad
- name: quay.io/jetstack/cert-manager-controller:v1.15.1
loadBehavior: tryLoad
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.8.4
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.8.6
loadBehavior: tryLoad
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.8.4
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.8.6
loadBehavior: tryLoad
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.8.4
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.8.6
loadBehavior: tryLoad

providers:
- name: cluster-api
type: CoreProvider
versions:
- name: v1.8.4
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.4/core-components.yaml"
- name: v1.8.6
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.6/core-components.yaml"
type: "url"
contract: v1beta1
files:
Expand All @@ -50,8 +50,8 @@ providers:
files:
- sourcePath: "./shared/v1beta1/metadata.yaml"
versions:
- name: v1.8.4
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.4/bootstrap-components.yaml"
- name: v1.8.6
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.6/bootstrap-components.yaml"
type: "url"
contract: v1beta1
files:
Expand All @@ -66,8 +66,8 @@ providers:
files:
- sourcePath: "./shared/v1beta1/metadata.yaml"
versions:
- name: v1.8.4
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.4/control-plane-components.yaml"
- name: v1.8.6
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.6/control-plane-components.yaml"
type: "url"
contract: v1beta1
files:
Expand Down
2 changes: 1 addition & 1 deletion versions.mk
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
MDBOOK_VERSION := v0.4.5
PLANTUML_VERSION := 1.2020.16
CERT_MANAGER_VERSION := v1.15.1
CAPI_VERSION := v1.8.4
CAPI_VERSION := v1.8.6
KPROMO_VERSION := v4.0.4
YQ_VERSION := v4.25.2
GOLANGCI_LINT_VERSION := v1.53.3
Expand Down
Loading