From e25dea19f7f08ce00b36c329092b5c0c122aabd6 Mon Sep 17 00:00:00 2001
From: Birdrock <awittrock@gmail.com>
Date: Mon, 18 Jul 2022 16:12:06 -0700
Subject: [PATCH] Regenerate CRDs with controller-gen@v0.9.2

- CRD status fields are deleted in controller-gen >= v0.9.0
---
 deployment/helm/templates/core/lrp-crd.yml  | 12 +++++-------
 deployment/helm/templates/core/task-crd.yml | 12 +++++-------
 hack/run-code-generator.sh                  |  4 ++--
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/deployment/helm/templates/core/lrp-crd.yml b/deployment/helm/templates/core/lrp-crd.yml
index 8f338a03e..d8d9db987 100644
--- a/deployment/helm/templates/core/lrp-crd.yml
+++ b/deployment/helm/templates/core/lrp-crd.yml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.8.0
+    controller-gen.kubebuilder.io/version: v0.9.2
   creationTimestamp: null
   name: lrps.eirini.cloudfoundry.org
 spec:
@@ -107,6 +107,7 @@ spec:
                           required:
                           - key
                           type: object
+                          x-kubernetes-map-type: atomic
                         fieldRef:
                           description: 'Selects a field of the pod: supports metadata.name,
                             metadata.namespace, `metadata.labels[''<KEY>'']`, `metadata.annotations[''<KEY>'']`,
@@ -124,6 +125,7 @@ spec:
                           required:
                           - fieldPath
                           type: object
+                          x-kubernetes-map-type: atomic
                         resourceFieldRef:
                           description: 'Selects a resource of the container: only
                             resources limits and requests (limits.cpu, limits.memory,
@@ -148,6 +150,7 @@ spec:
                           required:
                           - resource
                           type: object
+                          x-kubernetes-map-type: atomic
                         secretKeyRef:
                           description: Selects a key of a secret in the pod's namespace
                           properties:
@@ -166,6 +169,7 @@ spec:
                           required:
                           - key
                           type: object
+                          x-kubernetes-map-type: atomic
                       type: object
                   required:
                   - name
@@ -266,9 +270,3 @@ spec:
     storage: true
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []
diff --git a/deployment/helm/templates/core/task-crd.yml b/deployment/helm/templates/core/task-crd.yml
index 7c7d02f48..c30ba6bef 100644
--- a/deployment/helm/templates/core/task-crd.yml
+++ b/deployment/helm/templates/core/task-crd.yml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.8.0
+    controller-gen.kubebuilder.io/version: v0.9.2
   creationTimestamp: null
   name: tasks.eirini.cloudfoundry.org
 spec:
@@ -104,6 +104,7 @@ spec:
                           required:
                           - key
                           type: object
+                          x-kubernetes-map-type: atomic
                         fieldRef:
                           description: 'Selects a field of the pod: supports metadata.name,
                             metadata.namespace, `metadata.labels[''<KEY>'']`, `metadata.annotations[''<KEY>'']`,
@@ -121,6 +122,7 @@ spec:
                           required:
                           - fieldPath
                           type: object
+                          x-kubernetes-map-type: atomic
                         resourceFieldRef:
                           description: 'Selects a resource of the container: only
                             resources limits and requests (limits.cpu, limits.memory,
@@ -145,6 +147,7 @@ spec:
                           required:
                           - resource
                           type: object
+                          x-kubernetes-map-type: atomic
                         secretKeyRef:
                           description: Selects a key of a secret in the pod's namespace
                           properties:
@@ -163,6 +166,7 @@ spec:
                           required:
                           - key
                           type: object
+                          x-kubernetes-map-type: atomic
                       type: object
                   required:
                   - name
@@ -271,9 +275,3 @@ spec:
     storage: true
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []
diff --git a/hack/run-code-generator.sh b/hack/run-code-generator.sh
index 2d6f7619b..661a41100 100755
--- a/hack/run-code-generator.sh
+++ b/hack/run-code-generator.sh
@@ -12,7 +12,7 @@ trap cleanup EXIT
 
 rm -rf "$EIRINI_CONTROLLER_ROOT/pkg/generated"
 
-go run sigs.k8s.io/controller-tools/cmd/controller-gen \
+go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.9.2 \
   object \
   object:headerFile="$EIRINI_CONTROLLER_ROOT/hack/boilerplate.go.txt" \
   paths="$EIRINI_CONTROLLER_ROOT/pkg/apis/eirini/v1"
@@ -32,7 +32,7 @@ cp -R "$EIRINI_CONTROLLER_ROOT"/code.cloudfoundry.org/eirini-controller/pkg/* "$
 
 EIRINI_TMP_CRD="$EIRINI_CONTROLLER_ROOT/code.cloudfoundry.org/crds"
 mkdir -p "$EIRINI_TMP_CRD"
-go run sigs.k8s.io/controller-tools/cmd/controller-gen \
+go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.9.2 \
   crd \
   output:dir="$EIRINI_TMP_CRD" \
   paths="$EIRINI_CONTROLLER_ROOT"/pkg/apis/...