Remove crd patch hack

- new controller-gen now adds default values to ports
the hack is no longer needed

Author: ChunyiLyu

Makefile

@@ -21,10 +21,6 @@ manifests: install-tools ## Generate manifests e.g. CRD, RBAC etc.
 	controller-gen $(CRD_OPTIONS) rbac:roleName=operator-role paths="./api/...;./controllers/..." output:crd:artifacts:config=config/crd/bases
 	./hack/remove-override-descriptions.sh
 	./hack/add-notice-to-yaml.sh config/rbac/role.yaml
-# this is temporary workaround due to issue https://github.com/kubernetes/kubernetes/issues/91395
-# the hack ensures that "protocal" is a required value where this field is listed as x-kubernetes-list-map-keys
-# without the hack, our crd doesn't install on k8s 1.18 because of the issue above
-	./hack/patch-crd.sh
 	./hack/add-notice-to-yaml.sh config/crd/bases/rabbitmq.com_rabbitmqclusters.yaml
 
 # Run go fmt against code

config/crd/bases/rabbitmq.com_rabbitmqclusters.yaml

@@ -10,7 +10,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.4.0
+    controller-gen.kubebuilder.io/version: v0.4.1
   creationTimestamp: null
   name: rabbitmqclusters.rabbitmq.com
 spec:
@@ -713,6 +713,7 @@ spec:
                                   format: int32
                                   type: integer
                                 protocol:
+                                  default: TCP
                                   type: string
                                 targetPort:
                                   anyOf:
@@ -1364,6 +1365,7 @@ spec:
                                               name:
                                                 type: string
                                               protocol:
+                                                default: TCP
                                                 type: string
                                             required:
                                             - containerPort
@@ -1925,6 +1927,7 @@ spec:
                                               name:
                                                 type: string
                                               protocol:
+                                                default: TCP
                                                 type: string
                                             required:
                                             - containerPort
@@ -2485,6 +2488,7 @@ spec:
                                               name:
                                                 type: string
                                               protocol:
+                                                default: TCP
                                                 type: string
                                             required:
                                             - containerPort