diff --git a/overrides/values-cluster-names.yaml b/overrides/values-cluster-names.yaml index ff91562..2162db9 100644 --- a/overrides/values-cluster-names.yaml +++ b/overrides/values-cluster-names.yaml @@ -24,7 +24,7 @@ clusterOverrides: aws: region: us-east-1 -# DRPC preferredCluster must be the ACM ManagedCluster name, not install_config.metadata.name. +# DRPC preferredCluster must be the ACM ManagedCluster name (ocp-primary): drpc: preferredCluster: ocp-primary protectedNamespaces: diff --git a/values-hub.yaml b/values-hub.yaml index ce76248..e317b3d 100644 --- a/values-hub.yaml +++ b/values-hub.yaml @@ -126,14 +126,36 @@ clusterGroup: - PrunePropagationPolicy=foreground - RespectIgnoreDifferences=true - ServerSideApply=true - extraValueFiles: - - '/overrides/values-cluster-names.yaml' ignoreDifferences: - group: operators.openshift.io kind: Console jsonPointers: - /spec/plugins + odf-dr: + name: odf-dr + namespace: regional-dr + argoProject: opp + chart: odf-dr-chart + chartVersion: 0.0.* + annotations: + argocd.argoproj.io/sync-wave: "8" + syncPolicy: + automated: {} + retry: + limit: 60 + backoff: + duration: 5s + factor: 2 + maxDuration: 3m + syncOptions: + - RespectIgnoreDifferences=true + extraValueFiles: + - '/overrides/values-cluster-names.yaml' + ignoreDifferences: + - group: internal.open-cluster-management.io + kind: ManagedClusterInfo + rdr: name: regional-dr namespace: regional-dr @@ -144,7 +166,7 @@ clusterGroup: argocd.argoproj.io/sync-wave: "10" syncPolicy: automated: {} - # We have to wait for the clusters to build, whcih can take a long time + # We have to wait for the clusters to build, which can take a long time retry: limit: 60 backoff: