redhat-appstudio · ab-ghosh · May 27, 2025 · May 27, 2025 · May 27, 2025 · May 27, 2025
diff --git a/.../base/all-clusters/infra-deployments/cost-management/costmanagement-metrics-operator.yaml b/.../base/all-clusters/infra-deployments/cost-management/costmanagement-metrics-operator.yaml
@@ -37,6 +37,8 @@ spec:
                   values.clusterDir: stone-prd-rh01
                 - nameNormalized: stone-prd-rh02
                   values.clusterDir: stone-prd-rh02
+                - nameNormalized: kflux-prd-rh03
+                  values.clusterDir: kflux-prd-rh03
   template:
     metadata:
       name: cost-management-{{nameNormalized}}

diff --git a/...l-clusters/infra-deployments/monitoring-workload-logging/monitoring-workload-logging.yaml b/...l-clusters/infra-deployments/monitoring-workload-logging/monitoring-workload-logging.yaml
@@ -31,6 +31,8 @@ spec:
                   values.clusterDir: kflux-prd-rh02
                 - nameNormalized: kflux-prd-rh03
                   values.clusterDir: kflux-prd-rh03
+                - nameNormalized: kflux-rhel-p01
+                  values.clusterDir: kflux-rhel-p01
   template:
     metadata:
       name: monitoring-workload-logging-{{nameNormalized}}
@@ -48,7 +50,7 @@ spec:
           prune: true
           selfHeal: true
         syncOptions:
-        - CreateNamespace=true
+          - CreateNamespace=true
         retry:
           limit: 50
           backoff:

diff --git a/...ters/infra-deployments/monitoring-workload-prometheus/monitoring-workload-prometheus.yaml b/...ters/infra-deployments/monitoring-workload-prometheus/monitoring-workload-prometheus.yaml
@@ -23,8 +23,6 @@ spec:
                   values.clusterDir: stone-stg-rh01
                 - nameNormalized: stone-prd-host1
                   values.clusterDir: stone-prd-host1
-                - nameNormalized: stone-prd-m01
-                  values.clusterDir: stone-prd-m01
                 - nameNormalized: stone-prd-rh01
                   values.clusterDir: stone-prd-rh01
                 - nameNormalized: stone-stage-p01
@@ -41,6 +39,8 @@ spec:
                   values.clusterDir: kflux-stg-es01
                 - nameNormalized: kflux-prd-es01
                   values.clusterDir: kflux-prd-es01
+                - nameNormalized: kflux-rhel-p01
+                  values.clusterDir: kflux-rhel-p01
   template:
     metadata:
       name: monitoring-workload-prometheus-{{nameNormalized}}
@@ -58,7 +58,7 @@ spec:
           prune: true
           selfHeal: true
         syncOptions:
-        - CreateNamespace=true
+          - CreateNamespace=true
         retry:
           limit: 50
           backoff:

diff --git a/argo-cd-apps/base/cluster-secret-store-rh/cluster-secret-store-rh.yaml b/argo-cd-apps/base/cluster-secret-store-rh/cluster-secret-store-rh.yaml
@@ -12,12 +12,14 @@ spec:
               values:
                 sourceRoot: components/cluster-secret-store-rh
                 environment: staging
-                clusterDir: ""
+                clusterDir: "base"
               selector:
                 matchLabels:
                   appstudio.redhat.com/rh-member-cluster: 'true'
           - list:
-              elements: []
+              elements:
+                - nameNormalized: stone-prd-rh01
+                  values.clusterDir: stone-prd-rh01
   template:
     metadata:
       name: cluster-secret-store-rh-{{nameNormalized}}

diff --git a/argo-cd-apps/base/member/infra-deployments/build-service/build-service.yaml b/argo-cd-apps/base/member/infra-deployments/build-service/build-service.yaml
@@ -27,6 +27,8 @@ spec:
                   values.clusterDir: kflux-prd-rh02
                 - nameNormalized: kflux-prd-rh03
                   values.clusterDir: kflux-prd-rh03
+                - nameNormalized: kflux-rhel-p01
+                  values.clusterDir: kflux-rhel-p01
   template:
     metadata:
       name: build-service-{{nameNormalized}}
@@ -40,11 +42,11 @@ spec:
         namespace: default
         server: '{{server}}'
       syncPolicy:
-        automated: 
+        automated:
           prune: true
           selfHeal: true
         syncOptions:
