Merge pull request #6 from OAharoni-RedHat/test-branch

move to versioned charts and config as code aap repo

Author: mhjacks

overrides/values-aap-config-rdr.yaml

@@ -1,4 +1,4 @@
 ---
 agof:
-  iac_repo: https://github.com/validatedpatterns-demos/agof_null_config.git
+  iac_repo: https://github.com/validatedpatterns-demos/ramendr-techdemo-config-as-code.git
   iac_revision: main

overrides/values-cluster-names.yaml

@@ -7,24 +7,24 @@
 clusterOverrides:
   primary:
     name: ocp-primary
-    version: 4.18.7
+    version: 4.22.1
     install_config:
       metadata:
         name: ocp-primary
       platform:
         aws:
-          region: us-west-1
+          region: ca-central-1
   secondary:
     name: ocp-secondary
-    version: 4.18.7
+    version: 4.22.1
     install_config:
       metadata:
         name: ocp-secondary
       platform:
         aws:
           region: us-east-1
 
-# DRPC overrides (preferredCluster defaults to primary if unset)
+# DRPC preferredCluster must be the ACM ManagedCluster name, not install_config.metadata.name.
 drpc:
   preferredCluster: ocp-primary
   protectedNamespaces:

overrides/values-egv-dr.yaml

@@ -12,7 +12,6 @@ vmDefaults:
   os: rhel9
   storage: 30Gi
   memory: 4Gi
-  machineType: pc-q35-rhel8.4.0
   cores: 1
   sockets: 1
   threads: 1

values-hub.yaml

@@ -3,17 +3,21 @@ clusterGroup:
   name: hub
   isHubCluster: true
   namespaces:
-    - open-cluster-management
-    - open-cluster-management-observability
-    - vault
-    - golang-external-secrets
-    - regional-dr
-    - openshift-dr-system
-    - openshift-dr-ops
-    - openshift-storage
-    - policies
-    - aap-config
-    - ansible-automation-platform
+    open-cluster-management: {}
+    open-cluster-management-observability: {}
+    vault: {}
+    regional-dr: {}
+    openshift-dr-system: {}
+    openshift-dr-ops: {}
+    openshift-storage: {}
+    policies: {}
+    aap-config: {}
+    ansible-automation-platform: {}
+    external-secrets-operator:
+      operatorGroup: true
+      targetNamespaces: []
+    cluster-ca-mgt: {}
+
   subscriptions:
     aap-operator:
       name: ansible-automation-platform-operator
@@ -23,7 +27,12 @@ clusterGroup:
     acm:
       name: advanced-cluster-management
       namespace: open-cluster-management
-      channel: release-2.15
+      channel: release-2.17
+
+    eso:
+      name: openshift-external-secrets-operator
+      namespace: external-secrets-operator
+      channel: stable-v1
 
     odf-multicluster-orchestrator:
       name: odf-multicluster-orchestrator
@@ -36,7 +45,7 @@ clusterGroup:
   argoCD:
     resourceTrackingMethod: annotation
 
-  projects:
+  argoProjects:
     - hub
     - opp
   # Explicitly mention the cluster-state based overrides we plan to use for this pattern.
@@ -63,14 +72,14 @@ clusterGroup:
     aap:
       name: ansible-automation-platform
       namespace: ansible-automation-platform
-      project: hub
+      argoProject: hub
       chart: ansible-automation-platform-instance
       chartVersion: 0.1.*
 
     aap-config:
       name: aap-config
       namespace: aap-config
-      project: hub
+      argoProject: hub
       chart: aap-config
       chartVersion: 0.2.*
       extraValueFiles:
@@ -79,17 +88,17 @@ clusterGroup:
     acm:
       name: acm
       namespace: open-cluster-management
-      project: hub
+      argoProject: hub
       chart: acm
-      chartVersion: 0.1.*
+      chartVersion: 0.2.*
       ignoreDifferences:
         - group: internal.open-cluster-management.io
           kind: ManagedClusterInfo
 
     ensure-openshift-console-plugins:
       name: ensure-openshift-console-plugins
       namespace: openshift-console
-      project: opp
+      argoProject: opp
       chart: ensure-openshift-console-plugins
       chartVersion: 0.1.*
       extraValueFiles:
@@ -98,10 +107,9 @@ clusterGroup:
     opp-policy:
       name: opp-policy
       namespace: openshift
-      project: opp
-      repoURL: https://github.com/validatedpatterns/opp-policy-chart.git
-      chartVersion: main
-      path: "."
+      argoProject: opp
+      chart: opp-policy-chart
+      chartVersion: 0.0.*      
       annotations:
         argocd.argoproj.io/sync-wave: "5"
       syncPolicy:
@@ -129,10 +137,9 @@ clusterGroup:
     rdr:
       name: regional-dr
       namespace: regional-dr
-      project: opp
-      repoURL: https://github.com/validatedpatterns/regionaldr-with-virt-chart.git
-      chartVersion: main
-      path: "."
+      argoProject: opp
+      chart: regionaldr-with-virt
+      chartVersion: 0.0.*
       annotations:
         argocd.argoproj.io/sync-wave: "10"
       syncPolicy:
@@ -158,21 +165,21 @@ clusterGroup:
     vault:
       name: vault
       namespace: vault
-      project: hub
+      argoProject: hub
       chart: hashicorp-vault
       chartVersion: 0.1.*
 
-    golang-external-secrets:
-      name: golang-external-secrets
-      namespace: golang-external-secrets
-      project: hub
-      chart: golang-external-secrets
-      chartVersion: 0.2.*
+    openshift-external-secrets:
+      name: openshift-external-secrets
+      namespace: external-secrets
+      argoProject: opp
+      chart: openshift-external-secrets
+      chartVersion: 0.0.*
 
     odf:
       name: odf
       namespace: openshift-storage
-      project: opp
+      argoProject: opp
       chart: openshift-data-foundations
       chartVersion: 0.2.*
       extraValueFiles:

values-resilient.yaml

@@ -7,20 +7,22 @@ clusterGroup:
     resourceTrackingMethod: annotation
 
   namespaces:
-    - golang-external-secrets
-    - openshift-cnv
-    - openshift-storage
-    - policies
-    - gitops-vms
-    - boutique
-    - external-dns-operator
-    - openshift-adp:
-        operatorGroup: true
-        targetNamespaces:
-          - openshift-adp
-    - openshift-workload-availability:
-        operatorGroup: true
-        targetNamespaces:
+    openshift-cnv: {}
+    external-secrets-operator:
+      operatorGroup: true
+      targetNamespaces: []
+    openshift-storage: {}
+    policies: {}
+    gitops-vms: {}
+    boutique: {}
+    external-dns-operator: {}
+    openshift-adp:
+      operatorGroup: true
+      targetNamespaces:
+        - openshift-adp
+    openshift-workload-availability:
+      operatorGroup: true
+      targetNamespaces: []
 
   subscriptions:
     openshift-virtualization:
@@ -51,65 +53,49 @@ clusterGroup:
       name: redhat-oadp-operator
       namespace: openshift-adp
       channel: stable
+  
+    eso:
+      name: openshift-external-secrets-operator
+      namespace: external-secrets-operator
+      channel: stable-v1
 
-  projects:
+  argoProjects:
     - resilient
 
   sharedValueFiles:
     - '/overrides/values-resilient-{{ $.Values.global.clusterPlatform }}.yaml'
 
   imperative:
-    jobs:
-      - name: clean-golden-images
-        playbook: ansible/odf_fix_dataimportcrons.yml
-        verbosity: -vvv
-    clusterRoleYaml:
-      - apiGroups:
-          - "*"
-        resources:
-          - persistentvolumeclaims
-          - datavolumes
-          - dataimportcrons
-          - datasources
-        verbs:
-          - "*"
-      - apiGroups:
-          - "*"
-        resources:
-          - "*"
-        verbs:
-          - get
-          - list
-          - watch
+    jobs: []
 
   applications:
     ensure-openshift-console-plugins:
       name: ensure-openshift-console-plugins
       namespace: openshift-console
-      project: resilient
+      argoProject: resilient
       chart: ensure-openshift-console-plugins
       chartVersion: 0.1.*
       extraValueFiles:
         - '$patternref/overrides/values-console-plugins-spokes.yaml'
 
-    golang-external-secrets:
-      name: golang-external-secrets
-      namespace: golang-external-secrets
-      project: resilient
-      chart: golang-external-secrets
-      chartVersion: 0.2.*
+    openshift-external-secrets:
+      name: openshift-external-secrets
+      namespace: external-secrets
+      argoProject: resilient
+      chart: openshift-external-secrets
+      chartVersion: 0.0.*
 
     openshift-cnv:
       name: openshift-cnv
       namespace: openshift-cnv
-      project: resilient
+      argoProject: resilient
       chart: openshift-virtualization-instance
       chartVersion: 0.1.*
 
     odf:
       name: odf
       namespace: openshift-storage
-      project: resilient
+      argoProject: resilient
       chart: openshift-data-foundations
       chartVersion: 0.2.*
       extraValueFiles:
@@ -118,23 +104,22 @@ clusterGroup:
     node-health-check-operator:
       name: node-health-check-operator
       namespace: openshift-workload-availability
-      project: resilient
+      argoProject: resilient
       chart: node-health-check-operator
       chartVersion: 0.1.*
 
     external-dns-operator:
       name: external-dns-operator
       namespace: external-dns-operator
-      project: resilient
+      argoProject: resilient
       chart: external-dns-operator
       chartVersion: 0.1.*
 
     adp-data-protection:
       name: adp-data-protection-application
       namespace: openshift-adp
-      project: resilient
-      repoURL: https://github.com/validatedpatterns/oadp-data-protection-application-chart.git
-      chartVersion: main
-      path: "."
+      argoProject: resilient
+      chart: data-protection-application
+      chartVersion: 0.0.*
 
   managedClusterGroups: []

values-secret.yaml.template

@@ -78,11 +78,12 @@ secrets:
     - name: token
       value: 'An automation hub token for retrieving Certified and Validated Ansible content'
 
-  - name: agof-vault-file
+  # Hub kubeconfig for AAP job templates (download_managed_kubeconfigs, etc.)
+  # Generate with: oc config view --raw --minify --context <hub-context>
+  - name: hub_k8s
     fields:
-    - name: agof-vault-file
-      path: 'full pathname of a valid agof_vault file for secrets to overlay the iac config'
-      base64: true
+    - name: kubeconfig
+      value: 'Hub kubeconfig YAML content (oc config view --raw --minify on the hub cluster)'
 
 # These are needed if you want to use and import your own regional clusters
 # by setting byoc: true in rdr chart