Skip to content

Commit 1f3c4d5

Browse files
authored
Merge pull request #76343 from aireilly/OCPBUGS-33138-multicluster-operators-subscription
OCPBUGS-33138 - Adding step for ArgoCD multicluster-operators-subscription
2 parents 4065cc0 + fe11c26 commit 1f3c4d5

File tree

1 file changed

+67
-1
lines changed

1 file changed

+67
-1
lines changed

snippets/ztp-patch-argocd-hub-cluster.adoc

Lines changed: 67 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,71 @@
11
:_mod-docs-content-type: SNIPPET
2-
. To install the {ztp} plugin, patch the ArgoCD instance in the hub cluster by using the patch file that you previously extracted into the `out/argocd/deployment/` directory.
2+
. To install the {ztp} plugin, patch the ArgoCD instance in the hub cluster with the relevant multicluster engine (MCE) subscription image.
3+
Customize the patch file that you previously extracted into the `out/argocd/deployment/` directory for your environment.
4+
5+
.. Select the `multicluster-operators-subscription` image that matches your {rh-rhacm} version.
6+
+
7+
--
8+
.`multicluster-operators-subscription` image versions
9+
[cols="1,1,1,1,3", options="header"]
10+
|====
11+
|{product-title} version
12+
|{rh-rhacm} version
13+
|MCE version
14+
|MCE RHEL version
15+
|MCE image
16+
17+
|4.14, 4.15, 4.16
18+
|2.8, 2.9
19+
|2.8, 2.9
20+
|RHEL 8
21+
|`registry.redhat.io/rhacm2/multicluster-operators-subscription-rhel8:v2.8`
22+
23+
`registry.redhat.io/rhacm2/multicluster-operators-subscription-rhel8:v2.9`
24+
25+
|4.14, 4.15, 4.16
26+
|2.10
27+
|2.10
28+
|RHEL 9
29+
|`registry.redhat.io/rhacm2/multicluster-operators-subscription-rhel9:v2.10`
30+
|====
31+
32+
[IMPORTANT]
33+
====
34+
The version of the `multicluster-operators-subscription` image should match the {rh-rhacm} version.
35+
Beginning with the MCE 2.10 release, RHEL 9 is the base image for `multicluster-operators-subscription` images.
36+
====
37+
--
38+
39+
.. Add the following configuration to the `out/argocd/deployment/argocd-openshift-gitops-patch.json` file:
40+
+
41+
--
42+
[source,json]
43+
----
44+
{
45+
"args": [
46+
"-c",
47+
"mkdir -p /.config/kustomize/plugin/policy.open-cluster-management.io/v1/policygenerator && cp /policy-generator/PolicyGenerator-not-fips-compliant /.config/kustomize/plugin/policy.open-cluster-management.io/v1/policygenerator/PolicyGenerator" <1>
48+
],
49+
"command": [
50+
"/bin/bash"
51+
],
52+
"image": "registry.redhat.io/rhacm2/multicluster-operators-subscription-rhel9:v2.10", <2> <3>
53+
"name": "policy-generator-install",
54+
"imagePullPolicy": "Always",
55+
"volumeMounts": [
56+
{
57+
"mountPath": "/.config",
58+
"name": "kustomize"
59+
}
60+
]
61+
}
62+
----
63+
<1> Optional: For RHEL 9 images, copy the required universal executable in the `/policy-generator/PolicyGenerator-not-fips-compliant` folder for the ArgoCD version.
64+
<2> Match the `multicluster-operators-subscription` image to the {rh-rhacm} version.
65+
<3> In disconnected environments, replace the URL for the `multicluster-operators-subscription` image with the disconnected registry equivalent for your environment.
66+
--
67+
68+
.. Patch the ArgoCD instance.
369
Run the following command:
470
+
571
[source,terminal]

0 commit comments

Comments
 (0)