github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #125540 from pohly/revert-binding-deprecation

Browse Source 
api: revert deprecation annotation for v1 Binding
This commit is contained in:
Kubernetes Prow Robot
2024-06-17 20:21:53 -07:00
committed by GitHub
parent 2c1aa2bfec 5d0165d140
commit a3a49887ee
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
staging/src/k8s.io/api/core/v1/types.go
View File

@@ -6370,7 +6370,6 @@ type NamespaceList struct {
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
// +k8s:prerelease-lifecycle-gen:introduced=1.0 // +k8s:prerelease-lifecycle-gen:introduced=1.0
// +k8s:prerelease-lifecycle-gen:deprecated=1.6
// Binding ties one object to another; for example, a pod is bound to a node by a scheduler. // Binding ties one object to another; for example, a pod is bound to a node by a scheduler.
// Deprecated in 1.7, please use the bindings subresource of pods instead. // Deprecated in 1.7, please use the bindings subresource of pods instead.

9
staging/src/k8s.io/api/core/v1/types_test.go
View File

@@ -58,3 +58,12 @@ func TestEphemeralContainer(t *testing.T) {
} }
} }
} }
func TestNoBindingDeprecation(t *testing.T) {
var binding any = new(Binding)
if _, ok := binding.(interface {
APILifecycleDeprecated(major, minor int)
}); ok {
t.Fatal("The Binding type must not marked as deprecated, it is still used for the binding sub-resource which is not deprecated.")
}
}

6
staging/src/k8s.io/api/core/v1/zz_generated.prerelease-lifecycle.go generated
View File

@@ -27,12 +27,6 @@ func (in *Binding) APILifecycleIntroduced() (major, minor int) {
return 1, 0 return 1, 0
} }
// APILifecycleDeprecated is an autogenerated function, returning the release in which the API struct was or will be deprecated as int versions of major and minor for comparison.
// It is controlled by "k8s:prerelease-lifecycle-gen:deprecated" tags in types.go or "k8s:prerelease-lifecycle-gen:introduced" plus three minor.
func (in *Binding) APILifecycleDeprecated() (major, minor int) {
return 1, 6
}
// APILifecycleIntroduced is an autogenerated function, returning the release in which the API struct was introduced as int versions of major and minor for comparison. // APILifecycleIntroduced is an autogenerated function, returning the release in which the API struct was introduced as int versions of major and minor for comparison.
// It is controlled by "k8s:prerelease-lifecycle-gen:introduced" tags in types.go. // It is controlled by "k8s:prerelease-lifecycle-gen:introduced" tags in types.go.
func (in *ConfigMap) APILifecycleIntroduced() (major, minor int) { func (in *ConfigMap) APILifecycleIntroduced() (major, minor int) {