fix: remove ACM workaround, bump ACM chart to 0.2.x

The duplicate bootstrap_secrets entry targeting openshift-gitops is no
longer needed.  The VP operator (0.0.70+) copies credentials into
vp-gitops and automatically sets global.vpArgoNamespace.  The ACM chart
0.2.x reads that variable, so the private-repo policy resolves without
any manual override or duplicate secret.

- Remove second bootstrap_secrets entries (SSH and HTTPS workarounds)
- Bump ACM chartVersion from 0.1.* to 0.2.*
- Update docs/private-repos.md and values-secret.yaml.template comments

Signed-off-by: Min Zhang <minzhang@redhat.com>

Author: minmzzhang

docs/private-repos.md

@@ -5,8 +5,9 @@ from a private Git repository.
 
 The Validated Patterns framework supports deploying from both SSH-secured and
 HTTPS-secured (PAT) private repositories.  The mechanism works by creating an
-ArgoCD repository secret **before** the pattern is deployed, so that both the
-Cluster ArgoCD and Hub ArgoCD instances can pull the pattern manifests.
+ArgoCD repository secret **before** the pattern is deployed, so that the VP
+operator can propagate credentials to all ArgoCD instances managed by the
+pattern.
 
 > [!NOTE]
 > The upstream documentation is at
@@ -71,21 +72,6 @@ bootstrap_secrets:
     value: "true"
   - name: sshPrivateKey
     path: ~/.ssh/ztvp-deploy-key
-# ACM workaround (see Troubleshooting)
-- name: vp-private-repo-credentials
-  targetNamespaces:
-  - openshift-gitops
-  labels:
-    argocd.argoproj.io/secret-type: repository
-  fields:
-  - name: type
-    value: git
-  - name: url
-    value: git@github.com:YOUR-ORG/layered-zero-trust.git
-  - name: insecureIgnoreHostKey
-    value: "true"
-  - name: sshPrivateKey
-    path: ~/.ssh/ztvp-deploy-key
 ```
 
 ### 4. Deploy
@@ -139,21 +125,6 @@ bootstrap_secrets:
     value: YOUR-USERNAME
   - name: password
     path: ~/.config/validated-patterns/git-pat
-# ACM workaround (see Troubleshooting)
-- name: vp-private-repo-credentials
-  targetNamespaces:
-  - openshift-gitops
-  labels:
-    argocd.argoproj.io/secret-type: repository
-  fields:
-  - name: type
-    value: git
-  - name: url
-    value: https://github.com/YOUR-ORG/layered-zero-trust.git
-  - name: username
-    value: YOUR-USERNAME
-  - name: password
-    path: ~/.config/validated-patterns/git-pat
 ```
 
 > [!NOTE]
@@ -192,8 +163,14 @@ for actual access; the validation is only a local convenience check.
 
 3. The `TOKEN_SECRET` and `TOKEN_NAMESPACE` Make variables set the
    `tokenSecret` and `tokenSecretNamespace` fields on the Pattern Custom
-   Resource, which propagates the credentials to all ArgoCD instances
-   managed by the pattern.
+   Resource.  The VP operator copies the secret as
+   `vp-private-repo-credentials` into `vp-gitops` (its managed ArgoCD
+   namespace).
+
+4. The ACM chart (0.2.x+) `vp-private-hub-policy` copies credentials from
+   `global.vpArgoNamespace`, which the VP operator automatically sets to
+   `vp-gitops`.  This allows the policy to find the secret the VP operator
+   placed there without any manual override.
 
 ## Verifying
 
@@ -206,10 +183,19 @@ oc get secret private-repo -n openshift-operators \
 
 Expected output: `repository`
 
+Confirm the VP operator propagated the credential to `vp-gitops`:
+
+```shell
+oc get secret vp-private-repo-credentials -n vp-gitops \
+  -o jsonpath='{.metadata.labels.argocd\.argoproj\.io/secret-type}'
+```
+
+Expected output: `repository`
+
 Check the Cluster ArgoCD can see the repository:
 
 ```shell
-oc get application layered-zero-trust-hub -n openshift-gitops \
+oc get application layered-zero-trust-hub -n vp-gitops \
   -o jsonpath='{.status.sync.status}'
 ```
 
