Skip to content
Merged
Show file tree
Hide file tree
Changes from 14 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
42 changes: 40 additions & 2 deletions modules/api/cmd/kubermatic-api/swagger.json
Original file line number Diff line number Diff line change
Expand Up @@ -32763,7 +32763,7 @@
"title": "EnvVar represents an environment variable present in a Container.",
"properties": {
"name": {
"description": "Name of the environment variable. Must be a C_IDENTIFIER.",
"description": "Name of the environment variable.\nMay consist of any printable ASCII characters except '='.",
"type": "string",
"x-go-name": "Name"
},
Expand All @@ -32788,6 +32788,9 @@
"fieldRef": {
"$ref": "#/definitions/ObjectFieldSelector"
},
"fileKeyRef": {
"$ref": "#/definitions/FileKeySelector"
},
"resourceFieldRef": {
"$ref": "#/definitions/ResourceFieldSelector"
},
Expand Down Expand Up @@ -33527,6 +33530,34 @@
"title": "FieldValueErrorReason is a machine-readable value providing more detail about why a field failed the validation.",
"x-go-package": "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
},
"FileKeySelector": {
"description": "+structType=atomic",
"type": "object",
"title": "FileKeySelector selects a key of the env file.",
"properties": {
"key": {
"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",
"type": "string",
"x-go-name": "Key"
},
"optional": {
"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",
"type": "boolean",
"x-go-name": "Optional"
},
"path": {
"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",
"type": "string",
"x-go-name": "Path"
},
"volumeName": {
"description": "The name of the volume mount containing the env file.\n+required",
"type": "string",
"x-go-name": "VolumeName"
}
},
"x-go-package": "k8s.io/api/core/v1"
},
"FlatcarSpec": {
"description": "FlatcarSpec contains Flatcar Linux specific settings",
"type": "object",
Expand Down Expand Up @@ -40100,7 +40131,7 @@
"title": "ResourceRequirements describes the compute resource requirements.",
"properties": {
"claims": {
"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",
"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",
"type": "array",
"items": {
"$ref": "#/definitions/ResourceClaim"
Expand Down Expand Up @@ -41457,6 +41488,13 @@
"description": "VMwareCloudDirectorNodeSpec VMware Cloud Director node settings",
"type": "object",
"properties": {
"additionalNetworks": {
"type": "array",
"items": {
"type": "string"
},
"x-go-name": "AdditionalNetworks"
},
"catalog": {
"type": "string",
"x-go-name": "Catalog"
Expand Down
40 changes: 20 additions & 20 deletions modules/api/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ require (
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.22.0
github.com/spf13/cobra v1.9.1
github.com/spf13/pflag v1.0.6
github.com/spf13/pflag v1.0.7
github.com/stretchr/testify v1.10.0
github.com/vmware-tanzu/velero v1.16.0
github.com/vmware/go-vcloud-director/v2 v2.26.1
Expand All @@ -74,23 +74,23 @@ require (
k8c.io/kubeone v1.10.0
k8c.io/kubermatic/sdk/v2 v2.29.0-rc.1.0.20251023140643-ae9026233002
k8c.io/kubermatic/v2 v2.29.0-rc.1.0.20251023140643-ae9026233002
k8c.io/machine-controller/sdk v1.63.1
k8c.io/operating-system-manager v1.7.6
k8c.io/machine-controller/sdk v1.64.0
k8c.io/operating-system-manager v1.8.0
k8c.io/reconciler v0.5.0
k8s.io/api v0.33.4
k8s.io/apiextensions-apiserver v0.33.4
k8s.io/apimachinery v0.33.4
k8s.io/apiserver v0.33.4
k8s.io/api v0.34.1
k8s.io/apiextensions-apiserver v0.34.0
k8s.io/apimachinery v0.34.1
k8s.io/apiserver v0.34.0
k8s.io/client-go v12.0.0+incompatible
k8s.io/code-generator v0.33.4
k8s.io/code-generator v0.34.0
k8s.io/klog/v2 v2.130.1
k8s.io/kubectl v0.33.4
k8s.io/metrics v0.33.4
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d
kubevirt.io/api v1.4.0
kubevirt.io/containerized-data-importer-api v1.62.0
sigs.k8s.io/controller-runtime v0.21.0
sigs.k8s.io/controller-tools v0.18.0
sigs.k8s.io/controller-runtime v0.22.0
sigs.k8s.io/controller-tools v0.19.0
sigs.k8s.io/yaml v1.6.0
)

Expand All @@ -100,9 +100,9 @@ replace github.com/ajeddeloh/go-json => github.com/coreos/go-json v0.0.0-2022081
// 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.
replace github.com/nutanix-cloud-native/prism-go-client => github.com/nutanix-cloud-native/prism-go-client v0.4.0

replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38
replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912

replace k8s.io/client-go => k8s.io/client-go v0.33.4
replace k8s.io/client-go => k8s.io/client-go v0.34.1

// Needs to be the same as https://github.com/kubermatic/kubermatic/blob/main/pkg/resources/resources.go#L643
replace k8c.io/kubeone => k8c.io/kubeone v1.7.2
Expand Down Expand Up @@ -208,7 +208,7 @@ require (
github.com/fatih/color v1.18.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fsnotify/fsnotify v1.9.0 // indirect
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 // indirect
github.com/go-chi/chi v4.1.2+incompatible // indirect
github.com/go-ini/ini v1.67.0 // indirect
Expand All @@ -234,13 +234,12 @@ require (
github.com/golang/protobuf v1.5.4 // indirect
github.com/golang/snappy v1.0.0 // indirect
github.com/google/btree v1.1.3 // indirect
github.com/google/cel-go v0.25.0 // indirect
github.com/google/cel-go v0.26.0 // indirect
github.com/google/certificate-transparency-go v1.3.2-0.20250506133818-bc7acd89f703 // indirect
github.com/google/gnostic-models v0.6.9 // indirect
github.com/google/gnostic-models v0.7.0 // indirect
github.com/google/go-containerregistry v0.20.4-0.20250225234217-098045d5e61f // indirect
github.com/google/go-github/v55 v55.0.0 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/gofuzz v1.2.1-0.20210504230335-f78f29fc09ea // indirect
github.com/google/s2a-go v0.1.9 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
Expand Down Expand Up @@ -286,7 +285,7 @@ require (
github.com/moby/locker v1.0.1 // indirect
github.com/moby/spdystream v0.5.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
github.com/mozillazg/docker-credential-acr-helper v0.4.0 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
Expand Down Expand Up @@ -369,6 +368,7 @@ require (
go.step.sm/crypto v0.63.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.yaml.in/yaml/v2 v2.4.2 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
golang.org/x/crypto v0.41.0 // indirect
golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6 // indirect
golang.org/x/mod v0.27.0 // indirect
Expand All @@ -392,8 +392,8 @@ require (
gopkg.in/yaml.v2 v2.4.0 // indirect
k8c.io/kubelb v1.2.0 // indirect
k8s.io/autoscaler/vertical-pod-autoscaler v1.3.1 // indirect
k8s.io/component-base v0.33.4 // indirect
k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7 // indirect
k8s.io/component-base v0.34.0 // indirect
k8s.io/gengo/v2 v2.0.0-20250604051438-85fd79dbfd9f // indirect
k8s.io/kube-aggregator v0.33.4 // indirect
k8s.io/kube-openapi v0.31.8 // indirect
k8s.io/pod-security-admission v0.33.0 // indirect
Expand All @@ -402,5 +402,5 @@ require (
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
sigs.k8s.io/randfill v1.0.0 // indirect
sigs.k8s.io/release-utils v0.11.1 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
)
Loading