UPSTREAM: <carry>: Update manifest generation for upstream rbac/webhooks

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

Author: tmshort

openshift/catalogd/kustomize/overlays/openshift-experimental/kustomization.yaml

@@ -1,5 +1,6 @@
 resources:
 - ../../../../../config/base/catalogd/crd/experimental
+- rbac
 - ../openshift/olmv1-ns
 - ../openshift/openshift-config
 - ../openshift/catalogs

openshift/catalogd/kustomize/overlays/openshift-experimental/rbac/kustomization.yaml

@@ -0,0 +1,6 @@
+namespace: OPENSHIFT-NAMESPACE
+resources:
+- ../../../../../../config/base/catalogd/rbac/experimental
+- ../../../../../../config/base/catalogd/webhook/experimental
+components:
+- ../../openshift/rbac/patches

openshift/catalogd/kustomize/overlays/openshift/kustomization.yaml

@@ -1,5 +1,6 @@
 resources:
 - ../../../../../config/base/catalogd/crd/standard
+- rbac
 - olmv1-ns
 - openshift-config
 - catalogs

openshift/catalogd/kustomize/overlays/openshift/olmv1-ns/kustomization.yaml

@@ -4,7 +4,6 @@ namespace: OPENSHIFT-NAMESPACE
 namePrefix: catalogd-
 
 resources:
-- ../../../../../../config/base/catalogd/rbac
 - ../../../../../../config/base/catalogd/manager
 - ../../../../../../config/base/common
 - metrics

openshift/catalogd/kustomize/overlays/openshift/olmv1-ns/patches/kustomization.yaml

@@ -8,14 +8,6 @@ patches:
     kind: Service
     name: service
   path: manager_service.yaml
-- target:
-    kind: MutatingWebhookConfiguration
-    name: mutating-webhook-configuration
-  path: mutating_webhook_config.yaml
-- target:
-    kind: ClusterRole
-    name: manager-role
-  path: manager_role.yaml
 - target:
     kind: Deployment
     name: controller-manager

openshift/catalogd/kustomize/overlays/openshift/rbac/kustomization.yaml

@@ -0,0 +1,6 @@
+namespace: OPENSHIFT-NAMESPACE
+resources:
+- ../../../../../../config/base/catalogd/rbac/standard
+- ../../../../../../config/base/catalogd/webhook/standard
+components:
+- patches

openshift/catalogd/kustomize/overlays/openshift/rbac/patches/kustomization.yaml

@@ -0,0 +1,11 @@
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+patches:
+- target:
+    kind: ClusterRole
+    name: manager-role
+  path: manager_role.yaml
+- target:
+    kind: MutatingWebhookConfiguration
+    name: mutating-webhook-configuration
+  path: mutating_webhook_config.yaml

openshift/catalogd/kustomize/overlays/openshift/olmv1-ns/patches/manager_role.yaml renamed to openshift/catalogd/kustomize/overlays/openshift/rbac/patches/manager_role.yaml

@@ -5,5 +5,5 @@ metadata:
   labels:
     app.kubernetes.io/name: catalogd
     app.kubernetes.io/part-of: olm
-  name: catalogd-catalogd-controller-manager
+  name: catalogd-controller-manager
   namespace: openshift-catalogd