Skip to content

Commit ea8bd89

Browse files
authored
fix breaking changes and update kkp dependencies (#7692)
Signed-off-by: Adonis Murati <[email protected]>
1 parent 270b0e9 commit ea8bd89

File tree

13 files changed

+240
-132
lines changed

13 files changed

+240
-132
lines changed

modules/api/cmd/kubermatic-api/swagger.json

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32763,7 +32763,7 @@
3276332763
"title": "EnvVar represents an environment variable present in a Container.",
3276432764
"properties": {
3276532765
"name": {
32766-
"description": "Name of the environment variable. Must be a C_IDENTIFIER.",
32766+
"description": "Name of the environment variable.\nMay consist of any printable ASCII characters except '='.",
3276732767
"type": "string",
3276832768
"x-go-name": "Name"
3276932769
},
@@ -32788,6 +32788,9 @@
3278832788
"fieldRef": {
3278932789
"$ref": "#/definitions/ObjectFieldSelector"
3279032790
},
32791+
"fileKeyRef": {
32792+
"$ref": "#/definitions/FileKeySelector"
32793+
},
3279132794
"resourceFieldRef": {
3279232795
"$ref": "#/definitions/ResourceFieldSelector"
3279332796
},
@@ -33527,6 +33530,34 @@
3352733530
"title": "FieldValueErrorReason is a machine-readable value providing more detail about why a field failed the validation.",
3352833531
"x-go-package": "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
3352933532
},
33533+
"FileKeySelector": {
33534+
"description": "+structType=atomic",
33535+
"type": "object",
33536+
"title": "FileKeySelector selects a key of the env file.",
33537+
"properties": {
33538+
"key": {
33539+
"description": "The key within the env file. An invalid key will prevent the pod from starting.\nThe keys defined within a source may consist of any printable ASCII characters except '='.\nDuring Alpha stage of the EnvFiles feature gate, the key size is limited to 128 characters.\n+required",
33540+
"type": "string",
33541+
"x-go-name": "Key"
33542+
},
33543+
"optional": {
33544+
"description": "Specify whether the file or its key must be defined. If the file or key\ndoes not exist, then the env var is not published.\nIf optional is set to true and the specified key does not exist,\nthe environment variable will not be set in the Pod's containers.\n\nIf optional is set to false and the specified key does not exist,\nan error will be returned during Pod creation.\n+optional\n+default=false",
33545+
"type": "boolean",
33546+
"x-go-name": "Optional"
33547+
},
33548+
"path": {
33549+
"description": "The path within the volume from which to select the file.\nMust be relative and may not contain the '..' path or start with '..'.\n+required",
33550+
"type": "string",
33551+
"x-go-name": "Path"
33552+
},
33553+
"volumeName": {
33554+
"description": "The name of the volume mount containing the env file.\n+required",
33555+
"type": "string",
33556+
"x-go-name": "VolumeName"
33557+
}
33558+
},
33559+
"x-go-package": "k8s.io/api/core/v1"
33560+
},
3353033561
"FlatcarSpec": {
3353133562
"description": "FlatcarSpec contains Flatcar Linux specific settings",
3353233563
"type": "object",
@@ -40100,7 +40131,7 @@
4010040131
"title": "ResourceRequirements describes the compute resource requirements.",
4010140132
"properties": {
4010240133
"claims": {
40103-
"description": "Claims lists the names of resources, defined in spec.resourceClaims,\nthat are used by this container.\n\nThis is an alpha field and requires enabling the\nDynamicResourceAllocation feature gate.\n\nThis field is immutable. It can only be set for containers.\n\n+listType=map\n+listMapKey=name\n+featureGate=DynamicResourceAllocation\n+optional",
40134+
"description": "Claims lists the names of resources, defined in spec.resourceClaims,\nthat are used by this container.\n\nThis field depends on the\nDynamicResourceAllocation feature gate.\n\nThis field is immutable. It can only be set for containers.\n\n+listType=map\n+listMapKey=name\n+featureGate=DynamicResourceAllocation\n+optional",
4010440135
"type": "array",
4010540136
"items": {
4010640137
"$ref": "#/definitions/ResourceClaim"

modules/api/go.mod

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ require (
6161
github.com/pkg/errors v0.9.1
6262
github.com/prometheus/client_golang v1.22.0
6363
github.com/spf13/cobra v1.9.1
64-
github.com/spf13/pflag v1.0.6
64+
github.com/spf13/pflag v1.0.7
6565
github.com/stretchr/testify v1.10.0
6666
github.com/vmware-tanzu/velero v1.16.0
6767
github.com/vmware/go-vcloud-director/v2 v2.26.1
@@ -72,25 +72,25 @@ require (
7272
google.golang.org/api v0.232.0
7373
gopkg.in/yaml.v3 v3.0.1
7474
k8c.io/kubeone v1.10.0
75-
k8c.io/kubermatic/sdk/v2 v2.29.0-rc.1.0.20251023140643-ae9026233002
76-
k8c.io/kubermatic/v2 v2.29.0-rc.1.0.20251023140643-ae9026233002
77-
k8c.io/machine-controller/sdk v1.63.1
78-
k8c.io/operating-system-manager v1.7.6
75+
k8c.io/kubermatic/sdk/v2 v2.29.1-0.20251103163113-d5f3441faa6f
76+
k8c.io/kubermatic/v2 v2.29.1-0.20251103163113-d5f3441faa6f
77+
k8c.io/machine-controller/sdk v1.64.0
78+
k8c.io/operating-system-manager v1.8.0
7979
k8c.io/reconciler v0.5.0
80-
k8s.io/api v0.33.4
81-
k8s.io/apiextensions-apiserver v0.33.4
82-
k8s.io/apimachinery v0.33.4
83-
k8s.io/apiserver v0.33.4
80+
k8s.io/api v0.34.0
81+
k8s.io/apiextensions-apiserver v0.34.0
82+
k8s.io/apimachinery v0.34.0
83+
k8s.io/apiserver v0.34.0
8484
k8s.io/client-go v12.0.0+incompatible
85-
k8s.io/code-generator v0.33.4
85+
k8s.io/code-generator v0.34.0
8686
k8s.io/klog/v2 v2.130.1
87-
k8s.io/kubectl v0.33.4
88-
k8s.io/metrics v0.33.4
87+
k8s.io/kubectl v0.34.0
88+
k8s.io/metrics v0.34.0
8989
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d
9090
kubevirt.io/api v1.4.0
9191
kubevirt.io/containerized-data-importer-api v1.62.0
92-
sigs.k8s.io/controller-runtime v0.21.0
93-
sigs.k8s.io/controller-tools v0.18.0
92+
sigs.k8s.io/controller-runtime v0.22.0
93+
sigs.k8s.io/controller-tools v0.19.0
9494
sigs.k8s.io/yaml v1.6.0
9595
)
9696

@@ -100,9 +100,9 @@ replace github.com/ajeddeloh/go-json => github.com/coreos/go-json v0.0.0-2022081
100100
// Pin prism-go-client to v0.4.0 as we have no way to test v0.5.1; we don't have a working environment for Nutanix.
101101
replace github.com/nutanix-cloud-native/prism-go-client => github.com/nutanix-cloud-native/prism-go-client v0.4.0
102102

103-
replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38
103+
replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b
104104

105-
replace k8s.io/client-go => k8s.io/client-go v0.33.4
105+
replace k8s.io/client-go => k8s.io/client-go v0.34.0
106106

107107
// Needs to be the same as https://github.com/kubermatic/kubermatic/blob/main/pkg/resources/resources.go#L643
108108
replace k8c.io/kubeone => k8c.io/kubeone v1.7.2
@@ -208,7 +208,7 @@ require (
208208
github.com/fatih/color v1.18.0 // indirect
209209
github.com/felixge/httpsnoop v1.0.4 // indirect
210210
github.com/fsnotify/fsnotify v1.9.0 // indirect
211-
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
211+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
212212
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 // indirect
213213
github.com/go-chi/chi v4.1.2+incompatible // indirect
214214
github.com/go-ini/ini v1.67.0 // indirect
@@ -234,13 +234,12 @@ require (
234234
github.com/golang/protobuf v1.5.4 // indirect
235235
github.com/golang/snappy v1.0.0 // indirect
236236
github.com/google/btree v1.1.3 // indirect
237-
github.com/google/cel-go v0.25.0 // indirect
237+
github.com/google/cel-go v0.26.0 // indirect
238238
github.com/google/certificate-transparency-go v1.3.2-0.20250506133818-bc7acd89f703 // indirect
239-
github.com/google/gnostic-models v0.6.9 // indirect
239+
github.com/google/gnostic-models v0.7.0 // indirect
240240
github.com/google/go-containerregistry v0.20.4-0.20250225234217-098045d5e61f // indirect
241241
github.com/google/go-github/v55 v55.0.0 // indirect
242242
github.com/google/go-querystring v1.1.0 // indirect
243-
github.com/google/gofuzz v1.2.1-0.20210504230335-f78f29fc09ea // indirect
244243
github.com/google/s2a-go v0.1.9 // indirect
245244
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
246245
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
@@ -286,7 +285,7 @@ require (
286285
github.com/moby/locker v1.0.1 // indirect
287286
github.com/moby/spdystream v0.5.0 // indirect
288287
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
289-
github.com/modern-go/reflect2 v1.0.2 // indirect
288+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
290289
github.com/mozillazg/docker-credential-acr-helper v0.4.0 // indirect
291290
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
292291
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
@@ -369,6 +368,7 @@ require (
369368
go.step.sm/crypto v0.63.0 // indirect
370369
go.uber.org/multierr v1.11.0 // indirect
371370
go.yaml.in/yaml/v2 v2.4.2 // indirect
371+
go.yaml.in/yaml/v3 v3.0.4 // indirect
372372
golang.org/x/crypto v0.41.0 // indirect
373373
golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6 // indirect
374374
golang.org/x/mod v0.27.0 // indirect
@@ -392,15 +392,15 @@ require (
392392
gopkg.in/yaml.v2 v2.4.0 // indirect
393393
k8c.io/kubelb v1.2.0 // indirect
394394
k8s.io/autoscaler/vertical-pod-autoscaler v1.3.1 // indirect
395-
k8s.io/component-base v0.33.4 // indirect
396-
k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7 // indirect
397-
k8s.io/kube-aggregator v0.33.4 // indirect
395+
k8s.io/component-base v0.34.0 // indirect
396+
k8s.io/gengo/v2 v2.0.0-20250604051438-85fd79dbfd9f // indirect
397+
k8s.io/kube-aggregator v0.34.0 // indirect
398398
k8s.io/kube-openapi v0.31.8 // indirect
399399
k8s.io/pod-security-admission v0.33.0 // indirect
400400
kubevirt.io/controller-lifecycle-operator-sdk/api v0.2.4 // indirect
401401
sigs.k8s.io/gateway-api v1.3.0 // indirect
402402
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
403403
sigs.k8s.io/randfill v1.0.0 // indirect
404404
sigs.k8s.io/release-utils v0.11.1 // indirect
405-
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
405+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
406406
)

0 commit comments

Comments
 (0)