-        - CreateNamespace=true
+          - CreateNamespace=true
         retry:
           limit: -1
           backoff:

diff --git a/argo-cd-apps/base/member/infra-deployments/cert-manager/cert-manager.yaml b/argo-cd-apps/base/member/infra-deployments/cert-manager/cert-manager.yaml
@@ -0,0 +1,60 @@
+apiVersion: argoproj.io/v1alpha1
+kind: ApplicationSet
+metadata:
+  name: cert-manager
+spec:
+  generators:
+    - merge:
+        mergeKeys:
+          - nameNormalized
+        generators:
+          - clusters:
+              values:
+                sourceRoot: components/cert-manager
+                environment: staging
+                # This app must have cluster specific configurations.
+                # empty-base is an overlay that just has the namespace resource.
+                # This allows to gradually deploy the new UI to all the clusters.
+                clusterDir: empty-base
+          - list:
+              elements:
+                - nameNormalized: stone-stg-rh01
+                  values.clusterDir: stone-stg-rh01
+                - nameNormalized: stone-stage-p01
+                  values.clusterDir: stone-stage-p01
+                - nameNormalized: stone-prd-rh01
+                  values.clusterDir: stone-prd-rh01
+                - nameNormalized: kflux-prd-rh02
+                  values.clusterDir: kflux-prd-rh02
+                - nameNormalized: stone-prod-p01
+                  values.clusterDir: stone-prod-p01
+                - nameNormalized: stone-prod-p02
+                  values.clusterDir: stone-prod-p02
+                - nameNormalized: kflux-ocp-p01
+                  values.clusterDir: kflux-ocp-p01
+                - nameNormalized: kflux-prd-rh03
+                  values.clusterDir: kflux-prd-rh03
+  template:
+    metadata:
+      name: cert-manager-{{nameNormalized}}
+    spec:
+      project: default
+      source:
+        path: '{{values.sourceRoot}}/{{values.environment}}/{{values.clusterDir}}'
+        repoURL: https://github.com/redhat-appstudio/infra-deployments.git
+        targetRevision: main
+      destination:
+        namespace: cert-manager-operator
+        server: '{{server}}'
+      syncPolicy:
+        automated:
+          prune: true
+          selfHeal: false
+        syncOptions:
+          - CreateNamespace=true
+        retry:
+          limit: -1
+          backoff:
+            duration: 10s
+            factor: 2
+            maxDuration: 3m
diff --git a/argo-cd-apps/base/member/infra-deployments/cert-manager/kustomization.yaml b/argo-cd-apps/base/member/infra-deployments/cert-manager/kustomization.yaml
@@ -0,0 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- cert-manager.yaml
+components:
+  - ../../../../k-components/deploy-to-member-cluster-merge-generator
diff --git a/argo-cd-apps/base/member/infra-deployments/etcd-shield/etcd-shield.yaml b/argo-cd-apps/base/member/infra-deployments/etcd-shield/etcd-shield.yaml
@@ -30,6 +30,8 @@ spec:
                   values.clusterDir: stone-prod-p01
                 - nameNormalized: stone-prod-p02
                   values.clusterDir: stone-prod-p02
+                - nameNormalized: kflux-rhel-p01
+                  values.clusterDir: kflux-rhel-p01
   template:
     metadata:
       name: etcd-shield-{{nameNormalized}}

diff --git a/argo-cd-apps/base/member/infra-deployments/integration/integration.yaml b/argo-cd-apps/base/member/infra-deployments/integration/integration.yaml
@@ -27,6 +27,8 @@ spec:
                   values.clusterDir: kflux-prd-rh02
                 - nameNormalized: kflux-prd-rh03
                   values.clusterDir: kflux-prd-rh03
+                - nameNormalized: kflux-rhel-p01
+                  values.clusterDir: kflux-rhel-p01
   template:
     metadata:
       name: integration-{{nameNormalized}}
@@ -40,11 +42,11 @@ spec:
         namespace: integration-service
         server: '{{server}}'
       syncPolicy:
-        automated: 
+        automated:
           prune: true
           selfHeal: true
         syncOptions:
-        - CreateNamespace=true
+          - CreateNamespace=true
         retry:
           limit: 50
           backoff:

