Skip to content

Commit 924684b

Browse files
gabriel-rhgabriel-rh
authored
Merge pull request #65212 from openshift/revert-65181-switch-gitops-to-standalone
Revert "Switch GitOps to standalone "
2 parents e34739a + 81c4578 commit 924684b

28 files changed

+679
-59
lines changed

‎_topic_maps/_topic_map.yml

Lines changed: 44 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1947,8 +1947,50 @@ Topics:
19471947
Dir: gitops
19481948
Distros: openshift-enterprise
19491949
Topics:
1950-
- Name: About OpenShift GitOps
1951-
File: about-redhat-openshift-gitops
1950+
- Name: OpenShift GitOps release notes
1951+
File: gitops-release-notes
1952+
- Name: Understanding OpenShift GitOps
1953+
File: understanding-openshift-gitops
1954+
- Name: Installing OpenShift GitOps
1955+
File: installing-openshift-gitops
1956+
- Name: Uninstalling OpenShift GitOps
1957+
File: uninstalling-openshift-gitops
1958+
- Name: Setting up a new Argo CD instance
1959+
File: setting-up-argocd-instance
1960+
- Name: Monitoring Argo CD instances
1961+
File: monitoring-argo-cd-instances
1962+
- Name: Using Argo Rollouts for progressive deployment delivery
1963+
File: using-argo-rollouts-for-progressive-deployment-delivery
1964+
- Name: Configuring an OpenShift cluster by deploying an application with cluster configurations
1965+
File: configuring-an-openshift-cluster-by-deploying-an-application-with-cluster-configurations
1966+
- Name: Deploying a Spring Boot application with Argo CD
1967+
File: deploying-a-spring-boot-application-with-argo-cd
1968+
- Name: Argo CD custom resource properties
1969+
File: argo-cd-custom-resource-properties
1970+
- Name: Configuring secure communication with Redis
1971+
File: configuring-secure-communication-with-redis
1972+
- Name: Monitoring application health status
1973+
File: health-information-for-resources-deployment
1974+
- Name: Configuring SSO for Argo CD using Dex
1975+
File: configuring-sso-on-argo-cd-using-dex
1976+
- Name: Configuring SSO for Argo CD using Keycloak
1977+
File: configuring-sso-for-argo-cd-using-keycloak
1978+
- Name: Configuring Argo CD RBAC
1979+
File: configuring-argo-cd-rbac
1980+
- Name: Configuring Resource Quota
1981+
File: configuring-resource-quota
1982+
- Name: Monitoring Argo CD custom resource workloads
1983+
File: monitoring-argo-cd-custom-resource-workloads
1984+
- Name: Viewing Argo CD logs
1985+
File: viewing-argo-cd-logs
1986+
- Name: Running Control Plane Workloads on Infra nodes
1987+
File: run-gitops-control-plane-workload-on-infra-nodes
1988+
- Name: Sizing requirements for GitOps Operator
1989+
File: about-sizing-requirements-gitops
1990+
- Name: Collecting debugging data for a support case
1991+
File: collecting-debugging-data-for-support
1992+
- Name: Troubleshooting issues in GitOps
1993+
File: troubleshooting-issues-in-GitOps
19521994
- Name: Jenkins
19531995
Dir: jenkins
19541996
Distros: openshift-enterprise

‎cicd/gitops/about-redhat-openshift-gitops.adoc

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

‎cicd/gitops/about-sizing-requirements-gitops.adoc

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
:_content-type: ASSEMBLY
2+
[id="about-sizing-requirements-gitops"]
3+
= Sizing requirements for GitOps Operator
4+
include::_attributes/common-attributes.adoc[]
5+
:context: about-sizing-requirements-gitops
6+
7+
toc::[]
8+
9+
[role="_abstract"]
10+
The sizing requirements page displays the sizing requirements for installing {gitops-title} on {product-title}. It also provides the sizing details for the default ArgoCD instance that is instantiated by the GitOps Operator.
11+
12+
include::modules/sizing-requirements-for-gitops.adoc[leveloffset=+1]

‎cicd/gitops/argo-cd-custom-resource-properties.adoc

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
:_content-type: ASSEMBLY
2+
[id="argo-cd-custom-resource-properties"]
3+
= Argo CD Operator
4+
include::_attributes/common-attributes.adoc[]
5+
:context: argo-cd-custom-resource-properties
6+
7+
toc::[]
8+
9+
[role="_abstract"]
10+
The `ArgoCD` custom resource is a Kubernetes Custom Resource (CRD) that describes the desired state for a given Argo CD cluster that allows you to configure the components which make up an Argo CD cluster.
11+
12+
include::modules/argo-cd-command-line.adoc[leveloffset=+1]
13+
include::modules/gitops-argo-cd-properties.adoc[leveloffset=+1]
14+
include::modules/gitops-repo-server-properties.adoc[leveloffset=+1]
15+
include::modules/gitops-argo-cd-notification.adoc[leveloffset=+1]

‎cicd/gitops/collecting-debugging-data-for-support.adoc

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
:_content-type: ASSEMBLY
2+
[id="collecting-debugging-data-for-support"]
3+
= Collecting debugging data for a support case
4+
include::_attributes/common-attributes.adoc[]
5+
:context: collecting-debugging-data-for-support
6+
7+
toc::[]
8+
9+
When you open a support case, you must provide debugging information about your cluster to the Red Hat Support team. You can use the `must-gather` tool to collect diagnostic information for project-level resources, cluster-level resources, and {gitops-title} components. 
10+
11+
[NOTE]
12+
====
13+
For prompt support, provide diagnostic information for both {product-title} and {gitops-title}.
14+
====
15+
16+
include::modules/about-must-gather.adoc[leveloffset=+1]
17+
include::modules/collecting-gitops-debugging-data.adoc[leveloffset=+1]

‎cicd/gitops/configuring-an-openshift-cluster-by-deploying-an-application-with-cluster-configurations.adoc

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
:_content-type: ASSEMBLY
2+
[id="configuring-an-openshift-cluster-by-deploying-an-application-with-cluster-configurations"]
3+
= Configuring an OpenShift cluster by deploying an application with cluster configurations
4+
include::_attributes/common-attributes.adoc[]
5+
:context: configuring-an-openshift-cluster-by-deploying-an-application-with-cluster-configurations
6+
7+
toc::[]
8+
9+
With {gitops-title}, you can configure Argo CD to recursively sync the content of a Git directory with an application that contains custom configurations for your cluster.
10+
11+
.Prerequisites
12+
13+
* You have logged in to the {product-title} cluster as an administrator.
14+
* You have installed the {gitops-title} Operator in your cluster.
15+
* You have logged into Argo CD instance.
16+
17+
include::modules/gitops-using-argo-cd-instance-to-manage-cluster-scoped-resources.adoc[leveloffset=+1]
18+
19+
include::modules/gitops-default-permissions-of-an-argocd-instance.adoc[leveloffset=+1]
20+
21+
include::modules/go-run-argo-cd-instance-on-infrastructure-nodes.adoc[leveloffset=+1]
22+
23+
[role="_additional-resources"]
24+
.Additional resources
25+
* To learn more about taints and tolerations, see xref:../../nodes/scheduling/nodes-scheduler-taints-tolerations.adoc#nodes-scheduler-taints-tolerations[Controlling pod placement using node taints].
26+
* For more information on infrastructure machine sets, see xref:../../machine_management/creating-infrastructure-machinesets.adoc#creating-infrastructure-machinesets[Creating infrastructure machine sets].
27+
28+
include::modules/gitops-creating-an-application-by-using-the-argo-cd-dashboard.adoc[leveloffset=+1]
29+
30+
include::modules/gitops-creating-an-application-by-using-the-oc-tool.adoc[leveloffset=+1]
31+
32+
include::modules/gitops-synchronizing-your-application-application-with-your-git-repository.adoc[leveloffset=+1]
33+
34+
include::modules/gitops-inbuilt-permissions-for-cluster-config.adoc[leveloffset=+1]
35+
36+
include::modules/gitops-additional-permissions-for-cluster-config.adoc[leveloffset=+1]
37+
38+
include::modules/gitops-installing-olm-operators-using-gitops.adoc[leveloffset=+1]

‎cicd/gitops/configuring-argo-cd-rbac.adoc

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
:_content-type: ASSEMBLY
2+
[id="configuring-argo-cd-rbac"]
3+
= Configuring Argo CD RBAC
4+
include::_attributes/common-attributes.adoc[]
5+
:context: configuring-argo-cd-rbac
6+
7+
toc::[]
8+
9+
[role="_abstract"]
10+
By default, if you are logged into Argo CD using RHSSO, you are a read-only user. You can change and manage the user level access.
11+
12+
include::modules/configuring-user-level-access.adoc[leveloffset=+1]
13+
include::modules/modify-rhsso-requests-limits.adoc[leveloffset=+1]

‎cicd/gitops/configuring-resource-quota.adoc

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
:_content-type: ASSEMBLY
2+
[id="configuring-resource-quota"]
3+
= Configuring resource quota or requests
4+
include::_attributes/common-attributes.adoc[]
5+
:context: configuring-resource-quota
6+
7+
toc::[]
8+
9+
[role="_abstract"]
10+
With the Argo CD Custom Resource, you can create, update, and delete resource requests and limits for Argo CD workloads.
11+
12+
include::modules/configure-workloads.adoc[leveloffset=+1]
13+
include::modules/patch-argocd-instance.adoc[leveloffset=+1]
14+
include::modules/remove-resource-requirements.adoc[leveloffset=+1]

‎cicd/gitops/configuring-secure-communication-with-redis.adoc

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
:_content-type: ASSEMBLY
2+
[id="configuring-secure-communication-with-redis"]
3+
= Configuring secure communication with Redis
4+
include::_attributes/common-attributes.adoc[]
5+
:context: configuring-secure-communication-with-redis
6+
7+
toc::[]
8+
9+
Using the Transport Layer Security (TLS) encryption with {gitops-title}, you can secure the communication between the Argo CD components and Redis cache and protect the possibly sensitive data in transit.
10+
11+
You can secure communication with Redis by using one of the following configurations:
12+
13+
* Enable the `autotls` setting to issue an appropriate certificate for TLS encryption.
14+
* Manually configure the TLS encryption by creating the `argocd-operator-redis-tls` secret with a key and certificate pair.
15+
16+
Both configurations are possible with or without the High Availability (HA) enabled.
17+
18+
.Prerequisites
19+
* You have access to the cluster with `cluster-admin` privileges.
20+
* You have access to the {product-title} web console.
21+
* {gitops-title} Operator is installed on your cluster.
22+
23+
include::modules/gitops-configuring-tls-for-redis-with-autotls-enabled.adoc[leveloffset=+1]
24+
25+
include::modules/gitops-configuring-tls-for-redis-with-autotls-disabled.adoc[leveloffset=+1]
26+
27+

‎cicd/gitops/configuring-sso-for-argo-cd-on-openshift.adoc

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
:_content-type: ASSEMBLY
2+
[id="configuring-sso-for-argo-cd-on-openshift"]
3+
= Configuring SSO for Argo CD on OpenShift
4+
include::_attributes/common-attributes.adoc[]
5+
:context: configuring-sso-for-argo-cd-on-openshift
6+
7+
toc::[]
8+
9+
After the {gitops-title} Operator is installed, Argo CD automatically creates a user with `admin` permissions. To manage multiple users, Argo CD allows cluster administrators to configure SSO.
10+
11+
.Prerequisites
12+
* Red Hat SSO is installed on the cluster.
13+
14+
include::modules/gitops-creating-a-new-client-in-keycloak.adoc[leveloffset=+1]
15+
16+
include::modules/gitops-configuring-the-groups-claim.adoc[leveloffset=+1]
17+
18+
include::modules/gitops-configuring-argo-cd-oidc.adoc[leveloffset=+1]
19+
20+
include::modules/gitops-keycloak-identity-brokering-with-openshift-oauthclient.adoc[leveloffset=+1]
21+
22+
include::modules/gitops-registering-an-additional-oauth-client.adoc[leveloffset=+1]
23+
24+
include::modules/gitops-configuring-groups-and-argocd-rbac.adoc[leveloffset=+1]
25+
26+
//include::modules/gitops-enabling-dex.adoc[leveloffset=+1]
27+
28+
include::modules/gitops-in-built-permissions.adoc[leveloffset=+1]
29+
30+
////
31+
[role="_additional-resources"]
32+
.Additional resources
33+
* link:https://stedolan.github.io/jq/[`jq` command-line JSON processor documentation.]
34+
* link:https://argoproj.github.io/argo-cd/operator-manual/rbac/[Argo CD upstream documentation, RBAC Configuration section].
35+
////

0 commit comments

Comments
 (0)