🐛 Envtest conversion mods should set strategy and review versions

Conversion webhooks require the strategy to be set and all the supported
review versions.

This change also fixes an issue where the CABundle wasn't previously
base64 encoded.

Signed-off-by: Vince Prignano <vincepri@vmware.com>

pkg/envtest/crd.go

@@ -20,6 +20,7 @@ import (
 	"bufio"
 	"bytes"
 	"context"
+	"encoding/base64"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -370,13 +371,15 @@ func modifyConversionWebhooks(crds []client.Object, webhookOptions WebhookInstal
 	for _, crd := range crds {
 		switch c := crd.(type) {
 		case *apiextensionsv1beta1.CustomResourceDefinition:
+			c.Spec.Conversion.Strategy = apiextensionsv1beta1.WebhookConverter
 			c.Spec.Conversion.WebhookClientConfig.Service = nil
 			c.Spec.Conversion.WebhookClientConfig = &apiextensionsv1beta1.WebhookClientConfig{
 				Service:  nil,
 				URL:      url,
 				CABundle: webhookOptions.LocalServingCAData,
 			}
 		case *apiextensionsv1.CustomResourceDefinition:
+			c.Spec.Conversion.Strategy = apiextensionsv1.WebhookConverter
 			c.Spec.Conversion.Webhook.ClientConfig.Service = nil
 			c.Spec.Conversion.Webhook.ClientConfig = &apiextensionsv1.WebhookClientConfig{
 				Service:  nil,
@@ -386,18 +389,48 @@ func modifyConversionWebhooks(crds []client.Object, webhookOptions WebhookInstal
 		case *unstructured.Unstructured:
 			webhookClientConfig := map[string]interface{}{
 				"url":      *url,
-				"caBundle": webhookOptions.LocalServingCAData,
+				"caBundle": base64.StdEncoding.EncodeToString(webhookOptions.LocalServingCAData),
 			}
 
 			switch c.GroupVersionKind().Version {
 			case "v1beta1":
+				// Set the strategy.
+				if err := unstructured.SetNestedField(
+					c.Object,
+					string(apiextensionsv1beta1.WebhookConverter),
+					"spec", "conversion", "strategy"); err != nil {
+					return err
+				}
+				// Set the conversion review versions.
+				if err := unstructured.SetNestedStringSlice(
+					c.Object,
+					[]string{"v1beta1"},
+					"spec", "conversion", "webhook", "clientConfig"); err != nil {
+					return err
+				}
+				// Set the client configuration.
 				if err := unstructured.SetNestedMap(
 					c.Object,
 					webhookClientConfig,
 					"spec", "conversion", "webhookClientConfig"); err != nil {
 					return err
 				}
 			case "v1":
+				// Set the strategy.
+				if err := unstructured.SetNestedField(
+					c.Object,
+					string(apiextensionsv1.WebhookConverter),
+					"spec", "conversion", "strategy"); err != nil {
+					return err
+				}
+				// Set the conversion review versions.
+				if err := unstructured.SetNestedStringSlice(
+					c.Object,
+					[]string{"v1", "v1beta1"},
+					"spec", "conversion", "webhook", "conversionReviewVersions"); err != nil {
+					return err
+				}
+				// Set the client configuration.
 				if err := unstructured.SetNestedMap(
 					c.Object,
 					webhookClientConfig,

pkg/envtest/server.go

@@ -273,6 +273,7 @@ func (te *Environment) Start() (*rest.Config, error) {
 	te.CRDInstallOptions.CRDs = mergeCRDs(te.CRDInstallOptions.CRDs, te.CRDs)
 	te.CRDInstallOptions.Paths = mergePaths(te.CRDInstallOptions.Paths, te.CRDDirectoryPaths)
 	te.CRDInstallOptions.ErrorIfPathMissing = te.ErrorIfCRDPathMissing
+	te.CRDInstallOptions.WebhookOptions = te.WebhookInstallOptions
 	crds, err := InstallCRDs(te.Config, te.CRDInstallOptions)
 	if err != nil {
 		return te.Config, err