From 2e50efea5c5b06020decf1e21c83bb20517ff704 Mon Sep 17 00:00:00 2001 From: George Pollard Date: Fri, 20 Nov 2020 03:38:22 +0000 Subject: [PATCH] Add required sideEffects setting --- .../generator/pkg/astmodel/kubernetes_resource_interface.go | 2 +- .../Arm_test_dependent_resource_and_ownership.golden | 6 +++--- .../Arm_test_simple_resource_array_properties.golden | 2 +- .../Arm_test_simple_resource_complex_properties.golden | 2 +- .../ArmResource/Arm_test_simple_resource_json_fields.golden | 2 +- .../Arm_test_simple_resource_map_properties.golden | 2 +- .../Arm_test_simple_resource_renders_spec.golden | 2 +- .../EmbeddedTypes/Embedded_type_simple_resource.golden | 2 +- .../testdata/EnumNames/Multi_valued_enum_name.golden | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/hack/generator/pkg/astmodel/kubernetes_resource_interface.go b/hack/generator/pkg/astmodel/kubernetes_resource_interface.go index e72b4c8bf..24771956d 100644 --- a/hack/generator/pkg/astmodel/kubernetes_resource_interface.go +++ b/hack/generator/pkg/astmodel/kubernetes_resource_interface.go @@ -115,7 +115,7 @@ func AddKubernetesResourceInterfaceImpls( // e.g. "default.backendaddresspool.infra.azure.com" name := fmt.Sprintf("default.%s.%s", resource, group) - annotation := fmt.Sprintf("+kubebuilder:webhook:path=/%s,mutating=true,matchPolicy=Equivalent,failurePolicy=fail,groups=%s,resources=%s,verbs=create;update,versions=%s,name=%s", path, group, resource, version, name) + annotation := fmt.Sprintf("+kubebuilder:webhook:path=/%s,mutating=true,sideEffects=None,matchPolicy=Exact,failurePolicy=fail,groups=%s,resources=%s,verbs=create;update,versions=%s,name=%s", path, group, resource, version, name) r = r.WithInterface(NewInterfaceImplementation( MakeTypeName(admissionPackageReference, "Defaulter"), &objectFunction{ diff --git a/hack/generator/pkg/codegen/testdata/ArmResource/Arm_test_dependent_resource_and_ownership.golden b/hack/generator/pkg/codegen/testdata/ArmResource/Arm_test_dependent_resource_and_ownership.golden index f599f7aac..2240279a0 100644 --- a/hack/generator/pkg/codegen/testdata/ArmResource/Arm_test_dependent_resource_and_ownership.golden +++ b/hack/generator/pkg/codegen/testdata/ArmResource/Arm_test_dependent_resource_and_ownership.golden @@ -19,7 +19,7 @@ type A struct { Spec A_Spec `json:"spec,omitempty"` } -// +kubebuilder:webhook:path=/mutate-test-infra-azure-com-v20200101-a,mutating=true,matchPolicy=Equivalent,failurePolicy=fail,groups=test.infra.azure.com,resources=a,verbs=create;update,versions=v20200101,name=default.a.test.infra.azure.com +// +kubebuilder:webhook:path=/mutate-test-infra-azure-com-v20200101-a,mutating=true,sideEffects=None,matchPolicy=Exact,failurePolicy=fail,groups=test.infra.azure.com,resources=a,verbs=create;update,versions=v20200101,name=default.a.test.infra.azure.com var _ admission.Defaulter = &A{} @@ -86,7 +86,7 @@ type B struct { Spec B_Spec `json:"spec,omitempty"` } -// +kubebuilder:webhook:path=/mutate-test-infra-azure-com-v20200101-b,mutating=true,matchPolicy=Equivalent,failurePolicy=fail,groups=test.infra.azure.com,resources=b,verbs=create;update,versions=v20200101,name=default.b.test.infra.azure.com +// +kubebuilder:webhook:path=/mutate-test-infra-azure-com-v20200101-b,mutating=true,sideEffects=None,matchPolicy=Exact,failurePolicy=fail,groups=test.infra.azure.com,resources=b,verbs=create;update,versions=v20200101,name=default.b.test.infra.azure.com var _ admission.Defaulter = &B{} @@ -153,7 +153,7 @@ type C struct { Spec C_Spec `json:"spec,omitempty"` } -// +kubebuilder:webhook:path=/mutate-test-infra-azure-com-v20200101-c,mutating=true,matchPolicy=Equivalent,failurePolicy=fail,groups=test.infra.azure.com,resources=c,verbs=create;update,versions=v20200101,name=default.c.test.infra.azure.com +// +kubebuilder:webhook:path=/mutate-test-infra-azure-com-v20200101-c,mutating=true,sideEffects=None,matchPolicy=Exact,failurePolicy=fail,groups=test.infra.azure.com,resources=c,verbs=create;update,versions=v20200101,name=default.c.test.infra.azure.com var _ admission.Defaulter = &C{} diff --git a/hack/generator/pkg/codegen/testdata/ArmResource/Arm_test_simple_resource_array_properties.golden b/hack/generator/pkg/codegen/testdata/ArmResource/Arm_test_simple_resource_array_properties.golden index eec4a53ff..cc5899022 100644 --- a/hack/generator/pkg/codegen/testdata/ArmResource/Arm_test_simple_resource_array_properties.golden +++ b/hack/generator/pkg/codegen/testdata/ArmResource/Arm_test_simple_resource_array_properties.golden @@ -19,7 +19,7 @@ type FakeResource struct { Spec FakeResource_Spec `json:"spec,omitempty"` } -// +kubebuilder:webhook:path=/mutate-test-infra-azure-com-v20200101-fakeresource,mutating=true,matchPolicy=Equivalent,failurePolicy=fail,groups=test.infra.azure.com,resources=fakeresource,verbs=create;update,versions=v20200101,name=default.fakeresource.test.infra.azure.com +// +kubebuilder:webhook:path=/mutate-test-infra-azure-com-v20200101-fakeresource,mutating=true,sideEffects=None,matchPolicy=Exact,failurePolicy=fail,groups=test.infra.azure.com,resources=fakeresource,verbs=create;update,versions=v20200101,name=default.fakeresource.test.infra.azure.com var _ admission.Defaulter = &FakeResource{} diff --git a/hack/generator/pkg/codegen/testdata/ArmResource/Arm_test_simple_resource_complex_properties.golden b/hack/generator/pkg/codegen/testdata/ArmResource/Arm_test_simple_resource_complex_properties.golden index 2c49e9fa1..547fc1598 100644 --- a/hack/generator/pkg/codegen/testdata/ArmResource/Arm_test_simple_resource_complex_properties.golden +++ b/hack/generator/pkg/codegen/testdata/ArmResource/Arm_test_simple_resource_complex_properties.golden @@ -19,7 +19,7 @@ type FakeResource struct { Spec FakeResource_Spec `json:"spec,omitempty"` } -// +kubebuilder:webhook:path=/mutate-test-infra-azure-com-v20200101-fakeresource,mutating=true,matchPolicy=Equivalent,failurePolicy=fail,groups=test.infra.azure.com,resources=fakeresource,verbs=create;update,versions=v20200101,name=default.fakeresource.test.infra.azure.com +// +kubebuilder:webhook:path=/mutate-test-infra-azure-com-v20200101-fakeresource,mutating=true,sideEffects=None,matchPolicy=Exact,failurePolicy=fail,groups=test.infra.azure.com,resources=fakeresource,verbs=create;update,versions=v20200101,name=default.fakeresource.test.infra.azure.com var _ admission.Defaulter = &FakeResource{} diff --git a/hack/generator/pkg/codegen/testdata/ArmResource/Arm_test_simple_resource_json_fields.golden b/hack/generator/pkg/codegen/testdata/ArmResource/Arm_test_simple_resource_json_fields.golden index 9ece8c427..68d81a267 100644 --- a/hack/generator/pkg/codegen/testdata/ArmResource/Arm_test_simple_resource_json_fields.golden +++ b/hack/generator/pkg/codegen/testdata/ArmResource/Arm_test_simple_resource_json_fields.golden @@ -20,7 +20,7 @@ type FakeResource struct { Spec FakeResource_Spec `json:"spec,omitempty"` } -// +kubebuilder:webhook:path=/mutate-test-infra-azure-com-v20200101-fakeresource,mutating=true,matchPolicy=Equivalent,failurePolicy=fail,groups=test.infra.azure.com,resources=fakeresource,verbs=create;update,versions=v20200101,name=default.fakeresource.test.infra.azure.com +// +kubebuilder:webhook:path=/mutate-test-infra-azure-com-v20200101-fakeresource,mutating=true,sideEffects=None,matchPolicy=Exact,failurePolicy=fail,groups=test.infra.azure.com,resources=fakeresource,verbs=create;update,versions=v20200101,name=default.fakeresource.test.infra.azure.com var _ admission.Defaulter = &FakeResource{} diff --git a/hack/generator/pkg/codegen/testdata/ArmResource/Arm_test_simple_resource_map_properties.golden b/hack/generator/pkg/codegen/testdata/ArmResource/Arm_test_simple_resource_map_properties.golden index 9481f707e..ee52648db 100644 --- a/hack/generator/pkg/codegen/testdata/ArmResource/Arm_test_simple_resource_map_properties.golden +++ b/hack/generator/pkg/codegen/testdata/ArmResource/Arm_test_simple_resource_map_properties.golden @@ -19,7 +19,7 @@ type FakeResource struct { Spec FakeResource_Spec `json:"spec,omitempty"` } -// +kubebuilder:webhook:path=/mutate-test-infra-azure-com-v20200101-fakeresource,mutating=true,matchPolicy=Equivalent,failurePolicy=fail,groups=test.infra.azure.com,resources=fakeresource,verbs=create;update,versions=v20200101,name=default.fakeresource.test.infra.azure.com +// +kubebuilder:webhook:path=/mutate-test-infra-azure-com-v20200101-fakeresource,mutating=true,sideEffects=None,matchPolicy=Exact,failurePolicy=fail,groups=test.infra.azure.com,resources=fakeresource,verbs=create;update,versions=v20200101,name=default.fakeresource.test.infra.azure.com var _ admission.Defaulter = &FakeResource{} diff --git a/hack/generator/pkg/codegen/testdata/ArmResource/Arm_test_simple_resource_renders_spec.golden b/hack/generator/pkg/codegen/testdata/ArmResource/Arm_test_simple_resource_renders_spec.golden index e85801031..4a712f3ab 100644 --- a/hack/generator/pkg/codegen/testdata/ArmResource/Arm_test_simple_resource_renders_spec.golden +++ b/hack/generator/pkg/codegen/testdata/ArmResource/Arm_test_simple_resource_renders_spec.golden @@ -19,7 +19,7 @@ type FakeResource struct { Spec FakeResource_Spec `json:"spec,omitempty"` } -// +kubebuilder:webhook:path=/mutate-test-infra-azure-com-v20200101-fakeresource,mutating=true,matchPolicy=Equivalent,failurePolicy=fail,groups=test.infra.azure.com,resources=fakeresource,verbs=create;update,versions=v20200101,name=default.fakeresource.test.infra.azure.com +// +kubebuilder:webhook:path=/mutate-test-infra-azure-com-v20200101-fakeresource,mutating=true,sideEffects=None,matchPolicy=Exact,failurePolicy=fail,groups=test.infra.azure.com,resources=fakeresource,verbs=create;update,versions=v20200101,name=default.fakeresource.test.infra.azure.com var _ admission.Defaulter = &FakeResource{} diff --git a/hack/generator/pkg/codegen/testdata/EmbeddedTypes/Embedded_type_simple_resource.golden b/hack/generator/pkg/codegen/testdata/EmbeddedTypes/Embedded_type_simple_resource.golden index d1234c61e..ab46efd00 100644 --- a/hack/generator/pkg/codegen/testdata/EmbeddedTypes/Embedded_type_simple_resource.golden +++ b/hack/generator/pkg/codegen/testdata/EmbeddedTypes/Embedded_type_simple_resource.golden @@ -19,7 +19,7 @@ type FakeResource struct { Spec FakeResource_Spec `json:"spec,omitempty"` } -// +kubebuilder:webhook:path=/mutate-test-infra-azure-com-v20200101-fakeresource,mutating=true,matchPolicy=Equivalent,failurePolicy=fail,groups=test.infra.azure.com,resources=fakeresource,verbs=create;update,versions=v20200101,name=default.fakeresource.test.infra.azure.com +// +kubebuilder:webhook:path=/mutate-test-infra-azure-com-v20200101-fakeresource,mutating=true,sideEffects=None,matchPolicy=Exact,failurePolicy=fail,groups=test.infra.azure.com,resources=fakeresource,verbs=create;update,versions=v20200101,name=default.fakeresource.test.infra.azure.com var _ admission.Defaulter = &FakeResource{} diff --git a/hack/generator/pkg/codegen/testdata/EnumNames/Multi_valued_enum_name.golden b/hack/generator/pkg/codegen/testdata/EnumNames/Multi_valued_enum_name.golden index 0b5abebf8..0aca97695 100644 --- a/hack/generator/pkg/codegen/testdata/EnumNames/Multi_valued_enum_name.golden +++ b/hack/generator/pkg/codegen/testdata/EnumNames/Multi_valued_enum_name.golden @@ -19,7 +19,7 @@ type AResource struct { Spec AResource_Spec `json:"spec,omitempty"` } -// +kubebuilder:webhook:path=/mutate-test-infra-azure-com-v20200101-aresource,mutating=true,matchPolicy=Equivalent,failurePolicy=fail,groups=test.infra.azure.com,resources=aresource,verbs=create;update,versions=v20200101,name=default.aresource.test.infra.azure.com +// +kubebuilder:webhook:path=/mutate-test-infra-azure-com-v20200101-aresource,mutating=true,sideEffects=None,matchPolicy=Exact,failurePolicy=fail,groups=test.infra.azure.com,resources=aresource,verbs=create;update,versions=v20200101,name=default.aresource.test.infra.azure.com var _ admission.Defaulter = &AResource{}