Upgrade controller-runtime, hack fix for gen

controller-runtime 0.4.1 fixed the issue where they generated types as
Any which was an invalid type
(kubernetes-sigs/controller-tools#505) however
that results in the type for proxy-defaults.config being "byte" which
fails when creating proxy-defaults.

I played around a long time trying to find a type that generates the CRD
as expected and can be unmarshalled as expected and nothing worked so
for now I think it's best to keep it as json.RawMessage and then patch
the generated CRD.

Author: lkysow

config/crd/bases/consul.hashicorp.com_proxydefaults.yaml

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.4.0
+    controller-gen.kubebuilder.io/version: v0.4.1
   creationTimestamp: null
   name: proxydefaults.consul.hashicorp.com
 spec:
@@ -43,7 +43,8 @@ spec:
           properties:
             config:
               description: Config is an arbitrary map of configuration values used by Connect proxies. Any values that your proxy allows can be configured globally here. Supports JSON config values. See https://www.consul.io/docs/connect/proxies/envoy#configuration-formatting
-              type: Any
+              format: byte
+              type: string
             expose:
               description: Expose controls the default expose path configuration for Envoy.
               properties:

config/crd/bases/consul.hashicorp.com_servicedefaults.yaml

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.4.0
+    controller-gen.kubebuilder.io/version: v0.4.1
   creationTimestamp: null
   name: servicedefaults.consul.hashicorp.com
 spec:

config/crd/bases/consul.hashicorp.com_serviceintentions.yaml

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.4.0
+    controller-gen.kubebuilder.io/version: v0.4.1
   creationTimestamp: null
   name: serviceintentions.consul.hashicorp.com
 spec:

config/crd/bases/consul.hashicorp.com_serviceresolvers.yaml

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.4.0
+    controller-gen.kubebuilder.io/version: v0.4.1
   creationTimestamp: null
   name: serviceresolvers.consul.hashicorp.com
 spec:

config/crd/bases/consul.hashicorp.com_servicerouters.yaml

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.4.0
+    controller-gen.kubebuilder.io/version: v0.4.1
   creationTimestamp: null
   name: servicerouters.consul.hashicorp.com
 spec:

config/crd/bases/consul.hashicorp.com_servicesplitters.yaml

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.4.0
+    controller-gen.kubebuilder.io/version: v0.4.1
   creationTimestamp: null
   name: servicesplitters.consul.hashicorp.com
 spec:

config/webhook/manifests.v1beta1.yaml

@@ -7,7 +7,6 @@ metadata:
   name: mutating-webhook-configuration
 webhooks:
 - clientConfig:
-    caBundle: Cg==
     service:
       name: webhook-service
       namespace: system
@@ -26,7 +25,6 @@ webhooks:
     - proxydefaults
   sideEffects: None
 - clientConfig:
-    caBundle: Cg==
     service:
       name: webhook-service
       namespace: system
@@ -45,7 +43,6 @@ webhooks:
     - servicedefaults
   sideEffects: None
 - clientConfig:
-    caBundle: Cg==
     service:
       name: webhook-service
       namespace: system
@@ -64,7 +61,6 @@ webhooks:
     - serviceintentions
   sideEffects: None
 - clientConfig:
-    caBundle: Cg==
     service:
       name: webhook-service
       namespace: system
@@ -83,7 +79,6 @@ webhooks:
     - serviceresolvers
   sideEffects: None
 - clientConfig:
-    caBundle: Cg==
     service:
       name: webhook-service
       namespace: system
@@ -102,7 +97,6 @@ webhooks:
     - servicerouters
   sideEffects: None
 - clientConfig:
-    caBundle: Cg==
     service:
       name: webhook-service
       namespace: system

hack/crds-to-consul-helm/main.go

@@ -45,6 +45,10 @@ func realMain(helmPath string) error {
 		// Add {{- if .Values.controller.enabled }} {{- end }} wrapper.
 		contents = fmt.Sprintf("{{- if .Values.controller.enabled }}\n%s{{- end }}\n", contents)
 
+		// Hack: handle an issue where controller-gen generates the wrong type
+		// for the proxydefaults.config struct.
+		contents = strings.Replace(contents, proxyDefaultsSearch, proxyDefaultsReplace, 1)
+
 		// Add labels, this is hacky because we're relying on the line number
 		// but it means we don't need to regex or yaml parse.
 		splitOnNewlines := strings.Split(contents, "\n")
@@ -70,6 +74,14 @@ func realMain(helmPath string) error {
 	})
 }
 
+var proxyDefaultsSearch = `              description: Config is an arbitrary map of configuration values used by Connect proxies. Any values that your proxy allows can be configured globally here. Supports JSON config values. See https://www.consul.io/docs/connect/proxies/envoy#configuration-formatting
+              format: byte
+              type: string
+`
+var proxyDefaultsReplace = `              description: Config is an arbitrary map of configuration values used by Connect proxies. Any values that your proxy allows can be configured globally here. Supports JSON config values. See https://www.consul.io/docs/connect/proxies/envoy#configuration-formatting
+              type: object
+`
+
 func printf(format string, args ...interface{}) {
 	fmt.Println(fmt.Sprintf(format, args...))
 }