Skip to content

Commit 4d1d294

Browse files
JGAntunesJGAntunes
authored
feat: release k0s 1.31 (#2148)
* feat: release k0s 1.31 * chore: revert files commited by mistake * fix: set the kube router config to nil when provider is calico * chore: no need for specific pause image logic anymore * fix: skip pushgateway image in image override * fix: pointers to bools * fix: moar unit tests * chore: update operator resources * chore: make linter happy * fix: k0s version mismatch * chore: make linter happy and the code backwards compatible * chore: comments * fix: we can't change the pause image logic just yet * fix: changes that won't work in 1.29
1 parent abd6c9f commit 4d1d294

File tree

14 files changed

+94
-34
lines changed

14 files changed

+94
-34
lines changed

‎Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ ADMIN_CONSOLE_CHART_REPO_OVERRIDE =
1010
ADMIN_CONSOLE_IMAGE_OVERRIDE =
1111
ADMIN_CONSOLE_MIGRATIONS_IMAGE_OVERRIDE =
1212
ADMIN_CONSOLE_KURL_PROXY_IMAGE_OVERRIDE =
13-
K0S_VERSION = v1.30.9+k0s.0
14-
K0S_GO_VERSION = v1.30.9+k0s.0
15-
PREVIOUS_K0S_VERSION ?= v1.29.9+k0s.0-ec.0
16-
PREVIOUS_K0S_GO_VERSION ?= v1.29.9+k0s.0
13+
K0S_VERSION = v1.31.8+k0s.0
14+
K0S_GO_VERSION = v1.31.8+k0s.0
15+
PREVIOUS_K0S_VERSION ?= v1.30.9+k0s.0
16+
PREVIOUS_K0S_GO_VERSION ?= v1.30.9+k0s.0
1717
K0S_BINARY_SOURCE_OVERRIDE =
1818
TROUBLESHOOT_VERSION = v0.119.0
1919

‎go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ require (
2424
github.com/google/uuid v1.6.0
2525
github.com/gosimple/slug v1.15.0
2626
github.com/jedib0t/go-pretty/v6 v6.6.7
27-
github.com/k0sproject/k0s v1.30.10-0.20250117153350-dcf3c22bb568
27+
github.com/k0sproject/k0s v1.31.9-0.20250428141639-26a9908cf691
2828
github.com/ohler55/ojg v1.26.3
2929
github.com/onsi/ginkgo/v2 v2.23.4
3030
github.com/onsi/gomega v1.37.0
@@ -40,6 +40,7 @@ require (
4040
github.com/vmware-tanzu/velero v1.16.0
4141
go.uber.org/multierr v1.11.0
4242
golang.org/x/crypto v0.37.0
43+
golang.org/x/sync v0.13.0
4344
golang.org/x/term v0.31.0
4445
gopkg.in/yaml.v2 v2.4.0
4546
gopkg.in/yaml.v3 v3.0.1
@@ -277,9 +278,9 @@ require (
277278
github.com/zitadel/logging v0.6.1 // indirect
278279
github.com/zitadel/oidc/v3 v3.31.0 // indirect
279280
github.com/zitadel/schema v1.3.0 // indirect
280-
go.etcd.io/etcd/api/v3 v3.5.17 // indirect
281-
go.etcd.io/etcd/client/pkg/v3 v3.5.17 // indirect
282-
go.etcd.io/etcd/client/v3 v3.5.17 // indirect
281+
go.etcd.io/etcd/api/v3 v3.5.18 // indirect
282+
go.etcd.io/etcd/client/pkg/v3 v3.5.18 // indirect
283+
go.etcd.io/etcd/client/v3 v3.5.18 // indirect
283284
go.mongodb.org/mongo-driver v1.14.0 // indirect
284285
go.opencensus.io v0.24.0 // indirect
285286
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
@@ -294,7 +295,6 @@ require (
294295
go.uber.org/automaxprocs v1.6.0 // indirect
295296
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect
296297
golang.org/x/mod v0.24.0 // indirect
297-
golang.org/x/sync v0.13.0 // indirect
298298
golang.org/x/tools v0.31.0 // indirect
299299
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
300300
google.golang.org/api v0.218.0 // indirect

‎go.sum‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1234,8 +1234,8 @@ github.com/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+
12341234
github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
12351235
github.com/k0sproject/dig v0.4.0 h1:yBxFUUxNXAMGBg6b7c6ypxdx/o3RmhoI5v5ABOw5tn0=
12361236
github.com/k0sproject/dig v0.4.0/go.mod h1:rlZ7N7ZEcB4Fi96TPXkZ4dqyAiDWOGLapyL9YpZ7Qz4=
1237-
github.com/k0sproject/k0s v1.30.10-0.20250117153350-dcf3c22bb568 h1:JSfvTBrsNMWDISDUMVRZV6hP5eRusBS6d0Gv2lA4lSA=
1238-
github.com/k0sproject/k0s v1.30.10-0.20250117153350-dcf3c22bb568/go.mod h1:Nmj+slwFht6ile7OHHGiSrcRRGmrA9U9PzjnG9/6gc0=
1237+
github.com/k0sproject/k0s v1.31.9-0.20250428141639-26a9908cf691 h1:/w7R/XMauHygKj7I2Y1dLkPbmXTsxO1mCQxqomDIoMk=
1238+
github.com/k0sproject/k0s v1.31.9-0.20250428141639-26a9908cf691/go.mod h1:1aXYSUq/BOQvhIhjeQX9AQs2Yk/kthQh/E1r2rtMcCs=
12391239
github.com/k0sproject/version v0.6.0 h1:Wi8wu9j+H36+okIQA47o/YHbzNpKeIYj8IjGdJOdqsI=
12401240
github.com/k0sproject/version v0.6.0/go.mod h1:5/7Js62gDCLBP6mEs0mUcYEEkYneM5qXDKN/hyFlQTM=
12411241
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
@@ -1621,12 +1621,12 @@ github.com/zitadel/oidc/v3 v3.31.0 h1:XQcTVHTYpSkNxjGccEb6pRfrGJdUhkTgXOIzSqRXdo
16211621
github.com/zitadel/oidc/v3 v3.31.0/go.mod h1:DyE/XClysRK/ozFaZSqlYamKVnTh4l6Ln25ihSNI03w=
16221622
github.com/zitadel/schema v1.3.0 h1:kQ9W9tvIwZICCKWcMvCEweXET1OcOyGEuFbHs4o5kg0=
16231623
github.com/zitadel/schema v1.3.0/go.mod h1:NptN6mkBDFvERUCvZHlvWmmME+gmZ44xzwRXwhzsbtc=
1624-
go.etcd.io/etcd/api/v3 v3.5.17 h1:cQB8eb8bxwuxOilBpMJAEo8fAONyrdXTHUNcMd8yT1w=
1625-
go.etcd.io/etcd/api/v3 v3.5.17/go.mod h1:d1hvkRuXkts6PmaYk2Vrgqbv7H4ADfAKhyJqHNLJCB4=
1626-
go.etcd.io/etcd/client/pkg/v3 v3.5.17 h1:XxnDXAWq2pnxqx76ljWwiQ9jylbpC4rvkAeRVOUKKVw=
1627-
go.etcd.io/etcd/client/pkg/v3 v3.5.17/go.mod h1:4DqK1TKacp/86nJk4FLQqo6Mn2vvQFBmruW3pP14H/w=
1628-
go.etcd.io/etcd/client/v3 v3.5.17 h1:o48sINNeWz5+pjy/Z0+HKpj/xSnBkuVhVvXkjEXbqZY=
1629-
go.etcd.io/etcd/client/v3 v3.5.17/go.mod h1:j2d4eXTHWkT2ClBgnnEPm/Wuu7jsqku41v9DZ3OtjQo=
1624+
go.etcd.io/etcd/api/v3 v3.5.18 h1:Q4oDAKnmwqTo5lafvB+afbgCDF7E35E4EYV2g+FNGhs=
1625+
go.etcd.io/etcd/api/v3 v3.5.18/go.mod h1:uY03Ob2H50077J7Qq0DeehjM/A9S8PhVfbQ1mSaMopU=
1626+
go.etcd.io/etcd/client/pkg/v3 v3.5.18 h1:mZPOYw4h8rTk7TeJ5+3udUkfVGBqc+GCjOJYd68QgNM=
1627+
go.etcd.io/etcd/client/pkg/v3 v3.5.18/go.mod h1:BxVf2o5wXG9ZJV+/Cu7QNUiJYk4A29sAhoI5tIRsCu4=
1628+
go.etcd.io/etcd/client/v3 v3.5.18 h1:nvvYmNHGumkDjZhTHgVU36A9pykGa2K4lAJ0yY7hcXA=
1629+
go.etcd.io/etcd/client/v3 v3.5.18/go.mod h1:kmemwOsPU9broExyhYsBxX4spCTDX3yLgPMWtpBXG6E=
16301630
go.mongodb.org/mongo-driver v1.14.0 h1:P98w8egYRjYe3XDjxhYJagTokP/H6HzlsnojRgZRd80=
16311631
go.mongodb.org/mongo-driver v1.14.0/go.mod h1:Vzb0Mk/pa7e6cWw85R4F/endUC3u0U9jGcNU603k65c=
16321632
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=

‎operator/charts/embedded-cluster-operator/charts/crds/templates/resources.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,16 +104,21 @@ spec:
104104
type: string
105105
name:
106106
description: The repository name.
107+
minLength: 1
107108
type: string
108109
password:
109110
description: Password for Basic HTTP authentication.
110111
type: string
111112
url:
112113
description: The repository URL.
114+
minLength: 1
113115
type: string
114116
username:
115117
description: Username for Basic HTTP authentication.
116118
type: string
119+
required:
120+
- name
121+
- url
117122
type: object
118123
type: array
119124
type: object
@@ -403,16 +408,21 @@ spec:
403408
type: string
404409
name:
405410
description: The repository name.
411+
minLength: 1
406412
type: string
407413
password:
408414
description: Password for Basic HTTP authentication.
409415
type: string
410416
url:
411417
description: The repository URL.
418+
minLength: 1
412419
type: string
413420
username:
414421
description: Username for Basic HTTP authentication.
415422
type: string
423+
required:
424+
- name
425+
- url
416426
type: object
417427
type: array
418428
type: object

‎operator/config/crd/bases/embeddedcluster.replicated.com_configs.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,16 +109,21 @@ spec:
109109
type: string
110110
name:
111111
description: The repository name.
112+
minLength: 1
112113
type: string
113114
password:
114115
description: Password for Basic HTTP authentication.
115116
type: string
116117
url:
117118
description: The repository URL.
119+
minLength: 1
118120
type: string
119121
username:
120122
description: Username for Basic HTTP authentication.
121123
type: string
124+
required:
125+
- name
126+
- url
122127
type: object
123128
type: array
124129
type: object

‎operator/config/crd/bases/embeddedcluster.replicated.com_installations.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,16 +170,21 @@ spec:
170170
type: string
171171
name:
172172
description: The repository name.
173+
minLength: 1
173174
type: string
174175
password:
175176
description: Password for Basic HTTP authentication.
176177
type: string
177178
url:
178179
description: The repository URL.
180+
minLength: 1
179181
type: string
180182
username:
181183
description: Username for Basic HTTP authentication.
182184
type: string
185+
required:
186+
- name
187+
- url
183188
type: object
184189
type: array
185190
type: object

‎operator/pkg/cli/migratev2/k0s_test.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,10 @@ func TestNeedsK0sChartCleanup(t *testing.T) {
8888
for _, tt := range tests {
8989
t.Run(tt.name, func(t *testing.T) {
9090
scheme := runtime.NewScheme()
91+
//nolint:staticcheck // SA1019 we are using the deprecated scheme for backwards compatibility, we can remove this once we stop supporting k0s v1.30
9192
err := k0sv1beta1.AddToScheme(scheme)
9293
require.NoError(t, err)
94+
//nolint:staticcheck // SA1019 we are using the deprecated scheme for backwards compatibility, we can remove this once we stop supporting k0s v1.30
9395
err = k0shelmv1beta1.AddToScheme(scheme)
9496
require.NoError(t, err)
9597

‎operator/pkg/upgrade/upgrade_test.go‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package upgrade
22

33
import (
44
"context"
5+
"encoding/json"
56
"testing"
67

78
k0sv1beta1 "github.com/k0sproject/k0s/pkg/apis/k0s/v1beta1"
@@ -16,8 +17,15 @@ import (
1617

1718
func TestUpdateClusterConfig(t *testing.T) {
1819
scheme := runtime.NewScheme()
20+
//nolint:staticcheck // SA1019 we are using the deprecated scheme for backwards compatibility, we can remove this once we stop supporting k0s v1.30
1921
require.NoError(t, k0sv1beta1.AddToScheme(scheme))
2022

23+
// We need to disable telemetry in a backwards compatible way with k0s v1.30 and v1.29
24+
// See - https://github.com/k0sproject/k0s/pull/4674/files#diff-eea4a0c68e41d694c3fd23b4865a7b28bcbba61dc9c642e33c2e2f5f7f9ee05d
25+
// We can drop the json.Unmarshal once we drop support for 1.30
26+
telemetryConfigEnabled := k0sv1beta1.ClusterTelemetry{}
27+
json.Unmarshal([]byte(`true`), &telemetryConfigEnabled.Enabled)
28+
2129
tests := []struct {
2230
name string
2331
currentConfig *k0sv1beta1.ClusterConfig
@@ -128,9 +136,7 @@ func TestUpdateClusterConfig(t *testing.T) {
128136
Network: &k0sv1beta1.Network{
129137
ServiceCIDR: "10.96.0.0/12",
130138
},
131-
Telemetry: &k0sv1beta1.ClusterTelemetry{
132-
Enabled: true,
133-
},
139+
Telemetry: &telemetryConfigEnabled,
134140
},
135141
},
136142
installation: &ecv1beta1.Installation{
@@ -157,7 +163,9 @@ config:
157163
},
158164
validate: func(t *testing.T, updatedConfig *k0sv1beta1.ClusterConfig) {
159165
// Verify that the unsupported override was applied to the telemetry config
160-
assert.Equal(t, false, updatedConfig.Spec.Telemetry.Enabled)
166+
val, err := json.Marshal(updatedConfig.Spec.Telemetry.Enabled)
167+
require.NoError(t, err)
168+
assert.Equal(t, "false", string(val))
161169

162170
// Verify that the unsupported override was applied to the worker profiles
163171
require.Len(t, updatedConfig.Spec.WorkerProfiles, 1)
@@ -225,7 +233,7 @@ config:
225233
ServiceCIDR: "10.96.0.0/12",
226234
},
227235
Storage: &k0sv1beta1.StorageSpec{
228-
Type: "abc",
236+
Type: "etcd",
229237
},
230238
API: &k0sv1beta1.APISpec{
231239
Address: "192.168.1.1",
@@ -265,7 +273,7 @@ config:
265273
// Verify that the immutable fields are not changed
266274
assert.Equal(t, "k0s", updatedConfig.Name)
267275
assert.Equal(t, "192.168.1.1", updatedConfig.Spec.API.Address)
268-
assert.Equal(t, "abc", updatedConfig.Spec.Storage.Type)
276+
assert.Equal(t, k0sv1beta1.EtcdStorageType, updatedConfig.Spec.Storage.Type)
269277

270278
// Verify that other changes were not made
271279
assert.Equal(t, "10.96.0.0/12", updatedConfig.Spec.Network.ServiceCIDR)

‎operator/schemas/config-embeddedcluster-v1beta1.json‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,10 @@
8585
"items": {
8686
"description": "Repository describes single repository entry. Fields map to the CLI flags for the \"helm add\" command",
8787
"type": "object",
88+
"required": [
89+
"name",
90+
"url"
91+
],
8892
"properties": {
8993
"caFile": {
9094
"description": "CA bundle file to use when verifying HTTPS-enabled servers.",
@@ -104,15 +108,17 @@
104108
},
105109
"name": {
106110
"description": "The repository name.",
107-
"type": "string"
111+
"type": "string",
112+
"minLength": 1
108113
},
109114
"password": {
110115
"description": "Password for Basic HTTP authentication.",
111116
"type": "string"
112117
},
113118
"url": {
114119
"description": "The repository URL.",
115-
"type": "string"
120+
"type": "string",
121+
"minLength": 1
116122
},
117123
"username": {
118124
"description": "Username for Basic HTTP authentication.",

‎pkg/config/config.go‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
package config
33

44
import (
5+
"encoding/json"
56
"fmt"
67
"os"
78
"sort"
@@ -33,7 +34,13 @@ func RenderK0sConfig(proxyRegistryDomain string) *k0sconfig.ClusterConfig {
3334
cfg.Spec.Konnectivity = nil
3435
cfg.Spec.Network.KubeRouter = nil
3536
cfg.Spec.Network.Provider = "calico"
36-
cfg.Spec.Telemetry.Enabled = false
37+
// We need to disable telemetry in a backwards compatible way with k0s v1.30 and v1.29
38+
// See - https://github.com/k0sproject/k0s/pull/4674/files#diff-eea4a0c68e41d694c3fd23b4865a7b28bcbba61dc9c642e33c2e2f5f7f9ee05d
39+
// We can drop the json.Unmarshal once we drop support for 1.30
40+
err := json.Unmarshal([]byte("false"), &cfg.Spec.Telemetry.Enabled)
41+
if err != nil {
42+
panic(fmt.Sprintf("unable to unmarshal telemetry enabled: %v", err))
43+
}
3744
if cfg.Spec.API.ExtraArgs == nil {
3845
cfg.Spec.API.ExtraArgs = map[string]string{}
3946
}
@@ -101,6 +108,11 @@ func PatchK0sConfig(config *k0sconfig.ClusterConfig, patch string, respectImmuta
101108
if err := k8syaml.Unmarshal(resultYAML, &patched); err != nil {
102109
return nil, fmt.Errorf("unable to unmarshal patched config: %w", err)
103110
}
111+
// Fix for - https://github.com/k0sproject/k0s/pull/5834 - currently the process of unmarshaling a config with a
112+
// calico config will also set a default kube-router config. We remove it here.
113+
if patched.Spec.Network.Provider == "calico" {
114+
patched.Spec.Network.KubeRouter = nil
115+
}
104116
return &patched, nil
105117
}
106118

0 commit comments

Comments
 (0)