diff --git a/bundle/manifests/multicluster.odf.openshift.io_mirrorpeers.yaml b/bundle/manifests/multicluster.odf.openshift.io_mirrorpeers.yaml index 5682e955..8cfc8520 100644 --- a/bundle/manifests/multicluster.odf.openshift.io_mirrorpeers.yaml +++ b/bundle/manifests/multicluster.odf.openshift.io_mirrorpeers.yaml @@ -65,6 +65,13 @@ spec: manageS3: default: false type: boolean + overlappingCIDR: + default: false + description: OverlappingCIDR should be set to true if the peer clusters + have overlapping Pod or Service CIDR. This will enable storage clusters + to use submariner globalnet. Enabling this will cause storage service + disruption while network is being reconfigured. + type: boolean schedulingIntervals: description: 'SchedulingIntervals is a list of intervals at which mirroring snapshots are taken. DEPRECATED : Any changes to this diff --git a/bundle/manifests/odf-multicluster-orchestrator.clusterserviceversion.yaml b/bundle/manifests/odf-multicluster-orchestrator.clusterserviceversion.yaml index 9e6d5da0..162f86f7 100644 --- a/bundle/manifests/odf-multicluster-orchestrator.clusterserviceversion.yaml +++ b/bundle/manifests/odf-multicluster-orchestrator.clusterserviceversion.yaml @@ -316,10 +316,16 @@ spec: - mountPath: /var/serving-cert name: odf-multicluster-console-serving-cert readOnly: true + - mountPath: /etc/nginx/nginx.conf + name: odf-multicluster-console-nginx-conf + subPath: nginx.conf volumes: - name: odf-multicluster-console-serving-cert secret: secretName: odf-multicluster-console-serving-cert + - configMap: + name: odf-multicluster-console-nginx-conf + name: odf-multicluster-console-nginx-conf permissions: - rules: - apiGroups: