1
0
mirror of https://github.com/openshift/openshift-docs.git synced 2026-02-05 21:46:22 +01:00

Merge pull request #40060 from openshift-cherrypick-robot/cherry-pick-39954-to-enterprise-4.10

[enterprise-4.10] BZ2025588: Fix the procedure for obtaining hub cluster deployment CRs
This commit is contained in:
Vikram Goyal
2021-12-21 06:11:56 +10:00
committed by GitHub

View File

@@ -19,7 +19,15 @@ $ oc get secret openshift-gitops-cluster -n openshift-gitops -o jsonpath='{.data
----
. Prepare the ArgoCD pipeline configuration:
.. Clone the Git repository.
.. Extract the ArgoCD deployment CRs from the ZTP site generator container using the latest container image version:
+
[source,terminal]
----
$ mkdir ztp
$ podman run --rm -v `pwd`/ztp:/mnt/ztp:Z registry.redhat.io/openshift4/ztp-site-generate-rhel8:v4.9.0-1 /bin/bash -c "cp -ar /usr/src/hook/ztp/* /mnt/ztp/"
----
+
The remaining steps in this section relate to the `ztp/gitops-subscriptions/argocd/` directory.
.. Modify the source values of the two ArgoCD applications, `deployment/clusters-app.yaml` and `deployment/policies-app.yaml` with appropriate URL, `targetRevision` branch, and path values. The path values must match those used in your Git repository.
+
@@ -53,7 +61,7 @@ spec:
syncOptions:
- CreateNamespace=true
----
<1> `path` is the branch that contains the `siteconfig` CRs for the clusters.
<1> `path` is the `ztp/gitops-subscriptions/argocd/` file path that contains the `siteconfig` CRs for the clusters.
<2> `repoURL` is the URL of the Git repository that contains the `siteconfig` custom resources that define site configuration for installing clusters.
<3> `targetRevision` is the branch on the Git repository that contains the relevant site configuration data.
@@ -89,7 +97,7 @@ spec:
syncOptions:
- CreateNamespace=true
----
<1> `path` is the branch that contains the `policygentemplates` CRs for the clusters.
<1> `path` is the `ztp/gitops-subscriptions/argocd/` file path that contains the `policygentemplates` CRs for the clusters.
<2> `repoURL` is the URL of the Git repository that contains the `policygentemplates` custom resources that specify configuration data for the site.
<3> `targetRevision` is the branch on the Git repository that contains the relevant configuration data.
@@ -97,5 +105,5 @@ spec:
+
[source,terminal]
----
oc apply -k ./deployment
$ oc apply -k ./deployment
----