✨ add default conversion review versions

The conversion webhook client config requires a list of conversion review versions. This change scaffolds the conversion webhook patch with default conversion review version of v1.
kubernetes-sigs · May 6, 2021 · ef7f789 · ef7f789
1 parent 2b857cb
commit ef7f789
Show file tree

Hide file tree

Showing 19 changed files with 24 additions and 0 deletions.
diff --git a/pkg/cli/alpha/config-gen/cert-generation-filter.go b/pkg/cli/alpha/config-gen/cert-generation-filter.go
@@ -107,6 +107,12 @@ func (c CertFilter) Filter(input []*yaml.RNode) ([]*yaml.RNode, error) {
 		if err != nil {
 			return nil, err
 		}
+		err = matches[i].PipeE(yaml.LookupCreate(
+			yaml.ScalarNode, "spec", "conversion", "webhookClientConfig", "conversionReviewVersions"),
+			yaml.FieldSetter{StringValue: "v1"})
+		if err != nil {
+			return nil, err
+		}
 		err = matches[i].PipeE(yaml.LookupCreate(
 			yaml.ScalarNode, "spec", "conversion", "webhookClientConfig", "service", "name"),
 			yaml.FieldSetter{StringValue: "webhook-service"})

diff --git a/...ommon/kustomize/v1/scaffolds/internal/templates/config/crd/patches/enablewebhook_patch.go b/...ommon/kustomize/v1/scaffolds/internal/templates/config/crd/patches/enablewebhook_patch.go
@@ -66,5 +66,6 @@ spec:
           namespace: system
           name: webhook-service
           path: /convert
+      conversionReviewVersions: v1
     {{- end }}
 `
diff --git a/testdata/project-v3-addon/config/crd/patches/webhook_in_admirals.yaml b/testdata/project-v3-addon/config/crd/patches/webhook_in_admirals.yaml
@@ -12,3 +12,4 @@ spec:
           namespace: system
           name: webhook-service
           path: /convert
+      conversionReviewVersions: v1
diff --git a/testdata/project-v3-addon/config/crd/patches/webhook_in_captains.yaml b/testdata/project-v3-addon/config/crd/patches/webhook_in_captains.yaml
@@ -12,3 +12,4 @@ spec:
           namespace: system
           name: webhook-service
           path: /convert
+      conversionReviewVersions: v1
diff --git a/testdata/project-v3-addon/config/crd/patches/webhook_in_firstmates.yaml b/testdata/project-v3-addon/config/crd/patches/webhook_in_firstmates.yaml
@@ -12,3 +12,4 @@ spec:
           namespace: system
           name: webhook-service
           path: /convert
+      conversionReviewVersions: v1
diff --git a/testdata/project-v3-config/config/crd/patches/webhook_in_admirals.yaml b/testdata/project-v3-config/config/crd/patches/webhook_in_admirals.yaml
@@ -12,3 +12,4 @@ spec:
           namespace: system
           name: webhook-service
           path: /convert
+      conversionReviewVersions: v1
diff --git a/testdata/project-v3-config/config/crd/patches/webhook_in_captains.yaml b/testdata/project-v3-config/config/crd/patches/webhook_in_captains.yaml
@@ -12,3 +12,4 @@ spec:
           namespace: system
           name: webhook-service
           path: /convert
+      conversionReviewVersions: v1
diff --git a/testdata/project-v3-config/config/crd/patches/webhook_in_firstmates.yaml b/testdata/project-v3-config/config/crd/patches/webhook_in_firstmates.yaml
@@ -12,3 +12,4 @@ spec:
           namespace: system
           name: webhook-service
           path: /convert
+      conversionReviewVersions: v1
diff --git a/testdata/project-v3-multigroup/config/crd/patches/webhook_in_captains.yaml b/testdata/project-v3-multigroup/config/crd/patches/webhook_in_captains.yaml
@@ -12,3 +12,4 @@ spec:
           namespace: system
           name: webhook-service
           path: /convert
+      conversionReviewVersions: v1
diff --git a/testdata/project-v3-multigroup/config/crd/patches/webhook_in_cruisers.yaml b/testdata/project-v3-multigroup/config/crd/patches/webhook_in_cruisers.yaml
@@ -12,3 +12,4 @@ spec:
           namespace: system
           name: webhook-service
           path: /convert
+      conversionReviewVersions: v1
diff --git a/testdata/project-v3-multigroup/config/crd/patches/webhook_in_destroyers.yaml b/testdata/project-v3-multigroup/config/crd/patches/webhook_in_destroyers.yaml
@@ -12,3 +12,4 @@ spec:
           namespace: system
           name: webhook-service
           path: /convert
+      conversionReviewVersions: v1
diff --git a/testdata/project-v3-multigroup/config/crd/patches/webhook_in_frigates.yaml b/testdata/project-v3-multigroup/config/crd/patches/webhook_in_frigates.yaml
@@ -12,3 +12,4 @@ spec:
           namespace: system
           name: webhook-service
           path: /convert
+      conversionReviewVersions: v1
diff --git a/testdata/project-v3-multigroup/config/crd/patches/webhook_in_healthcheckpolicies.yaml b/testdata/project-v3-multigroup/config/crd/patches/webhook_in_healthcheckpolicies.yaml
@@ -12,3 +12,4 @@ spec:
           namespace: system
           name: webhook-service
           path: /convert
+      conversionReviewVersions: v1
diff --git a/testdata/project-v3-multigroup/config/crd/patches/webhook_in_krakens.yaml b/testdata/project-v3-multigroup/config/crd/patches/webhook_in_krakens.yaml
@@ -12,3 +12,4 @@ spec:
           namespace: system
           name: webhook-service
           path: /convert
+      conversionReviewVersions: v1
diff --git a/testdata/project-v3-multigroup/config/crd/patches/webhook_in_lakers.yaml b/testdata/project-v3-multigroup/config/crd/patches/webhook_in_lakers.yaml
@@ -12,3 +12,4 @@ spec:
           namespace: system
           name: webhook-service
           path: /convert
+      conversionReviewVersions: v1
diff --git a/testdata/project-v3-multigroup/config/crd/patches/webhook_in_leviathans.yaml b/testdata/project-v3-multigroup/config/crd/patches/webhook_in_leviathans.yaml
@@ -12,3 +12,4 @@ spec:
           namespace: system
           name: webhook-service
           path: /convert
+      conversionReviewVersions: v1
diff --git a/testdata/project-v3/config/crd/patches/webhook_in_admirales.yaml b/testdata/project-v3/config/crd/patches/webhook_in_admirales.yaml
@@ -12,3 +12,4 @@ spec:
           namespace: system
           name: webhook-service
           path: /convert
+      conversionReviewVersions: v1
diff --git a/testdata/project-v3/config/crd/patches/webhook_in_captains.yaml b/testdata/project-v3/config/crd/patches/webhook_in_captains.yaml
@@ -12,3 +12,4 @@ spec:
           namespace: system
           name: webhook-service
           path: /convert
+      conversionReviewVersions: v1
diff --git a/testdata/project-v3/config/crd/patches/webhook_in_firstmates.yaml b/testdata/project-v3/config/crd/patches/webhook_in_firstmates.yaml
@@ -12,3 +12,4 @@ spec:
           namespace: system
           name: webhook-service
           path: /convert
+      conversionReviewVersions: v1