WIP: some cleanup

Signed-off-by: Todd Short <[email protected]>

Author: tmshort

Makefile

@@ -147,13 +147,6 @@ KUSTOMIZE_OPCON_RBAC_DIR := helm/olmv1/base/operator-controller/rbac
 # Due to https://github.com/kubernetes-sigs/controller-tools/issues/837 we can't specify individual files
 # So we have to generate them together and then move them into place
 manifests: $(CONTROLLER_GEN) $(KUSTOMIZE) #EXHELP Generate WebhookConfiguration, ClusterRole, and CustomResourceDefinition objects.
-	mkdir -p helm/olmv1/base/catalogd/rbac
-	mkdir -p helm/olmv1/base/catalogd/crd/standard
-	mkdir -p helm/olmv1/base/catalogd/crd/experimental
-	mkdir -p helm/olmv1/base/catalogd/webhook
-	mkdir -p helm/olmv1/base/operator-controller/rbac
-	mkdir -p helm/olmv1/base/operator-controller/crd/standard
-	mkdir -p helm/olmv1/base/operator-controller/crd/experimental
 	# Generate CRDs via our own generator
 	hack/tools/update-crds.sh
 	# Generate the remaining operator-controller standard manifests

manifests/experimental-e2e.yaml

@@ -1325,7 +1325,7 @@ metadata:
   annotations:
     olm.operatorframework.io/feature-set: experimental-e2e
   labels:
-    app.kubernetes.io/name: operator-controller06
+    app.kubernetes.io/name: operator-controller
     helm.sh/chart: olmv1-0.1.0
     app.kubernetes.io/instance: olmv1
     app.kubernetes.io/version: "1.3.0"

manifests/experimental.yaml

@@ -1282,7 +1282,7 @@ metadata:
   annotations:
     olm.operatorframework.io/feature-set: experimental
   labels:
-    app.kubernetes.io/name: operator-controller06
+    app.kubernetes.io/name: operator-controller
     helm.sh/chart: olmv1-0.1.0
     app.kubernetes.io/instance: olmv1
     app.kubernetes.io/version: "1.3.0"

manifests/standard-e2e.yaml

@@ -1325,7 +1325,7 @@ metadata:
   annotations:
     olm.operatorframework.io/feature-set: standard-e2e
   labels:
-    app.kubernetes.io/name: operator-controller06
+    app.kubernetes.io/name: operator-controller
     helm.sh/chart: olmv1-0.1.0
     app.kubernetes.io/instance: olmv1
     app.kubernetes.io/version: "1.3.0"

manifests/standard.yaml

@@ -1282,7 +1282,7 @@ metadata:
   annotations:
     olm.operatorframework.io/feature-set: standard
   labels:
-    app.kubernetes.io/name: operator-controller06
+    app.kubernetes.io/name: operator-controller
     helm.sh/chart: olmv1-0.1.0
     app.kubernetes.io/instance: olmv1
     app.kubernetes.io/version: "1.3.0"