Skip to content

Update Makefile versions #3310

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.

Sign up for GitHub

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

Open
replicated-ci-ec wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update Makefile versions #3310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 operator/charts/embedded-cluster-operator/charts/crds/templates/resources.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.19.0
controller-gen.kubebuilder.io/version: v0.20.0
labels:
replicated.com/disaster-recovery: infra
replicated.com/disaster-recovery-chart: embedded-cluster-operator
Expand Down Expand Up @@ -297,7 +297,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.19.0
controller-gen.kubebuilder.io/version: v0.20.0
labels:
replicated.com/disaster-recovery: ec-install
name: installations.embeddedcluster.replicated.com
Expand Down
2 changes: 1 addition & 1 deletion operator/config/crd/bases/embeddedcluster.replicated.com_configs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.19.0
controller-gen.kubebuilder.io/version: v0.20.0
name: configs.embeddedcluster.replicated.com
spec:
group: embeddedcluster.replicated.com
Expand Down
2 changes: 1 addition & 1 deletion operator/config/crd/bases/embeddedcluster.replicated.com_installations.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.19.0
controller-gen.kubebuilder.io/version: v0.20.0
name: installations.embeddedcluster.replicated.com
spec:
group: embeddedcluster.replicated.com
Expand Down
2 changes: 1 addition & 1 deletion operator/config/crd/bases/embeddedcluster.replicated.com_kubernetesinstallations.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.19.0
controller-gen.kubebuilder.io/version: v0.20.0
name: kubernetesinstallations.embeddedcluster.replicated.com
spec:
group: embeddedcluster.replicated.com
Expand Down
4 changes: 2 additions & 2 deletions pkg/crds/resources.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.19.0
controller-gen.kubebuilder.io/version: v0.20.0
labels:
replicated.com/disaster-recovery: infra
replicated.com/disaster-recovery-chart: embedded-cluster-operator
Expand Down Expand Up @@ -297,7 +297,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.19.0
controller-gen.kubebuilder.io/version: v0.20.0
labels:
replicated.com/disaster-recovery: ec-install
name: installations.embeddedcluster.replicated.com
Expand Down
6 changes: 3 additions & 3 deletions versions.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ K0S_MINOR_VERSION ?= 33
# K0S Versions
K0S_VERSION_1_33 = v1.33.6+k0s.0
K0S_VERSION_1_32 = v1.32.10+k0s.0
K0S_VERSION_1_31 = v1.31.12+k0s.0
K0S_VERSION_1_31 = v1.31.14+k0s.0
Copy link

@cursor cursor bot Dec 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bug: K0s version override and check incompatible with update

The K0S_VERSION_1_31 was updated from v1.31.12+k0s.0 to v1.31.14+k0s.0, but the override logic and validation checks at the bottom of versions.mk still reference the old version. The check-k0s-version target will fail because it expects any v1.31 version to be exactly v1.31.12+k0s.0-ec.0. The ifeq conditions on lines 43 and 51 that trigger the EC override and binary source will also no longer match, making builds with K0S_MINOR_VERSION=31 fail.

Additional Locations (2)

Fix in Cursor Fix in Web

K0S_VERSION_1_30 = v1.30.14+k0s.0
K0S_VERSION_1_29 = v1.29.15+k0s.0

Expand All @@ -20,13 +20,13 @@ K0S_GO_VERSION = $(K0S_VERSION_1_$(K0S_MINOR_VERSION))
TROUBLESHOOT_VERSION = v0.123.16

# Helm Version
HELM_VERSION = v3.19.2
HELM_VERSION = v3.19.4

# FIO Version (for performance testing)
FIO_VERSION = 3.41

# Kubernetes Development Tool Versions
CONTROLLER_TOOLS_VERSION = v0.19.0
CONTROLLER_TOOLS_VERSION = v0.20.0
KUSTOMIZE_VERSION = v5.8.0

### Overrides ###
Expand Down
Loading