diff --git a/argo-cd-apps/base/member/infra-deployments/knative-eventing/knative-eventing.yaml b/argo-cd-apps/base/member/infra-deployments/knative-eventing/knative-eventing.yaml
@@ -28,8 +28,6 @@ spec:
                 - nameNormalized: stone-prod-p02
                   values.clusterDir: stone-prod-p02
                 # Public
-                - nameNormalized: stone-prd-m01
-                  values.clusterDir: stone-prd-m01
                 - nameNormalized: stone-prd-rh01
                   values.clusterDir: stone-prd-rh01
                 - nameNormalized: kflux-prd-rh02

diff --git a/argo-cd-apps/base/member/infra-deployments/konflux-info/konflux-info.yaml b/argo-cd-apps/base/member/infra-deployments/konflux-info/konflux-info.yaml
@@ -20,8 +20,6 @@ spec:
                   values.clusterDir: kflux-ocp-p01
                 - nameNormalized: stone-stg-rh01
                   values.clusterDir: stone-stg-rh01
-                - nameNormalized: stone-prd-m01
-                  values.clusterDir: stone-prd-m01
                 - nameNormalized: stone-prd-rh01
                   values.clusterDir: stone-prd-rh01
                 - nameNormalized: stone-stage-p01
@@ -34,6 +32,8 @@ spec:
                   values.clusterDir: kflux-prd-rh02
                 - nameNormalized: kflux-prd-rh03
                   values.clusterDir: kflux-prd-rh03
+                - nameNormalized: kflux-rhel-p01
+                  values.clusterDir: kflux-rhel-p01
   template:
     metadata:
       name: konflux-info-{{nameNormalized}}

diff --git a/argo-cd-apps/base/member/infra-deployments/konflux-rbac/konflux-rbac.yaml b/argo-cd-apps/base/member/infra-deployments/konflux-rbac/konflux-rbac.yaml
@@ -33,6 +33,8 @@ spec:
                   values.clusterDir: kflux-prd-rh02
                 - nameNormalized: kflux-prd-rh03
                   values.clusterDir: kflux-prd-rh03
+                - nameNormalized: kflux-rhel-p01
+                  values.clusterDir: kflux-rhel-p01
   template:
     metadata:
       name: konflux-rbac-{{nameNormalized}}

diff --git a/argo-cd-apps/base/member/infra-deployments/konflux-ui/konflux-ui.yaml b/argo-cd-apps/base/member/infra-deployments/konflux-ui/konflux-ui.yaml
@@ -34,6 +34,8 @@ spec:
                   values.clusterDir: kflux-ocp-p01
                 - nameNormalized: kflux-prd-rh03
                   values.clusterDir: kflux-prd-rh03
+                - nameNormalized: kflux-rhel-p01
+                  values.clusterDir: kflux-rhel-p01
   template:
     metadata:
       name: konflux-ui-{{nameNormalized}}

diff --git a/argo-cd-apps/base/member/infra-deployments/kubearchive/kubearchive.yaml b/argo-cd-apps/base/member/infra-deployments/kubearchive/kubearchive.yaml
@@ -15,27 +15,54 @@ spec:
                 environment: staging
                 clusterDir: ""
           - list:
-              elements: []
+              elements:
+                # - nameNormalized: stone-stage-p01
+                #   values.clusterDir: stone-stage-p01
+                - nameNormalized: stone-stg-rh01
+                  values.clusterDir: stone-stg-rh01
+                # Private
+                # - nameNormalized: kflux-ocp-p01
+                #   values.clusterDir: kflux-ocp-p01
+                # - nameNormalized: stone-prod-p01
+                #   values.clusterDir: stone-prod-p01
+                - nameNormalized: stone-prod-p02
+                  values.clusterDir: stone-prod-p02
+                # Public
+                # - nameNormalized: stone-prd-rh01
+                #   values.clusterDir: stone-prd-rh01
+                # - nameNormalized: kflux-prd-rh02
+                #   values.clusterDir: kflux-prd-rh02
+                # database is not created here yet
+                # - nameNormalized: kflux-prd-rh03
+                #   values.clusterDir: kflux-prd-rh03
   template:
     metadata:
       name: kubearchive-{{nameNormalized}}
     spec:
+      ignoreDifferences:
+        # ignore CRB that gets modified by KubeArchive
+        - kind: ClusterRoleBinding
+          group: rbac.authorization.k8s.io
+          name: clusterkubearchiveconfig-read
+          jsonPointers:
+            - /subjects
       project: default
       source:
