PR For Branch v2.1

Changes.md

@@ -83,3 +83,10 @@
 ## Further Changes for v2.0 (February 25, 2026)
 
 * Pin utility-container version to v1.0.2 to workaround issue with loading AAP config
+
+## Changes for v2.1 (April 2026)
+
+* Switch to openshift productized (supported) external secrets operator
+* Use AAP 2.6
+* Unpin utility container
+* Update to 0.4.* of edge-gitops-vms

Makefile

@@ -1 +1,6 @@
 include Makefile-common
+
+##@ Pattern Install Helper Tasks
+.PHONY: ansible-get-credentials
+ansible-get-credentials: ## Retrieve AAP credentials from running instance
+	@$(ANSIBLE_RUN) rhvp.cluster_utils.aap_get_admin_credentials

scripts/ansible_get_credentials.sh

@@ -1,4 +1,3 @@
-#!/usr/bin/env ansible-playbook
----
-- name: Retrieve AAP credentials
-  ansible.builtin.import_playbook: ../ansible/ansible_get_credentials.yml
+#!/usr/bin/env bash
+
+ansible-playbook rhvp.cluster_utils.aap_get_admin_credentials

values-hub.yaml

@@ -1,22 +1,26 @@
+---
 clusterGroup:
   name: hub
-  isHubCluster: true
   namespaces:
-    - ansible-edge-gitops
-    - vault
-    - golang-external-secrets
-    - ansible-automation-platform
-    - openshift-cnv
-    - openshift-storage
-    - edge-gitops-vms
-    - aap-config
-  projects:
-    - hub
+    vault:
+    external-secrets-operator:
+      operatorGroup: true
+      targetNamespaces: []
+    external-secrets:
+    ansible-automation-platform:
+    openshift-cnv:
+    openshift-storage:
+    edge-gitops-vms:
+    aap-config:
   subscriptions:
     aap-operator:
       name: ansible-automation-platform-operator
       namespace: ansible-automation-platform
-      channel: stable-2.5
+      channel: stable-2.6
+    eso:
+      name: openshift-external-secrets-operator
+      namespace: external-secrets-operator
+      channel: stable-v1
     openshift-data-foundation:
       name: odf-operator
       namespace: openshift-storage
@@ -28,60 +32,49 @@ clusterGroup:
     aap:
       name: ansible-automation-platform
       namespace: ansible-automation-platform
-      project: hub
       chart: ansible-automation-platform-instance
       chartVersion: 0.1.*
     aap-config:
       name: aap-config
       namespace: aap-config
-      project: hub
       chart: aap-config
-      chartVersion: 0.1.*
+      chartVersion: 0.2.*
       extraValueFiles:
         - $patternref/overrides/values-aap-config-aeg.yaml
-      overrides:
-        - name: configJob.image
-          value: quay.io/validatedpatterns/utility-container:v1.0.2
     edge-gitops-vms:
       name: edge-gitops-vms
       namespace: edge-gitops-vms
-      project: hub
       chart: edge-gitops-vms
-      chartVersion: 0.2.*
+      chartVersion: 0.4.*
       extraValueFiles:
         - $patternref/overrides/values-egv-vms.yaml
-    golang-external-secrets:
-      name: golang-external-secrets
-      namespace: golang-external-secrets
-      project: hub
-      chart: golang-external-secrets
-      chartVersion: 0.1.*
+    openshift-external-secrets:
+      name: openshift-external-secrets
+      namespace: external-secrets
+      chart: openshift-external-secrets
+      chartVersion: 0.0.*
     odf:
       name: odf
       namespace: openshift-storage
-      project: hub
       chart: openshift-data-foundations
       chartVersion: 0.2.*
       extraValueFiles:
         - $patternref/overrides/values-odf-chart.yaml
     ensure-openshift-console-plugins:
       name: ensure-openshift-console-plugins
       namespace: openshift-console
-      project: hub
       chart: ensure-openshift-console-plugins
       chartVersion: 0.1.*
       extraValueFiles:
         - '$patternref/overrides/values-console-plugins.yaml'
     openshift-cnv:
       name: openshift-cnv
       namespace: openshift-cnv
-      project: hub
       chart: openshift-virtualization-instance
       chartVersion: 0.1.*
     vault:
       name: vault
       namespace: vault
-      project: hub
       chart: hashicorp-vault
       chartVersion: 0.1.*
   imperative: {}