Skip to content

Commit

Permalink
Merge pull request #123392 from thockin/depreciate
Browse files Browse the repository at this point in the history
Cleanup: s/depreciated/deprecated/g

Kubernetes-commit: 11785bb815d58eb553be3a1fa305464c35d860cc
  • Loading branch information
k8s-publishing-bot committed Feb 21, 2024
2 parents 6384da7 + f79318a commit 4efc15a
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion core/v1/generated.proto

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion core/v1/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -3599,7 +3599,7 @@ type PodSpec struct {
// More info: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/
// +optional
ServiceAccountName string `json:"serviceAccountName,omitempty" protobuf:"bytes,8,opt,name=serviceAccountName"`
// DeprecatedServiceAccount is a depreciated alias for ServiceAccountName.
// DeprecatedServiceAccount is a deprecated alias for ServiceAccountName.
// Deprecated: Use serviceAccountName instead.
// +k8s:conversion-gen=false
// +optional
Expand Down
2 changes: 1 addition & 1 deletion core/v1/types_swagger_doc_generated.go
Original file line number Diff line number Diff line change
Expand Up @@ -1741,7 +1741,7 @@ var map_PodSpec = map[string]string{
"dnsPolicy": "Set DNS policy for the pod. Defaults to \"ClusterFirst\". Valid values are 'ClusterFirstWithHostNet', 'ClusterFirst', 'Default' or 'None'. DNS parameters given in DNSConfig will be merged with the policy selected with DNSPolicy. To have DNS options set along with hostNetwork, you have to specify DNS policy explicitly to 'ClusterFirstWithHostNet'.",
"nodeSelector": "NodeSelector is a selector which must be true for the pod to fit on a node. Selector which must match a node's labels for the pod to be scheduled on that node. More info: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/",
"serviceAccountName": "ServiceAccountName is the name of the ServiceAccount to use to run this pod. More info: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/",
"serviceAccount": "DeprecatedServiceAccount is a depreciated alias for ServiceAccountName. Deprecated: Use serviceAccountName instead.",
"serviceAccount": "DeprecatedServiceAccount is a deprecated alias for ServiceAccountName. Deprecated: Use serviceAccountName instead.",
"automountServiceAccountToken": "AutomountServiceAccountToken indicates whether a service account token should be automatically mounted.",
"nodeName": "NodeName is a request to schedule this pod onto a specific node. If it is non-empty, the scheduler simply schedules this pod onto that node, assuming that it fits resource requirements.",
"hostNetwork": "Host networking requested for this pod. Use the host's network namespace. If this option is set, the ports that will be used must be specified. Default to false.",
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ go 1.21
require (
github.com/gogo/protobuf v1.3.2
github.com/stretchr/testify v1.8.4
k8s.io/apimachinery v0.0.0-20240221002254-afd4b8fa4257
k8s.io/apimachinery v0.0.0-20240221122145-856aea55acea
)

require (
Expand Down Expand Up @@ -36,4 +36,4 @@ require (
sigs.k8s.io/yaml v1.3.0 // indirect
)

replace k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20240221002254-afd4b8fa4257
replace k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20240221122145-856aea55acea
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
k8s.io/apimachinery v0.0.0-20240221002254-afd4b8fa4257 h1:Z5YxA+t758TWevP0yw/QI4vOOW02b0rEwwSr4/8zxw4=
k8s.io/apimachinery v0.0.0-20240221002254-afd4b8fa4257/go.mod h1:8Kbkl+Wq46koELfFfSvx+qgICYK22zw/3Epu/RdY6yQ=
k8s.io/apimachinery v0.0.0-20240221122145-856aea55acea h1:noOTXkaeQKCee5NTYUJXa3mKJHpnaqt1BleKeNg6CEo=
k8s.io/apimachinery v0.0.0-20240221122145-856aea55acea/go.mod h1:8Kbkl+Wq46koELfFfSvx+qgICYK22zw/3Epu/RdY6yQ=
k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
Expand Down

0 comments on commit 4efc15a

Please sign in to comment.