diff --git a/scripts/drpc-health-check-argocd-sync-disable.sh b/scripts/drpc-health-check-argocd-sync-disable.sh index 3d9a599..61243e7 100755 --- a/scripts/drpc-health-check-argocd-sync-disable.sh +++ b/scripts/drpc-health-check-argocd-sync-disable.sh @@ -5,6 +5,8 @@ echo "Starting DRPC health check and ArgoCD sync disable job..." echo "This job will check DRPC health (Kubernetes objects and PVCs) and disable ArgoCD sync when healthy" # Configuration from environment variables +# Target application namespace = pattern-clustergroup (global.pattern + "-" + main.clusterGroupName in values). +# The chart sets ARGOCD_APP_NAMESPACE and PROTECTED_NAMESPACE to this value. DRPC_NAMESPACE="${DRPC_NAMESPACE:-openshift-dr-ops}" DRPC_NAME="${DRPC_NAME:-gitops-vm-protection}" PROTECTED_NAMESPACE="${PROTECTED_NAMESPACE:-gitops-vms}" diff --git a/templates/job-drpc-health-check-argocd-sync-disable.yaml b/templates/job-drpc-health-check-argocd-sync-disable.yaml index ba364fd..2c2c7d2 100644 --- a/templates/job-drpc-health-check-argocd-sync-disable.yaml +++ b/templates/job-drpc-health-check-argocd-sync-disable.yaml @@ -38,15 +38,15 @@ spec: {{ .Files.Get "scripts/drpc-health-check-argocd-sync-disable.sh" | indent 10 }} env: - name: DRPC_NAMESPACE - value: "openshift-dr-ops" + value: {{ (index (.Values.drpc | default dict) "namespace") | default "openshift-dr-ops" | quote }} - name: DRPC_NAME - value: "gitops-vm-protection" + value: {{ (index (.Values.drpc | default dict) "name") | default "gitops-vm-protection" | quote }} - name: PROTECTED_NAMESPACE value: "gitops-vms" - name: ARGOCD_APP_NAME value: "regional-dr" - name: ARGOCD_APP_NAMESPACE - value: "ramendr-starter-kit-hub" + value: {{ printf "%s-%s" (.Values.global.pattern | default "ramendr-starter-kit-hub") (index (.Values.main | default dict) "clusterGroupName" | default "hub") | quote }} - name: KUBECONFIG value: "" diff --git a/values.yaml b/values.yaml index 058a0ae..f1180f7 100644 --- a/values.yaml +++ b/values.yaml @@ -1,6 +1,12 @@ --- global: clusterDomain: cluster.example.com + # Pattern name; target application namespace = global.pattern-main.clusterGroupName + pattern: ramendr-starter-kit-hub + +# Main cluster group (primary); target application namespace = global.pattern-main.clusterGroupName +main: + clusterGroupName: resilient # Edge GitOps VMs deployment (script and helm chart) edgeGitopsVms: