fixup! Consolidate configuration

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

Author: tmshort

Tiltfile

@@ -2,7 +2,7 @@ load('.tilt-support', 'deploy_repo')
 
 operator_controller = {
     'image': 'quay.io/operator-framework/operator-controller',
-    'yaml': 'config/overlays/tilt-local-dev',
+    'yaml': 'config/overlays/tilt-local-dev/operator-controller',
     'binaries': {
         './cmd/operator-controller': 'operator-controller-controller-manager',
     },
@@ -13,7 +13,7 @@ deploy_repo('operator-controller', operator_controller, '-tags containers_image_
 
 catalogd = {
     'image': 'quay.io/operator-framework/catalogd',
-    'yaml': 'catalogd/config/overlays/cert-manager',
+    'yaml': 'config/overlays/tilt-local-dev/catalogd',
     'binaries': {
         './catalogd/cmd/catalogd': 'catalogd-controller-manager',
     },

config/overlays/tilt-local-dev/kustomization.yaml renamed to config/overlays/tilt-local-dev/catalogd/kustomization.yaml

@@ -3,17 +3,15 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- ../../base/catalogd
-- ../../base/operator-controller
-- ../../base/common
+- ../../../base/catalogd
+- ../../../base/common
 components:
-- ../../components/tls/catalogd
-- ../../components/tls/operator-controller
+- ../../../components/tls/catalogd
 # ca must be last or other components will overwrite the namespaces
 - ../../components/tls/ca
 
 patches:
  - target:
       kind: Deployment
-      name: controller-manager
+      name: catalogd-controller-manager
    path: patches/dev-deployment.yaml

config/overlays/tilt-local-dev/patches/dev-deployment.yaml renamed to config/overlays/tilt-local-dev/catalogd/patches/dev-deployment.yaml

@@ -0,0 +1,17 @@
+# kustomization file for secure operator-controller
+# DO NOT ADD A NAMESPACE HERE
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- ../../../base/operator-controller
+- ../../../base/common
+components:
+- ../../../components/tls/operator-controller
+# ca must be last or other components will overwrite the namespaces
+- ../../components/tls/ca
+
+patches:
+ - target:
+      kind: Deployment
+      name: operator-controller-controller-manager
+   path: patches/dev-deployment.yaml

config/overlays/tilt-local-dev/operator-controller/kustomization.yaml

@@ -0,0 +1,13 @@
+# remove livenessProbe and readinessProbe so container doesn't restart during breakpoints
+- op: replace
+  path: /spec/template/spec/containers/0/livenessProbe
+  value: null
+- op: replace
+  path: /spec/template/spec/containers/0/readinessProbe
+  value: null
+- op: remove
+  # remove --leader-elect so container doesn't restart during breakpoints
+  path: /spec/template/spec/containers/0/args/2
+- op: add
+  path: /spec/template/spec/containers/0/args/-
+  value: --feature-gates=PreflightPermissions=true