From 13afe903abb624bf35b0612156f371fc72db5a97 Mon Sep 17 00:00:00 2001 From: Martin Jackson Date: Tue, 21 Apr 2026 15:58:59 -0400 Subject: [PATCH 1/9] Make updates for v21 --- Changes.md | 7 +++++++ values-hub.yaml | 52 ++++++++++++++++++++++--------------------------- 2 files changed, 30 insertions(+), 29 deletions(-) diff --git a/Changes.md b/Changes.md index 08cfaad0..8d49f439 100644 --- a/Changes.md +++ b/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 external secrets operator +* Use AAP 2.6 +* Unpin utility container +* Update to 0.3.* of edge-gitops-vms diff --git a/values-hub.yaml b/values-hub.yaml index 8e970949..ccd86062 100644 --- a/values-hub.yaml +++ b/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,38 +32,31 @@ 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.* 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.3.* 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 + argoProject: hub + chart: openshift-external-secrets + chartVersion: 0.0.* odf: name: odf namespace: openshift-storage - project: hub chart: openshift-data-foundations chartVersion: 0.2.* extraValueFiles: @@ -67,7 +64,6 @@ clusterGroup: ensure-openshift-console-plugins: name: ensure-openshift-console-plugins namespace: openshift-console - project: hub chart: ensure-openshift-console-plugins chartVersion: 0.1.* extraValueFiles: @@ -75,13 +71,11 @@ clusterGroup: 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: {} From 3ae07034a9f754e94e0c7a7198a6210500a05a93 Mon Sep 17 00:00:00 2001 From: Martin Jackson Date: Tue, 21 Apr 2026 16:11:47 -0400 Subject: [PATCH 2/9] Use the rhvp.cluster_utils playbook for retreiving aap config --- Makefile | 5 +++ ansible/ansible.cfg | 4 --- ansible/ansible_get_credentials.yml | 50 ----------------------------- scripts/ansible_get_credentials.sh | 7 ++-- 4 files changed, 8 insertions(+), 58 deletions(-) delete mode 100644 ansible/ansible.cfg delete mode 100644 ansible/ansible_get_credentials.yml diff --git a/Makefile b/Makefile index be8aa3ed..b00d512f 100644 --- a/Makefile +++ b/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 diff --git a/ansible/ansible.cfg b/ansible/ansible.cfg deleted file mode 100644 index c8bec627..00000000 --- a/ansible/ansible.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[defaults] -display_skipped_hosts=False -localhost_warning=False -roles_path=./roles:~/.ansible/roles:/usr/share/ansible/roles:/etc/ansible/roles diff --git a/ansible/ansible_get_credentials.yml b/ansible/ansible_get_credentials.yml deleted file mode 100644 index b9ca2716..00000000 --- a/ansible/ansible_get_credentials.yml +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/env ansible-playbook ---- -- name: Retrieve Credentials for AAP on OpenShift - become: false - connection: local - hosts: localhost - gather_facts: false - vars: - kubeconfig: "{{ lookup('env', 'KUBECONFIG') }}" - tasks: - - name: Retrieve API hostname for AAP - kubernetes.core.k8s_info: - api_version: route.openshift.io/v1 - kind: Route - namespace: ansible-automation-platform - name: aap - register: aap_host - until: aap_host.resources | length == 1 - retries: 20 - delay: 5 - - - name: Set ansible_host - ansible.builtin.set_fact: - ansible_host: "{{ aap_host.resources[0].spec.host }}" - - - name: Retrieve admin password for AAP - kubernetes.core.k8s_info: - kind: Secret - namespace: ansible-automation-platform - name: aap-admin-password - register: admin_pw - until: admin_pw.resources | length == 1 - retries: 20 - delay: 5 - - - name: Set admin_password fact - ansible.builtin.set_fact: - admin_password: "{{ admin_pw.resources[0].data.password | b64decode }}" - - - name: Report AAP Endpoint - ansible.builtin.debug: - msg: "AAP Endpoint: https://{{ ansible_host }}" - - - name: Report AAP User - ansible.builtin.debug: - msg: "AAP Admin User: admin" - - - name: Report AAP Admin Password - ansible.builtin.debug: - msg: "AAP Admin Password: {{ admin_password }}" diff --git a/scripts/ansible_get_credentials.sh b/scripts/ansible_get_credentials.sh index 8d775af2..1d615856 100755 --- a/scripts/ansible_get_credentials.sh +++ b/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 From 56f0ad3aa05101b4bdbd3b5edb0b05ae3c221544 Mon Sep 17 00:00:00 2001 From: Martin Jackson Date: Tue, 21 Apr 2026 17:21:21 -0400 Subject: [PATCH 3/9] Remove project --- values-hub.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/values-hub.yaml b/values-hub.yaml index ccd86062..1ddae2fd 100644 --- a/values-hub.yaml +++ b/values-hub.yaml @@ -51,7 +51,6 @@ clusterGroup: openshift-external-secrets: name: openshift-external-secrets namespace: external-secrets - argoProject: hub chart: openshift-external-secrets chartVersion: 0.0.* odf: From eb90c6508f9fb35f9af0a0d346131384519ea32a Mon Sep 17 00:00:00 2001 From: Martin Jackson Date: Wed, 22 Apr 2026 08:23:44 -0400 Subject: [PATCH 4/9] Test new chart versions --- values-hub.yaml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/values-hub.yaml b/values-hub.yaml index 1ddae2fd..9bd2ecdb 100644 --- a/values-hub.yaml +++ b/values-hub.yaml @@ -38,14 +38,20 @@ clusterGroup: name: aap-config namespace: aap-config chart: aap-config - chartVersion: 0.1.* + #chartVersion: 0.1.* + repoURL: https://github.com/mhjacks/aap-config-chart.git + chartVersion: update_for_ocp_eso + path: "." extraValueFiles: - $patternref/overrides/values-aap-config-aeg.yaml edge-gitops-vms: name: edge-gitops-vms namespace: edge-gitops-vms chart: edge-gitops-vms - chartVersion: 0.3.* + #chartVersion: 0.3.* + repoURL: https://github.com/mhjacks/edge-gitops-vms-chart.git + chartVersion: update_for_ocp_eso + path: "." extraValueFiles: - $patternref/overrides/values-egv-vms.yaml openshift-external-secrets: From 259cdbed4d1aca7d1b7c88acc6cd146b67e6281d Mon Sep 17 00:00:00 2001 From: Martin Jackson Date: Wed, 22 Apr 2026 10:43:42 -0400 Subject: [PATCH 5/9] Remove chartname temporarily --- values-hub.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/values-hub.yaml b/values-hub.yaml index 9bd2ecdb..7af16826 100644 --- a/values-hub.yaml +++ b/values-hub.yaml @@ -37,7 +37,7 @@ clusterGroup: aap-config: name: aap-config namespace: aap-config - chart: aap-config + #chart: aap-config #chartVersion: 0.1.* repoURL: https://github.com/mhjacks/aap-config-chart.git chartVersion: update_for_ocp_eso @@ -47,7 +47,7 @@ clusterGroup: edge-gitops-vms: name: edge-gitops-vms namespace: edge-gitops-vms - chart: edge-gitops-vms + #chart: edge-gitops-vms #chartVersion: 0.3.* repoURL: https://github.com/mhjacks/edge-gitops-vms-chart.git chartVersion: update_for_ocp_eso From aa068b8e11b91b7200d94174fc48c15bf7371381 Mon Sep 17 00:00:00 2001 From: Martin Jackson Date: Wed, 22 Apr 2026 11:14:08 -0400 Subject: [PATCH 6/9] Revert to standard aap-config chart --- values-hub.yaml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/values-hub.yaml b/values-hub.yaml index 7af16826..5121061c 100644 --- a/values-hub.yaml +++ b/values-hub.yaml @@ -37,11 +37,8 @@ clusterGroup: aap-config: name: aap-config namespace: aap-config - #chart: aap-config - #chartVersion: 0.1.* - repoURL: https://github.com/mhjacks/aap-config-chart.git - chartVersion: update_for_ocp_eso - path: "." + chart: aap-config + chartVersion: 0.2.* extraValueFiles: - $patternref/overrides/values-aap-config-aeg.yaml edge-gitops-vms: From 7a3a065dd0487aac074e43d0740bb85c54375348 Mon Sep 17 00:00:00 2001 From: Martin Jackson Date: Wed, 22 Apr 2026 12:14:18 -0400 Subject: [PATCH 7/9] Update Changes --- Changes.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Changes.md b/Changes.md index 8d49f439..8344a7d9 100644 --- a/Changes.md +++ b/Changes.md @@ -86,7 +86,7 @@ ## Changes for v2.1 (April 2026) -* Switch to openshift productized external secrets operator +* Switch to openshift productized (supported) external secrets operator * Use AAP 2.6 * Unpin utility container -* Update to 0.3.* of edge-gitops-vms +* Update to 0.4.* of edge-gitops-vms From 6c46c2f72c4fee6c80d15ba50d7f920d306ca617 Mon Sep 17 00:00:00 2001 From: Martin Jackson Date: Wed, 22 Apr 2026 15:31:47 -0400 Subject: [PATCH 8/9] Revert to mainstream chart --- values-hub.yaml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/values-hub.yaml b/values-hub.yaml index 5121061c..e70cd648 100644 --- a/values-hub.yaml +++ b/values-hub.yaml @@ -44,11 +44,8 @@ clusterGroup: edge-gitops-vms: name: edge-gitops-vms namespace: edge-gitops-vms - #chart: edge-gitops-vms - #chartVersion: 0.3.* - repoURL: https://github.com/mhjacks/edge-gitops-vms-chart.git - chartVersion: update_for_ocp_eso - path: "." + chart: edge-gitops-vms + chartVersion: 0.4.* extraValueFiles: - $patternref/overrides/values-egv-vms.yaml openshift-external-secrets: From f4e9b3fcd5e83945838022fbb9e3d2b2bad3d400 Mon Sep 17 00:00:00 2001 From: Martin Jackson Date: Wed, 22 Apr 2026 16:44:41 -0400 Subject: [PATCH 9/9] Remove ansible-lint workflow as it is no longer needed --- .github/workflows/ansible-lint.yml | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 .github/workflows/ansible-lint.yml diff --git a/.github/workflows/ansible-lint.yml b/.github/workflows/ansible-lint.yml deleted file mode 100644 index 081a5ba3..00000000 --- a/.github/workflows/ansible-lint.yml +++ /dev/null @@ -1,17 +0,0 @@ -name: Ansible Lint # feel free to pick your own name - -on: [push, pull_request] - -jobs: - build: - runs-on: ubuntu-latest - - steps: - # Important: This sets up your GITHUB_WORKSPACE environment variable - - uses: actions/checkout@v6 - - - name: Lint Ansible Playbook - uses: ansible/ansible-lint@v26 - # Let's point it to the path - with: - args: "-c .ansible-lint ansible/"