-        path: '{{values.sourceRoot}}/{{values.environment}}/{{values.clusterDir}}'
+        path: "{{values.sourceRoot}}/{{values.environment}}/{{values.clusterDir}}"
         repoURL: https://github.com/redhat-appstudio/infra-deployments.git
         targetRevision: main
       destination:
         # This is the default namespace if resources or kustomziation.yaml do
         # not specifcy namespace
         namespace: product-kubearchive
-        server: '{{server}}'
+        server: "{{server}}"
       syncPolicy:
         automated:
           prune: true
           selfHeal: true
         syncOptions:
           - CreateNamespace=true
+          - SkipDryRunOnMissingResource=true
         retry:
           limit: 50
           backoff:

diff --git a/argo-cd-apps/base/member/infra-deployments/kueue/kueue.yaml b/argo-cd-apps/base/member/infra-deployments/kueue/kueue.yaml
@@ -0,0 +1,59 @@
+apiVersion: argoproj.io/v1alpha1
+kind: ApplicationSet
+metadata:
+  name: kueue
+spec:
+  generators:
+    - merge:
+        mergeKeys:
+          - nameNormalized
+        generators:
+          - clusters:
+              values:
+                sourceRoot: components/kueue
+                environment: staging
+                # This app must have cluster specific configurations.
+                # empty-base is an overlay that just has the namespace resource.
+                # This allows to gradually deploy to all the clusters.
+                clusterDir: empty-base
+          - list:
+              elements:
+                - nameNormalized: stone-stg-rh01
+                  values.clusterDir: stone-stg-rh01
+                - nameNormalized: stone-stage-p01
+                  values.clusterDir: stone-stage-p01
+                - nameNormalized: stone-prd-rh01
+                  values.clusterDir: stone-prd-rh01
+                - nameNormalized: kflux-prd-rh02
+                  values.clusterDir: kflux-prd-rh02
+                - nameNormalized: stone-prod-p01
+                  values.clusterDir: stone-prod-p01
+                - nameNormalized: stone-prod-p02
+                  values.clusterDir: stone-prod-p02
+                - nameNormalized: kflux-ocp-p01
+                  values.clusterDir: kflux-ocp-p01
+                - nameNormalized: kflux-prd-rh03
+                  values.clusterDir: kflux-prd-rh03
+  template:
+    metadata:
+      name: kueue-{{nameNormalized}}
+    spec:
+      project: default
+      source:
+        path: '{{values.sourceRoot}}/{{values.environment}}/{{values.clusterDir}}'
+        repoURL: https://github.com/redhat-appstudio/infra-deployments.git
+        targetRevision: main
+      destination:
+        server: '{{server}}'
+      syncPolicy:
+        automated:
+          prune: true
+          selfHeal: false
+        syncOptions:
+          - CreateNamespace=false
+        retry:
+          limit: -1
+          backoff:
+            duration: 10s
+            factor: 2
+            maxDuration: 3m
diff --git a/argo-cd-apps/base/member/infra-deployments/kueue/kustomization.yaml b/argo-cd-apps/base/member/infra-deployments/kueue/kustomization.yaml
@@ -0,0 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- kueue.yaml
+components:
+  - ../../../../k-components/deploy-to-member-cluster-merge-generator
diff --git a/argo-cd-apps/base/member/infra-deployments/kustomization.yaml b/argo-cd-apps/base/member/infra-deployments/kustomization.yaml
@@ -33,5 +33,9 @@ resources:
   - vector-tekton-logs-collector
   - kyverno
   - namespace-lister
+  - pulp-access-controller
+  - cert-manager
+  - kueue
+  - policies
 components:
   - ../../../k-components/inject-infra-deployments-repo-details
diff --git a/argo-cd-apps/base/member/infra-deployments/kyverno/kyverno.yaml b/argo-cd-apps/base/member/infra-deployments/kyverno/kyverno.yaml
@@ -31,6 +31,8 @@ spec:
                   values.clusterDir: kflux-ocp-p01
                 - nameNormalized: kflux-prd-rh03
                   values.clusterDir: kflux-prd-rh03
+                - nameNormalized: kflux-rhel-p01
+                  values.clusterDir: kflux-rhel-p01
   template:
     metadata:
       name: kyverno-{{nameNormalized}}