fix: add override behaviour

Signed-off-by: Chris Butler <chris.butler@redhat.com>

Author: butler54

rhdp-isolated/bastion/wrapper-disconnected.sh

@@ -168,25 +168,51 @@ sleep 30
 log_info "Checking catalog source status:"
 oc get catalogsources -n openshift-marketplace
 
-log_step "Setting up pattern secrets"
-bash ./scripts/gen-secrets.sh
-
 log_info "Waiting for cluster to stabilize..."
 sleep 60
 
+log_step "Setting up pattern secrets"
+bash ./scripts/gen-secrets.sh
+
 log_step "Installing CoCo pattern with disconnected configuration"
 
 # Set environment variable to point to mirrored helm charts
 export PATTERN_DISCONNECTED_HOME="${ACR_LOGIN_SERVER}/hybridcloudpatterns"
 
 log_info "Using mirrored Helm repository: ${PATTERN_DISCONNECTED_HOME}"
 
-# Create or update values-disconnected.yaml if it doesn't exist
+# Validate values-disconnected.yaml exists
 if [ ! -f "values-disconnected.yaml" ]; then
-    log_warn "values-disconnected.yaml not found, using values-simple.yaml as base"
-    log_warn "Note: You may need to update operator sources to match mirrored catalogs"
+    log_error "values-disconnected.yaml not found"
+    log_error "This file is required for disconnected installation"
+    exit 1
 fi
 
+# IMPORTANT: Do NOT patch values-disconnected.yaml on the bastion!
+# ArgoCD will read values files from Git, so any local patches are lost.
+# Instead, we use --set to override values at install time.
+
+# Build EXTRA_HELM_OPTS with both the values file AND runtime overrides
+# The --set flag takes precedence over values files (per Makefile comment)
+export EXTRA_HELM_OPTS="-f values-disconnected.yaml \
+  --set main.multiSourceConfig.helmRepoUrl=${ACR_LOGIN_SERVER}/hybridcloudpatterns"
+
+log_info "Helm options configured:"
+log_info "  Base values: values-global.yaml (always loaded)"
+log_info "  Cluster group: values-simple.yaml (from clusterGroupName)"
+log_info "  Overlay: values-disconnected.yaml (catalog sources, operators)"
+log_info "  Runtime override: --set main.multiSourceConfig.helmRepoUrl"
+log_info ""
+log_info "Disconnected configuration:"
+log_info "  helmRepoUrl: ${ACR_LOGIN_SERVER}/hybridcloudpatterns (via --set)"
+log_info "  Operator sources: cs-*-v4-20 (from values-disconnected.yaml)"
+log_info ""
+log_info "Why this approach:"
+log_info "  1. ArgoCD reads values files from Git (not bastion)"
+log_info "  2. --set overrides are baked into ArgoCD Application at install time"
+log_info "  3. No need to modify files that ArgoCD syncs from Git"
+log_info "  4. Avoids race conditions with helmRepoUrl availability"
+
 # Install pattern
 log_info "Running pattern installation..."
 ./pattern.sh make install
@@ -204,15 +230,23 @@ log_info "Credentials:"
 log_info "  Username: kubeadmin"
 log_info "  Password: $(cat ./openshift-install-disconnected/auth/kubeadmin-password)"
 log_info ""
-log_info "Pattern installed in disconnected mode"
-log_info "Images sourced from: ${ACR_LOGIN_SERVER}"
+log_info "Disconnected Configuration:"
+log_info "  Container Registry: ${ACR_LOGIN_SERVER}"
+log_info "  Helm Repository: ${ACR_LOGIN_SERVER}/hybridcloudpatterns"
+log_info "  Catalog Sources: cs-redhat-operator-index-v4-20, cs-community-operator-index-v4-20"
 log_info ""
 log_info "To access the cluster from this bastion:"
 log_info "  export KUBECONFIG=$(pwd)/openshift-install-disconnected/auth/kubeconfig"
 log_info "  oc get nodes"
+log_info "  oc get clusterversion"
 log_info ""
 log_info "Monitor pattern deployment:"
 log_info "  oc get applications -A"
 log_info "  oc get pods -n openshift-gitops"
+log_info "  oc get subscriptions -A"
+log_info ""
+log_info "Check CoCo/Sandboxed Containers:"
+log_info "  oc get pods -n openshift-sandboxed-containers-operator"
+log_info "  oc get kataconfig"
 log_info ""
 

values-disconnected.yaml

@@ -2,18 +2,26 @@
 # This file should be used in addition to values-simple.yaml or your chosen cluster group
 #
 # Usage:
-#   Ensure this file is committed to your repository before installation
-#   The pattern will use catalog sources generated by oc-mirror
+#   This file is read by ArgoCD from Git during pattern deployment.
+#   The helmRepoUrl below is a PLACEHOLDER and should NOT be manually updated.
+#   
+#   The wrapper-disconnected.sh script will override this value at install time using:
+#     --set main.multiSourceConfig.helmRepoUrl=<actual-acr-url>/hybridcloudpatterns
+#
+#   This approach ensures:
+#   - No need to commit ACR-specific URLs to Git
+#   - ArgoCD gets the correct URL (baked in at install time)
+#   - Pattern works in both connected and disconnected modes
 
 # Global overrides for disconnected operation
 global:
   main:
     multiSourceConfig:
       enabled: true
       clusterGroupChartVersion: "0.9.6"
-      # IMPORTANT: Update this to match your ACR URL after mirroring
-      # Example: acrcocod<guid><suffix>.azurecr.io/hybridcloudpatterns
-      helmRepoUrl: CHANGE_ME_ACR_URL/hybridcloudpatterns
+      # PLACEHOLDER: This will be overridden at install time via --set
+      # The actual ACR URL is provided by the wrapper-disconnected.sh script
+      helmRepoUrl: oci://quay.io/hybridcloudpatterns
 
     # Patterns operator source - matches oc-mirror generated catalog
     patternsOperator:
@@ -58,8 +66,9 @@ clusterGroup:
 
 # Notes:
 # 1. The catalog source names (cs-*-v4-20) are generated by oc-mirror
-# 2. Update helmRepoUrl after running mirror.sh with your actual ACR URL
+# 2. helmRepoUrl is overridden at install time via --set (not manually updated)
 # 3. CatalogSource names can be verified with:
 #    oc get catalogsources -n openshift-marketplace
 # 4. This file should be updated if mirroring to OpenShift 4.21 or later
+# 5. For disconnected installation, use: ./rhdp-isolated/bastion/wrapper-disconnected.sh