From fc16c1e9ea8b1679445e3cc318034a6e9778b435 Mon Sep 17 00:00:00 2001 From: Martin Jackson Date: Tue, 7 Jul 2026 09:35:58 -0500 Subject: [PATCH 1/5] Update for 2.0 branch --- Changes.md | 1 + overrides/values-aap-config-aeg.yaml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changes.md b/Changes.md index 08cfaad0..44233973 100644 --- a/Changes.md +++ b/Changes.md @@ -83,3 +83,4 @@ ## Further Changes for v2.0 (February 25, 2026) * Pin utility-container version to v1.0.2 to workaround issue with loading AAP config +* Unpin utility-container; use v1 branch hmi-config-as-code to avoid breaking changes diff --git a/overrides/values-aap-config-aeg.yaml b/overrides/values-aap-config-aeg.yaml index 4809a92d..338ee277 100644 --- a/overrides/values-aap-config-aeg.yaml +++ b/overrides/values-aap-config-aeg.yaml @@ -1,4 +1,4 @@ --- agof: iac_repo: https://github.com/validatedpatterns-demos/ansible-edge-gitops-hmi-config-as-code.git - iac_revision: main + iac_revision: v1 From 5f1eac1a3c38bf1dfc293ed035ef4161568a9f62 Mon Sep 17 00:00:00 2001 From: Martin Jackson Date: Tue, 7 Jul 2026 09:58:14 -0500 Subject: [PATCH 2/5] Update golang-external-secrets --- Changes.md | 1 + values-hub.yaml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changes.md b/Changes.md index 44233973..2af3681e 100644 --- a/Changes.md +++ b/Changes.md @@ -84,3 +84,4 @@ * Pin utility-container version to v1.0.2 to workaround issue with loading AAP config * Unpin utility-container; use v1 branch hmi-config-as-code to avoid breaking changes +* Update golang-external-secrets to allow API v1 diff --git a/values-hub.yaml b/values-hub.yaml index 8e970949..61e6a5e3 100644 --- a/values-hub.yaml +++ b/values-hub.yaml @@ -55,7 +55,7 @@ clusterGroup: namespace: golang-external-secrets project: hub chart: golang-external-secrets - chartVersion: 0.1.* + chartVersion: 0.2.* odf: name: odf namespace: openshift-storage From 2afa70104649e0b4e32f87b2889e091e2fc253a7 Mon Sep 17 00:00:00 2001 From: Martin Jackson Date: Tue, 7 Jul 2026 10:04:14 -0500 Subject: [PATCH 3/5] Update to AAP 2.6 --- Changes.md | 1 + values-hub.yaml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changes.md b/Changes.md index 2af3681e..10ea65e7 100644 --- a/Changes.md +++ b/Changes.md @@ -85,3 +85,4 @@ * Pin utility-container version to v1.0.2 to workaround issue with loading AAP config * Unpin utility-container; use v1 branch hmi-config-as-code to avoid breaking changes * Update golang-external-secrets to allow API v1 +* Update AAP to v2.6, 4.22 does not have 2.5 in the Operator catalog diff --git a/values-hub.yaml b/values-hub.yaml index 61e6a5e3..f7b09834 100644 --- a/values-hub.yaml +++ b/values-hub.yaml @@ -16,7 +16,7 @@ clusterGroup: aap-operator: name: ansible-automation-platform-operator namespace: ansible-automation-platform - channel: stable-2.5 + channel: stable-2.6 openshift-data-foundation: name: odf-operator namespace: openshift-storage From 64e5cb7d3c514f21a6a42d8de0e3c4775e5778bb Mon Sep 17 00:00:00 2001 From: Martin Jackson Date: Tue, 7 Jul 2026 10:45:24 -0500 Subject: [PATCH 4/5] Eliminate warning for VMs by specifying machine type (now a default in newer chart versions) --- Changes.md | 2 +- overrides/values-egv-vms.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changes.md b/Changes.md index 10ea65e7..e92f71fd 100644 --- a/Changes.md +++ b/Changes.md @@ -83,6 +83,6 @@ ## Further Changes for v2.0 (February 25, 2026) * Pin utility-container version to v1.0.2 to workaround issue with loading AAP config -* Unpin utility-container; use v1 branch hmi-config-as-code to avoid breaking changes +* Unpin utility-container; use v1 branch hmi-config-as-code and inventory to avoid breaking changes * Update golang-external-secrets to allow API v1 * Update AAP to v2.6, 4.22 does not have 2.5 in the Operator catalog diff --git a/overrides/values-egv-vms.yaml b/overrides/values-egv-vms.yaml index eb3b63c3..61620266 100644 --- a/overrides/values-egv-vms.yaml +++ b/overrides/values-egv-vms.yaml @@ -5,3 +5,4 @@ vms: kiosk: count: 2 role: kiosk + machineType: q35 From 17190fab8a43e96d6840fe2eb436949fb5e3e82c Mon Sep 17 00:00:00 2001 From: Martin Jackson Date: Wed, 8 Jul 2026 07:52:17 -0500 Subject: [PATCH 5/5] Remove v1.0.2 override as that workaround no longer necessary --- values-hub.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/values-hub.yaml b/values-hub.yaml index f7b09834..34c3c96f 100644 --- a/values-hub.yaml +++ b/values-hub.yaml @@ -39,9 +39,6 @@ clusterGroup: 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