Skip to content

Commit d7f9921

Browse files
Merge pull request #138082 from Lidang-Jiang/feat/dv-node-providerid-update
Migrate Node.Spec.ProviderID to declarative set-once validation Kubernetes-commit: 37179eeb6d65c6e261e1099fa806ddf6129677b2
2 parents 9fa1d17 + b566bfc commit d7f9921

4 files changed

Lines changed: 9 additions & 3 deletions

File tree

core/v1/generated.proto

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/v1/types.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6548,6 +6548,9 @@ type NodeSpec struct {
65486548

65496549
// ID of the node assigned by the cloud provider in the format: <ProviderName>://<ProviderSpecificNodeID>
65506550
// +optional
6551+
// +k8s:alpha(since: "1.36")=+k8s:optional
6552+
// +k8s:alpha(since: "1.36")=+k8s:update=NoModify
6553+
// +k8s:alpha(since: "1.36")=+k8s:update=NoUnset
65516554
ProviderID string `json:"providerID,omitempty" protobuf:"bytes,3,opt,name=providerID"`
65526555
// Unschedulable controls node schedulability of new pods. By default, node is schedulable.
65536556
// More info: https://kubernetes.io/docs/concepts/nodes/node/#manual-node-administration

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ go 1.26.0
77
godebug default=go1.26
88

99
require (
10-
k8s.io/apimachinery v0.0.0-20260701165018-c428e39362be
10+
k8s.io/apimachinery v0.0.0-20260701181815-a77f06b7664f
1111
k8s.io/klog/v2 v2.140.0
1212
)
1313

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
4040
gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
4141
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
4242
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
43-
k8s.io/apimachinery v0.0.0-20260701165018-c428e39362be h1:7SYbrGJaF0XgQGQ3jshZvTkgRSC6lTVcnXADtdBSidQ=
44-
k8s.io/apimachinery v0.0.0-20260701165018-c428e39362be/go.mod h1:T9tvL1Yxf+TRVyTz+Q7KtLAncCr9xxxx1zrF6g/QuR0=
43+
k8s.io/apimachinery v0.0.0-20260701181815-a77f06b7664f h1:6W5WgEnAxHNQIF6kzwN8CQfvK3ZVYJL7bjiH+267lTg=
44+
k8s.io/apimachinery v0.0.0-20260701181815-a77f06b7664f/go.mod h1:T9tvL1Yxf+TRVyTz+Q7KtLAncCr9xxxx1zrF6g/QuR0=
4545
k8s.io/klog/v2 v2.140.0 h1:Tf+J3AH7xnUzZyVVXhTgGhEKnFqye14aadWv7bzXdzc=
4646
k8s.io/klog/v2 v2.140.0/go.mod h1:o+/RWfJ6PwpnFn7OyAG3QnO47BFsymfEfrz6XyYSSp0=
4747
k8s.io/kube-openapi v0.0.0-20260618221249-bc653b64f974 h1:JVogoTvOj6gutlx8bUwGh0e8o8L4X8nDbTLyONmoVvk=

0 commit comments

Comments
 (0)