Skip to content

Commit 7d6e29e

Browse files
Merge pull request #457 from jgato/4.19-mce-proxy-addon-config
OCPBUGS-65570: [telco-hub] 4.19 mce proxy addon config
2 parents 5493986 + 216a5c6 commit 7d6e29e

File tree

3 files changed

+6
-21
lines changed

3 files changed

+6
-21
lines changed

telco-hub/configuration/reference-crs/required/acm/acmMCE.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
enabled: true
3232
name: server-foundation
3333
- configOverrides: {}
34-
enabled: true
34+
enabled: false
3535
name: cluster-proxy-addon
3636
- configOverrides: {}
3737
enabled: true

telco-hub/configuration/reference-crs/required/acm/disable-cluster-proxy-addon.json

Lines changed: 0 additions & 15 deletions
This file was deleted.

telco-hub/configuration/reference-crs/required/acm/readme.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
3. Create the `acmMCH.yaml`.
66
4. If Subscription was set to Manual installPlanApproval, approve the created InstallPlan on `multicluster-engine`
77
5. Apply the `acmProvisioning.yaml`.
8-
6. Create the `acmAgentServiceConfig.yaml` (Two PVs are required, so ODF must be configured prior to this step).
9-
7. The `multicluster-engine` enables the `cluster-proxy-addon` feature by default. Apply the following patch to disable it: `oc patch multiclusterengines.multicluster.openshift.io multiclusterengine --type=merge --patch-file ./disable-cluster-proxy-addon.json`.
10-
8. Create the `observabilityNS.yaml`.
11-
9. Create the pull-secret. There are two methods to create the pull-secret:
12-
- The pull-secret multiclusterhub-operator-pull-secret can be automatically created by the ACM policy in pull-secret-copy.yaml. If secret multiclusterhub-operator-pull-secret exists in open-cluster-management, the policy copy it to ns open-cluster-management-observability. If the previous command returns an empty value, then copy secret pull-secret from ns openshift-config.
8+
6. Create the `acmMirrorRegistryCM.yaml`.
9+
7. Create the `acmAgentServiceConfig.yaml` (Two PVs are required, so ODF must be configured prior to this step).
10+
9. Create the `observabilityNS.yaml`.
11+
10. Create the pull-secret. There are two methods to create the pull-secret:
12+
- The pull-secret multiclusterhub-operator-pull-secret can be automatically created by the ACM policy in pullSecretPolicy.yaml. If secret multiclusterhub-operator-pull-secret exists in open-cluster-management, the policy copy it to ns open-cluster-management-observability. If the previous command returns an empty value, then copy secret pull-secret from ns openshift-config.
1313
- If you want to use your own pull-secret, you may update the value of .dockerconfigjson in observabilitySecret.yaml.
1414
10. Create the `observabilityOBC.yaml`.
1515
11. The Thanos secret will be automatically created by the ACM Policy

0 commit comments

Comments
 (0)