Skip to content
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
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ include $(REPO_ROOT)/common.mk
#
# Go.
#
GO_VERSION ?= 1.26.7
GO_VERSION ?= 1.26.8

# Ensure correct toolchain is used
GOTOOLCHAIN = go$(GO_VERSION)
Expand Down Expand Up @@ -317,7 +317,7 @@ delete-kind-cluster:
kind delete cluster --name $(KIND_CLUSTER_NAME)

cluster-api: ## Clone cluster-api repository for tilt use.
git clone --branch v1.14.2 --depth 1 https://github.com/kubernetes-sigs/cluster-api.git
git clone --branch v1.14.3 --depth 1 https://github.com/kubernetes-sigs/cluster-api.git

cluster-api/tilt-settings.json: hack/tilt-settings.json cluster-api
cp ./hack/tilt-settings.json cluster-api
Expand Down
4 changes: 2 additions & 2 deletions hack/tools/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ require (
)

replace (
sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.14.2
sigs.k8s.io/cluster-api/test => sigs.k8s.io/cluster-api/test v1.14.2
sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.14.3
sigs.k8s.io/cluster-api/test => sigs.k8s.io/cluster-api/test v1.14.3
)
8 changes: 4 additions & 4 deletions hack/tools/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
golang.org/x/net v0.57.0 h1:K5+3DljvIuDG9/Jv9rvyMywYNFCQ9RSUY6OOTTkT+tE=
golang.org/x/net v0.57.0/go.mod h1:KpXc8iv+r3XplLAG/f7Jsf9RPszJzdR0f58q9vGOuEU=
golang.org/x/net v0.58.0 h1:ynWG7rqYi4ccpTEuPZ2QGWHktVEM9DMCj9yzDE0Q7To=
golang.org/x/net v0.58.0/go.mod h1:YwCddHnFlT7eLQqVprV19OnhLGtc5xOKgE0RyqgfWAU=
golang.org/x/text v0.41.0 h1:vz/seA0lnX87Othu2f/0L24RcgrXD9/YFTSuGjj3rH8=
golang.org/x/text v0.41.0/go.mod h1:jvf1O8ajNzZqhSrQBPbutR/EB83Cc0CFrezNQIwbb5M=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
Expand All @@ -28,8 +28,8 @@ k8s.io/klog/v2 v2.140.0 h1:Tf+J3AH7xnUzZyVVXhTgGhEKnFqye14aadWv7bzXdzc=
k8s.io/klog/v2 v2.140.0/go.mod h1:o+/RWfJ6PwpnFn7OyAG3QnO47BFsymfEfrz6XyYSSp0=
k8s.io/utils v0.0.0-20260319190234-28399d86e0b5 h1:kBawHLSnx/mYHmRnNUf9d4CpjREbeZuxoSGOX/J+aYM=
k8s.io/utils v0.0.0-20260319190234-28399d86e0b5/go.mod h1:xDxuJ0whA3d0I4mf/C4ppKHxXynQ+fxnkmQH0vTHnuk=
sigs.k8s.io/cluster-api v1.14.2 h1:o3GFNaeNFAOEEMpDPfhCK+2CjmV6gtQ8yLEcUwCg7bA=
sigs.k8s.io/cluster-api v1.14.2/go.mod h1:QGMq7dEyUsceFGBLIrnPDVmX2J316yfY20Woq1S9GuU=
sigs.k8s.io/cluster-api v1.14.3 h1:xc2krMm7SfUV7/sVo3XcHwNz33fkYupy+iSD/W/TA/Q=
sigs.k8s.io/cluster-api v1.14.3/go.mod h1:NB3GmqTA/hlMaGDv01gt36/5k0DJ+ixGTJFHUe5Ib3Q=
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20260912202113-4e137920d8cf h1:RB87eIvIPOtaJhM295Az2uQRGNIJ9URZ7yY5k0juc+o=
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20260912202113-4e137920d8cf/go.mod h1:CS0z6ga2QfxqqJSVonKqczQkVwm4r1X8sHxiTcAdV4Q=
sigs.k8s.io/kubebuilder/docs/book/utils v0.0.0-20260611053758-c72b289c1ec8 h1:WQFJf05iNLy4/Gp2is7sW4C70lmh+fNSEspeNaeNP4E=
Expand Down
26 changes: 13 additions & 13 deletions test/e2e/config/cloudstack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,27 +15,27 @@ images:
## PLEASE KEEP THESE UP TO DATE WITH THE COMPONENTS

# Cluster API v1beta1 Preloads
- name: gcr.io/k8s-staging-cluster-api/cluster-api-controller:v1.14.2
- name: gcr.io/k8s-staging-cluster-api/cluster-api-controller:v1.14.3
loadBehavior: tryLoad
- name: gcr.io/k8s-staging-cluster-api/kubeadm-bootstrap-controller:v1.14.2
- name: gcr.io/k8s-staging-cluster-api/kubeadm-bootstrap-controller:v1.14.3
loadBehavior: tryLoad
- name: gcr.io/k8s-staging-cluster-api/kubeadm-control-plane-controller:v1.14.2
- name: gcr.io/k8s-staging-cluster-api/kubeadm-control-plane-controller:v1.14.3
loadBehavior: tryLoad
- name: gcr.io/k8s-staging-cluster-api/capd-manager-amd64:v1.14.2
- name: gcr.io/k8s-staging-cluster-api/capd-manager-amd64:v1.14.3
loadBehavior: tryLoad
- name: quay.io/jetstack/cert-manager-cainjector:v1.21.1
- name: quay.io/jetstack/cert-manager-cainjector:v1.21.2
loadBehavior: tryLoad
- name: quay.io/jetstack/cert-manager-webhook:v1.21.1
- name: quay.io/jetstack/cert-manager-webhook:v1.21.2
loadBehavior: tryLoad
- name: quay.io/jetstack/cert-manager-controller:v1.21.1
- name: quay.io/jetstack/cert-manager-controller:v1.21.2
loadBehavior: tryLoad

providers:
- name: cluster-api
type: CoreProvider
versions:
- name: v1.14.2
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.14.2/core-components.yaml"
- name: v1.14.3
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.14.3/core-components.yaml"
type: "url"
contract: v1beta2
replacements:
Expand All @@ -47,8 +47,8 @@ providers:
- name: kubeadm
type: BootstrapProvider
versions:
- name: v1.14.2
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.14.2/bootstrap-components.yaml"
- name: v1.14.3
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.14.3/bootstrap-components.yaml"
type: "url"
contract: v1beta2
replacements:
Expand All @@ -60,8 +60,8 @@ providers:
- name: kubeadm
type: ControlPlaneProvider
versions:
- name: v1.14.2
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.14.2/control-plane-components.yaml"
- name: v1.14.3
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.14.3/control-plane-components.yaml"
type: "url"
contract: v1beta2
replacements:
Expand Down
5 changes: 4 additions & 1 deletion test/e2e/data/shared/v1beta1/metadata.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
apiVersion: clusterctl.cluster.x-k8s.io/v1alpha3
kind: Metadata
releaseSeries:
- major: 1
minor: 15
contract: v1beta2
- major: 1
minor: 14
contract: v1beta2
Expand Down Expand Up @@ -54,4 +57,4 @@ releaseSeries:
contract: v1alpha3
- major: 0
minor: 2
contract: v1alpha2
contract: v1alpha2