modifying core kustomization overlays

Kustomization overlays have been restructured to be compatable with the opfcli onboard command. This will produce, small and isolated diffs when onboarding with the opfcli rather than large ones that compete based on formatting rules.

Author: Gregory-Pereira

cluster-scope/overlays/prod/common/kustomization.yaml

@@ -1,75 +1,75 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
+apiVersion: kustomize.config.k8s.io/v1beta1
 resources:
-- ../../../base/config.openshift.io/projects/cluster
-- ../../../base/rbac.authorization.k8s.io/clusterrolebindings/cluster-admins-rb
-- ../../../base/rbac.authorization.k8s.io/clusterrolebindings/self-provisioners
-- ../../../base/rbac.authorization.k8s.io/clusterrolebindings/sre
-- ../../../base/rbac.authorization.k8s.io/clusterroles/events-aggregate-to-edit
-- ../../../base/user.openshift.io/groups/adoptium
-- ../../../base/user.openshift.io/groups/ai-services
-- ../../../base/user.openshift.io/groups/apicurio
-- ../../../base/user.openshift.io/groups/argocd-admins
-- ../../../base/user.openshift.io/groups/argocd-readonly
-- ../../../base/user.openshift.io/groups/b4mad
-- ../../../base/user.openshift.io/groups/boatroackers
-- ../../../base/user.openshift.io/groups/boston-university-redhat
-- ../../../base/user.openshift.io/groups/ccx
-- ../../../base/user.openshift.io/groups/chi-rhug
-- ../../../base/user.openshift.io/groups/cnv-testing
-- ../../../base/user.openshift.io/groups/codait-advo
-- ../../../base/user.openshift.io/groups/curator
-- ../../../base/user.openshift.io/groups/data-science
-- ../../../base/user.openshift.io/groups/debezium
-- ../../../base/user.openshift.io/groups/emea-sa
-- ../../../base/user.openshift.io/groups/enterprise-neurosystem
-- ../../../base/user.openshift.io/groups/esi-project
-- ../../../base/user.openshift.io/groups/fde
-- ../../../base/user.openshift.io/groups/fedora
-- ../../../base/user.openshift.io/groups/fybrik
-- ../../../base/user.openshift.io/groups/grafana-viewer
-- ../../../base/user.openshift.io/groups/lab-cicd
-- ../../../base/user.openshift.io/groups/logs-insights
-- ../../../base/user.openshift.io/groups/manageiq
-- ../../../base/user.openshift.io/groups/multinode-demo
-- ../../../base/user.openshift.io/groups/mwperf
-- ../../../base/user.openshift.io/groups/neu-students
-- ../../../base/user.openshift.io/groups/ocp-pipelines-sre
-- ../../../base/user.openshift.io/groups/octo-otel-dev
-- ../../../base/user.openshift.io/groups/octo-training-model
-- ../../../base/user.openshift.io/groups/octo-ushift-dev
-- ../../../base/user.openshift.io/groups/odh-admin
-- ../../../base/user.openshift.io/groups/open-aiops
-- ../../../base/user.openshift.io/groups/operate-first
-- ../../../base/user.openshift.io/groups/opf-alerting
-- ../../../base/user.openshift.io/groups/osc
-- ../../../base/user.openshift.io/groups/osc-admins
-- ../../../base/user.openshift.io/groups/peribolos-as-a-service
-- ../../../base/user.openshift.io/groups/prometheus-ai
-- ../../../base/user.openshift.io/groups/prometheus-anomaly-detector
-- ../../../base/user.openshift.io/groups/psse-research
-- ../../../base/user.openshift.io/groups/pulp
-- ../../../base/user.openshift.io/groups/quarkus
-- ../../../base/user.openshift.io/groups/ray
-- ../../../base/user.openshift.io/groups/redhat-cto-team
-- ../../../base/user.openshift.io/groups/redhat-impact
-- ../../../base/user.openshift.io/groups/rekor
-- ../../../base/user.openshift.io/groups/rh-curator-eval
-- ../../../base/user.openshift.io/groups/rh-dus
-- ../../../base/user.openshift.io/groups/sa-dach
-- ../../../base/user.openshift.io/groups/scsaol
-- ../../../base/user.openshift.io/groups/sdap-mslsp
-- ../../../base/user.openshift.io/groups/seraph
-- ../../../base/user.openshift.io/groups/sigstore
-- ../../../base/user.openshift.io/groups/sostrades
-- ../../../base/user.openshift.io/groups/sre
-- ../../../base/user.openshift.io/groups/superset-user
-- ../../../base/user.openshift.io/groups/team-pixel
-- ../../../base/user.openshift.io/groups/thoth
-- ../../../base/user.openshift.io/groups/thoth-devops
-- ../../../base/user.openshift.io/groups/tremor-demo
-- ../../../base/user.openshift.io/groups/uky-redhat
-- ../../../base/user.openshift.io/groups/varangian
-- ../../../base/user.openshift.io/groups/workshops
-- ../../../bundles/opf-monitoring
-- alertmanager-main-secret.yaml
+    - ../../../base/config.openshift.io/projects/cluster
+    - ../../../base/rbac.authorization.k8s.io/clusterrolebindings/cluster-admins-rb
+    - ../../../base/rbac.authorization.k8s.io/clusterrolebindings/self-provisioners
+    - ../../../base/rbac.authorization.k8s.io/clusterrolebindings/sre
+    - ../../../base/rbac.authorization.k8s.io/clusterroles/events-aggregate-to-edit
+    - ../../../base/user.openshift.io/groups/adoptium
+    - ../../../base/user.openshift.io/groups/ai-services
+    - ../../../base/user.openshift.io/groups/apicurio
+    - ../../../base/user.openshift.io/groups/argocd-admins
+    - ../../../base/user.openshift.io/groups/argocd-readonly
+    - ../../../base/user.openshift.io/groups/b4mad
+    - ../../../base/user.openshift.io/groups/boatroackers
+    - ../../../base/user.openshift.io/groups/boston-university-redhat
+    - ../../../base/user.openshift.io/groups/ccx
+    - ../../../base/user.openshift.io/groups/chi-rhug
+    - ../../../base/user.openshift.io/groups/cnv-testing
+    - ../../../base/user.openshift.io/groups/codait-advo
+    - ../../../base/user.openshift.io/groups/curator
+    - ../../../base/user.openshift.io/groups/data-science
+    - ../../../base/user.openshift.io/groups/debezium
+    - ../../../base/user.openshift.io/groups/emea-sa
+    - ../../../base/user.openshift.io/groups/enterprise-neurosystem
+    - ../../../base/user.openshift.io/groups/esi-project
+    - ../../../base/user.openshift.io/groups/fde
+    - ../../../base/user.openshift.io/groups/fedora
+    - ../../../base/user.openshift.io/groups/fybrik
+    - ../../../base/user.openshift.io/groups/grafana-viewer
+    - ../../../base/user.openshift.io/groups/lab-cicd
+    - ../../../base/user.openshift.io/groups/logs-insights
+    - ../../../base/user.openshift.io/groups/manageiq
+    - ../../../base/user.openshift.io/groups/multinode-demo
+    - ../../../base/user.openshift.io/groups/mwperf
+    - ../../../base/user.openshift.io/groups/neu-students
+    - ../../../base/user.openshift.io/groups/ocp-pipelines-sre
+    - ../../../base/user.openshift.io/groups/octo-otel-dev
+    - ../../../base/user.openshift.io/groups/octo-training-model
+    - ../../../base/user.openshift.io/groups/octo-ushift-dev
+    - ../../../base/user.openshift.io/groups/odh-admin
+    - ../../../base/user.openshift.io/groups/open-aiops
+    - ../../../base/user.openshift.io/groups/operate-first
+    - ../../../base/user.openshift.io/groups/opf-alerting
+    - ../../../base/user.openshift.io/groups/osc
+    - ../../../base/user.openshift.io/groups/osc-admins
+    - ../../../base/user.openshift.io/groups/peribolos-as-a-service
+    - ../../../base/user.openshift.io/groups/prometheus-ai
+    - ../../../base/user.openshift.io/groups/prometheus-anomaly-detector
+    - ../../../base/user.openshift.io/groups/psse-research
+    - ../../../base/user.openshift.io/groups/pulp
+    - ../../../base/user.openshift.io/groups/quarkus
+    - ../../../base/user.openshift.io/groups/ray
+    - ../../../base/user.openshift.io/groups/redhat-cto-team
+    - ../../../base/user.openshift.io/groups/redhat-impact
+    - ../../../base/user.openshift.io/groups/rekor
+    - ../../../base/user.openshift.io/groups/rh-curator-eval
+    - ../../../base/user.openshift.io/groups/rh-dus
+    - ../../../base/user.openshift.io/groups/sa-dach
+    - ../../../base/user.openshift.io/groups/scsaol
+    - ../../../base/user.openshift.io/groups/sdap-mslsp
+    - ../../../base/user.openshift.io/groups/seraph
+    - ../../../base/user.openshift.io/groups/sigstore
+    - ../../../base/user.openshift.io/groups/sostrades
+    - ../../../base/user.openshift.io/groups/sre
+    - ../../../base/user.openshift.io/groups/superset-user
+    - ../../../base/user.openshift.io/groups/team-pixel
+    - ../../../base/user.openshift.io/groups/thoth
+    - ../../../base/user.openshift.io/groups/thoth-devops
+    - ../../../base/user.openshift.io/groups/tremor-demo
+    - ../../../base/user.openshift.io/groups/uky-redhat
+    - ../../../base/user.openshift.io/groups/varangian
+    - ../../../base/user.openshift.io/groups/workshops
+    - ../../../bundles/opf-monitoring
+    - alertmanager-main-secret.yaml

cluster-scope/overlays/prod/emea/balrog/kustomization.yaml

@@ -1,7 +1,25 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
+apiVersion: kustomize.config.k8s.io/v1beta1
+patchesStrategicMerge:
+    - oauths/cluster_patch.yaml
+    - groups/cluster-admins.yaml
+    - subscriptions/cluster-logging-operator_patch.yaml
+    - clusterautoscaler.yaml
+patches:
+    - patch: |-
+        - op: replace
+          path: /spec/hard
+          value:
+            limits.cpu: '16'
+            limits.memory: 32Gi
+            requests.cpu: '8'
+            requests.memory: 16Gi
+            requests.storage: 60Gi
+      target:
+          version: v1
+          kind: ResourceQuota
+          name: opf-kafka-custom
 resources:
-    - ../common
     - ../../../../base/apiextensions.k8s.io/customresourcedefinitions/workflow.argoproj.io
     - ../../../../base/apiextensions.k8s.io/customresourcedefinitions/workflowtemplate.argoproj.io
     - ../../../../base/autoscaling.openshift.io/clusterautoscalers/default
@@ -25,27 +43,7 @@ resources:
     - ../../../../base/rbac.authorization.k8s.io/clusterrolebindings/cluster-reader-k8s-annotations-exporter
     - ../../../../base/user.openshift.io/groups/cluster-admins
     - ../../../../bundles/acme-operator
+    - ../common
     - machineautoscalers.yaml
 generators:
     - secret-generator.yaml
-
-patchesStrategicMerge:
-    - oauths/cluster_patch.yaml
-    - groups/cluster-admins.yaml
-    - subscriptions/cluster-logging-operator_patch.yaml
-    - clusterautoscaler.yaml
-patches:
-    - patch: |-
-        - op: replace
-          path: /spec/hard
-          value:
-            limits.cpu: '16'
-            limits.memory: 32Gi
-            requests.cpu: '8'
-            requests.memory: 16Gi
-            requests.storage: 60Gi
-      target:
-          group: ""
-          version: v1
-          kind: ResourceQuota
-          name: opf-kafka-custom

cluster-scope/overlays/prod/emea/demo/kustomization.yaml

@@ -1,18 +1,15 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-
-resources:
-- ../common
-- ../../../../base/config.openshift.io/oauths/cluster
-- ../../../../base/user.openshift.io/groups/cluster-admins
-- ../../../../base/core/configmaps/cluster-monitoring-config
-- ../../../../base/core/namespaces/opf-alertreceiver
-- ../../../../base/operators.coreos.com/subscriptions/opendatahub-operator
-- ../../../../base/core/namespaces/demo-jupyterhub
-
+apiVersion: kustomize.config.k8s.io/v1beta1
 patchesStrategicMerge:
-- groups/cluster-admins.yaml
-- oauths/cluster_patch.yaml
-
+    - groups/cluster-admins.yaml
+    - oauths/cluster_patch.yaml
+resources:
+    - ../../../../base/config.openshift.io/oauths/cluster
+    - ../../../../base/core/configmaps/cluster-monitoring-config
+    - ../../../../base/core/namespaces/demo-jupyterhub
+    - ../../../../base/core/namespaces/opf-alertreceiver
+    - ../../../../base/operators.coreos.com/subscriptions/opendatahub-operator
+    - ../../../../base/user.openshift.io/groups/cluster-admins
+    - ../common
 generators:
-- secret-generator.yaml
+    - secret-generator.yaml

cluster-scope/overlays/prod/emea/morty/kustomization.yaml

@@ -1,54 +1,63 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-patchesJson6902:
-- patch: "- op: replace\n  path: /spec/startingCSV\n  value: cert-manager.v1.6.1\n"
-  target:
-    group: operators.coreos.com
-    kind: Subscription
-    name: cert-manager
-    version: v1alpha1
-- patch: "- op: add\n  path: /spec/storageClassName\n  value: ocs-storagecluster-cephfs\n"
-  target:
-    kind: PersistentVolumeClaim
-    name: image-registry-storage
-    version: v1
+apiVersion: kustomize.config.k8s.io/v1beta1
 patchesStrategicMerge:
-- groups/cluster-admins.yaml
-- groups/sudoers.yaml
-- subscriptions/local-storage-operator_patch.yaml
-- subscriptions/odf-operator_patch.yaml
-- subscriptions/kubevirt-hyperconverged_patch.yaml
-- subscriptions/nfd_patch.yaml
-- subscriptions/openshift-pipelines-operator-rh_patch.yaml
+    - groups/cluster-admins.yaml
+    - groups/sudoers.yaml
+    - oauths/cluster_patch.yaml
+    - subscriptions/local-storage-operator_patch.yaml
+    - subscriptions/odf-operator_patch.yaml
+    - subscriptions/kubevirt-hyperconverged_patch.yaml
+    - subscriptions/nfd_patch.yaml
+    - subscriptions/openshift-pipelines-operator-rh_patch.yaml
+patchesJson6902:
+    - patch: |
+        - op: replace
+          path: /spec/startingCSV
+          value: cert-manager.v1.6.1
+      target:
+          group: operators.coreos.com
+          version: v1alpha1
+          kind: Subscription
+          name: cert-manager
+    - patch: |
+        - op: add
+          path: /spec/storageClassName
+          value: ocs-storagecluster-cephfs
+      target:
+          version: v1
+          kind: PersistentVolumeClaim
+          name: image-registry-storage
 resources:
-- ../../../../base/core/configmaps/cluster-monitoring-config
-- ../../../../base/core/namespaces/examples-openshift-pub
-- ../../../../base/core/namespaces/keylime
-- ../../../../base/core/namespaces/openshift-cnv
-- ../../../../base/core/namespaces/openshift-local-storage
-- ../../../../base/core/namespaces/openshift-storage
-- ../../../../base/core/namespaces/opf-alertreceiver
-- ../../../../base/core/namespaces/pixel-demo
-- ../../../../base/core/namespaces/pixel-secrets
-- ../../../../base/core/namespaces/rbo-builder
-- ../../../../base/core/namespaces/smartoffice
-- ../../../../base/core/namespaces/summit-2022-octo-keynote
-- ../../../../base/core/namespaces/thoth-test-core
-- ../../../../base/core/persistentvolumeclaims/image-registry-storage
-- ../../../../base/imageregistry.operator.openshift.io/configs/cluster
-- ../../../../base/operators.coreos.com/operatorgroups/openshift-cnv-rn5jf
-- ../../../../base/operators.coreos.com/operatorgroups/openshift-local-storage
-- ../../../../base/operators.coreos.com/operatorgroups/openshift-storage
-- ../../../../base/operators.coreos.com/subscriptions/cert-manager
-- ../../../../base/operators.coreos.com/subscriptions/kubevirt-hyperconverged
-- ../../../../base/operators.coreos.com/subscriptions/odf-operator
-- ../../../../base/operators.coreos.com/subscriptions/openshift-local-storage-operator
-- ../../../../base/operators.coreos.com/subscriptions/openshift-pipelines-operator-rh
-- ../../../../base/rbac.authorization.k8s.io/clusterrolebindings/cluster-reader-k8s-annotations-exporter
-- ../../../../base/rbac.authorization.k8s.io/clusterrolebindings/sudoers
-- ../../../../base/user.openshift.io/groups/cluster-admins
-- ../../../../base/user.openshift.io/groups/sudoers
-- ../../../../bundles/nfd
-- ../common
-- apiserver/api_server_cert.yaml
-- ingresscontrollers/default.yaml
+    - ../../../../base/config.openshift.io/oauths/cluster
+    - ../../../../base/core/configmaps/cluster-monitoring-config
+    - ../../../../base/core/namespaces/examples-openshift-pub
+    - ../../../../base/core/namespaces/openshift-cnv
+    - ../../../../base/core/namespaces/openshift-local-storage
+    - ../../../../base/core/namespaces/openshift-storage
+    - ../../../../base/core/namespaces/opf-alertreceiver
+    - ../../../../base/core/namespaces/opf-monitoring
+    - ../../../../base/core/namespaces/pixel-demo
+    - ../../../../base/core/namespaces/pixel-secrets
+    - ../../../../base/core/namespaces/rbo-builder
+    - ../../../../base/core/namespaces/smartoffice
+    - ../../../../base/core/namespaces/thoth-test-core
+    - ../../../../base/core/persistentvolumeclaims/image-registry-storage
+    - ../../../../base/imageregistry.operator.openshift.io/configs/cluster
+    - ../../../../base/operators.coreos.com/operatorgroups/openshift-cnv-rn5jf
+    - ../../../../base/operators.coreos.com/operatorgroups/openshift-local-storage
+    - ../../../../base/operators.coreos.com/operatorgroups/openshift-storage
+    - ../../../../base/operators.coreos.com/subscriptions/cert-manager
+    - ../../../../base/operators.coreos.com/subscriptions/kubevirt-hyperconverged
+    - ../../../../base/operators.coreos.com/subscriptions/odf-operator
+    - ../../../../base/operators.coreos.com/subscriptions/openshift-local-storage-operator
+    - ../../../../base/operators.coreos.com/subscriptions/openshift-pipelines-operator-rh
+    - ../../../../base/rbac.authorization.k8s.io/clusterrolebindings/cluster-reader-k8s-annotations-exporter
+    - ../../../../base/rbac.authorization.k8s.io/clusterrolebindings/sudoers
+    - ../../../../base/user.openshift.io/groups/cluster-admins
+    - ../../../../base/user.openshift.io/groups/sudoers
+    - ../../../../bundles/nfd
+    - ../common
+    - apiserver/api_server_cert.yaml
+    - ingresscontrollers/default.yaml
+generators:
+    - secret-generator.yaml