@@ -218,11 +204,11 @@ Expected output: `Synced` (or `OutOfSync` if you have uncommitted changes).
 ## Troubleshooting
 
 * **ACM shows Degraded (vp-private-hub-policy NonCompliant)** -- The ACM
-  chart policy copies repo credentials from `openshift-gitops`, but the VP
-  operator only places them in `vp-gitops`.  Fix this by adding a second
-  `bootstrap_secrets` entry named `vp-private-repo-credentials` targeting
-  `openshift-gitops` (see the "ACM workaround" section in
-  `values-secret.yaml.template`).  Then re-run `load-secrets`.
+  chart 0.1.x has `openshift-gitops` hardcoded in the private-repo policy
+  template, but the VP operator (0.0.70+) places credentials in
+  `vp-gitops`.  Ensure `values-hub.yaml` uses ACM chart 0.2.x or later
+  (`chartVersion: 0.2.*`), which reads `global.vpArgoNamespace` -- a value
+  the VP operator sets automatically.
 
 * **ArgoCD shows "repository not accessible"** -- Verify the SSH key or PAT
   has read access.  For SSH, confirm the key has no passphrase (`ssh-keygen

values-hub.yaml

@@ -276,7 +276,7 @@ clusterGroup:
       namespace: open-cluster-management
       project: hub
       chart: acm
-      chartVersion: 0.1.*
+      chartVersion: 0.2.*
       annotations:
         argocd.argoproj.io/sync-wave: "5"
       ignoreDifferences:

values-secret.yaml.template

@@ -422,6 +422,10 @@ secrets:
 # in a container that does not have the Git host's SSH fingerprint in its
 # known_hosts file.  Without this flag, SSH connections fail with
 # "knownhosts: key is unknown".
+#
+# The VP operator copies this secret as vp-private-repo-credentials into
+# vp-gitops (its managed ArgoCD namespace).  The ACM chart (0.2.x+) reads
+# global.vpArgoNamespace which the VP operator sets automatically.
 
 #bootstrap_secrets:
 #- name: private-repo
@@ -438,24 +442,6 @@ secrets:
 #    value: "true"
 #  - name: sshPrivateKey
 #    path: ~/.ssh/ztvp-deploy-key
-#
-# ACM workaround: The ACM chart policy copies repo credentials from
-# openshift-gitops, but the VP operator only places them in vp-gitops.
-# This second entry ensures the ACM policy can resolve.
-#- name: vp-private-repo-credentials
-#  targetNamespaces:
-#  - openshift-gitops
-#  labels:
-#    argocd.argoproj.io/secret-type: repository
-#  fields:
-#  - name: type
-#    value: git
-#  - name: url
-#    value: git@github.com:YOUR-ORG/layered-zero-trust.git
-#  - name: insecureIgnoreHostKey
-#    value: "true"
-#  - name: sshPrivateKey
-#    path: ~/.ssh/ztvp-deploy-key
 
 # --- OPTION B: HTTPS with Personal Access Token (PAT) ---
 # Create a PAT with read access to your repository.
@@ -477,19 +463,3 @@ secrets:
 #    value: YOUR-USERNAME
 #  - name: password
 #    path: ~/.config/validated-patterns/git-pat
-#
-# ACM workaround (HTTPS version):
-#- name: vp-private-repo-credentials
-#  targetNamespaces:
-#  - openshift-gitops
-#  labels:
-#    argocd.argoproj.io/secret-type: repository
-#  fields:
-#  - name: type
-#    value: git
-#  - name: url
-#    value: https://github.com/YOUR-ORG/layered-zero-trust.git
-#  - name: username
-#    value: YOUR-USERNAME
-#  - name: password
-#    path: ~/.config/validated-patterns/git-pat