github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 01:06:27 +00:00
Code Issues Projects Releases Wiki Activity

update networking strategy and remove hardcode field on the test

Browse Source
This commit is contained in:
Antonio Ojea 2024-06-29 10:06:00 +00:00
parent c1d06c0ae4
commit dbfdd074d0
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/registry/networking/servicecidr/strategy.go
View File

@ -53,6 +53,9 @@ func (serviceCIDRStrategy) NamespaceScoped() bool {
// and should not be modified by the user. // and should not be modified by the user.
func (serviceCIDRStrategy) GetResetFields() map[fieldpath.APIVersion]*fieldpath.Set { func (serviceCIDRStrategy) GetResetFields() map[fieldpath.APIVersion]*fieldpath.Set {
fields := map[fieldpath.APIVersion]*fieldpath.Set{ fields := map[fieldpath.APIVersion]*fieldpath.Set{
"networking/v1beta1": fieldpath.NewSet(
fieldpath.MakePathOrDie("status"),
),
"networking/v1alpha1": fieldpath.NewSet( "networking/v1alpha1": fieldpath.NewSet(
fieldpath.MakePathOrDie("status"), fieldpath.MakePathOrDie("status"),
), ),
@ -125,6 +128,9 @@ var StatusStrategy = serviceCIDRStatusStrategy{Strategy}
// and should not be modified by the user. // and should not be modified by the user.
func (serviceCIDRStatusStrategy) GetResetFields() map[fieldpath.APIVersion]*fieldpath.Set { func (serviceCIDRStatusStrategy) GetResetFields() map[fieldpath.APIVersion]*fieldpath.Set {
fields := map[fieldpath.APIVersion]*fieldpath.Set{ fields := map[fieldpath.APIVersion]*fieldpath.Set{
"networking/v1beta1": fieldpath.NewSet(
fieldpath.MakePathOrDie("spec"),
),
"networking/v1alpha1": fieldpath.NewSet( "networking/v1alpha1": fieldpath.NewSet(
fieldpath.MakePathOrDie("spec"), fieldpath.MakePathOrDie("spec"),
), ),

9
pkg/registry/networking/servicecidr/strategy_test.go
View File

@ -43,10 +43,6 @@ func TestServiceCIDRStrategy(t *testing.T) {
t.Errorf("Expected ServiceCIDR to be cluster-scoped") t.Errorf("Expected ServiceCIDR to be cluster-scoped")
} }
resetFields := Strategy.GetResetFields()
if len(resetFields) != 1 {
t.Errorf("ResetFields should have 1 element, but have %d", len(resetFields))
}
obj := &networking.ServiceCIDR{Spec: networking.ServiceCIDRSpec{CIDRs: []string{"bad cidr"}}} obj := &networking.ServiceCIDR{Spec: networking.ServiceCIDRSpec{CIDRs: []string{"bad cidr"}}}
errors := Strategy.Validate(context.TODO(), obj) errors := Strategy.Validate(context.TODO(), obj)
@ -64,11 +60,6 @@ func TestServiceCIDRStrategy(t *testing.T) {
} }
func TestServiceCIDRStatusStrategy(t *testing.T) { func TestServiceCIDRStatusStrategy(t *testing.T) {
resetFields := StatusStrategy.GetResetFields()
if len(resetFields) != 1 {
t.Errorf("ResetFields should have 1 element, but have %d", len(resetFields))
}
oldObj := &networking.ServiceCIDR{Spec: networking.ServiceCIDRSpec{}} oldObj := &networking.ServiceCIDR{Spec: networking.ServiceCIDRSpec{}}
newObj := &networking.ServiceCIDR{ newObj := &networking.ServiceCIDR{
Spec: networking.ServiceCIDRSpec{ Spec: networking.ServiceCIDRSpec{