Merge pull request #2176 from varshaprasad96/add/default-convReviewVersions

k8s-ci-robot · web-flow · commit 53b7bf2fc477 · 2021-05-11T15:19:39.000-07:00
✨ add default conversion review versions
diff --git a/pkg/cli/alpha/config-gen/cert-generation-filter.go b/pkg/cli/alpha/config-gen/cert-generation-filter.go
@@ -38,6 +38,7 @@ type CertFilter struct {
 }
 
 // Filter implements kio.Filter
+// TODO: when v1 CRDs are supported, scaffold conversion webhook versions.
 func (c CertFilter) Filter(input []*yaml.RNode) ([]*yaml.RNode, error) {
 
 	if c.Spec.Webhooks.CertificateSource.Type != "dev" {
diff --git a/pkg/plugins/common/kustomize/v1/scaffolds/internal/templates/config/crd/patches/enablewebhook_patch.go b/pkg/plugins/common/kustomize/v1/scaffolds/internal/templates/config/crd/patches/enablewebhook_patch.go
@@ -66,5 +66,7 @@ spec:
           namespace: system
           name: webhook-service
           path: /convert
+      conversionReviewVersions:
+      - {{ .Resource.API.CRDVersion }}
     {{- 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,5 @@ 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,5 @@ 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,5 @@ 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,5 @@ 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,5 @@ 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,5 @@ 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,5 @@ 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,5 @@ 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,5 @@ 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,5 @@ 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,5 @@ 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,5 @@ 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,5 @@ 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,5 @@ 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,5 @@ 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,5 @@ 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,5 @@ spec:
           namespace: system
           name: webhook-service
           path: /convert
+      conversionReviewVersions:
+      - v1

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ type CertFilter struct {`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`// Filter implements kio.Filter`
	`41`	`+// TODO: when v1 CRDs are supported, scaffold conversion webhook versions.`
`41`	`42`	`func (c CertFilter) Filter(input []yaml.RNode) ([]yaml.RNode, error) {`
`42`	`43`
`43`	`44`	`if c.Spec.Webhooks.CertificateSource.Type != "dev" {`
Original file line number	Diff line number	Diff line change
`@@ -66,5 +66,7 @@ spec:`
`66`	`66`	`namespace: system`
`67`	`67`	`name: webhook-service`
`68`	`68`	`path: /convert`
	`69`	`+ conversionReviewVersions:`
	`70`	`+ - {{ .Resource.API.CRDVersion }}`
`69`	`71`	`{{- end }}`
`70`	`72`	`