Skip to content

Commit e971074

Browse files
authored
Merge pull request #134 from gtrivedi88/docs/fix-quay-link
Address SME feedback across all documentation pages
2 parents aa1cb7f + a0ac6d5 commit e971074

5 files changed

Lines changed: 80 additions & 22 deletions

File tree

docs/modules/ROOT/pages/getting-started.adoc

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,18 @@ For more details, see link:https://konflux-ci.dev/docs/building/creating/#with-t
5151

5252
After you create a component, {KonfluxName} automatically:
5353

54-
. **Sends a pull request** to your Git repository. This PR adds a build pipeline definition (`.tekton/` directory) that triggers on pull request and push events targeting the onboarded branch.
54+
. **Sends a pull request** to your Git repository. This PR adds Tekton pipeline definitions (`.tekton/` directory) that trigger on pull request and push events targeting the onboarded branch. Those pipelines control the lifecycle of changes submitted to the repository.
5555

56-
. **Configures a default integration test pipeline.** This pipeline runs automatically after each build to evaluate the artifacts against the configured policy. The integration test definition is stored as a Custom Resource in OpenShift and is not visible in your Git repository.
56+
. **Configures a default integration test pipeline.** This pipeline runs automatically after each build to evaluate the artifacts against the configured policy. The integration test definition is stored as a Custom Resource in {OCPShortName} and is not visible in your Git repository.
57+
+
58+
To view the integration test Custom Resource:
59+
+
60+
[source,bash]
61+
----
62+
oc get integrationtestscenarios -n <tenant-namespace>
63+
----
5764

58-
. **Creates CI checks** on the pull request (GitHub checks or GitLab webhooks, depending on your Git provider). Two checks appear:
65+
. **Creates CI checks** on the pull request. {KonfluxName} creates checks for both GitHub and GitLab. The difference is how the integration with {KonfluxName} is managed: for GitHub, a GitHub App is created ahead of time during installation; for GitLab, the webhook is created when the repository is onboarded. Two checks appear:
5966
* One for the build pipeline status
6067
* One for the integration test pipeline status
6168
+

docs/modules/ROOT/pages/installing.adoc

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Start the {TSFShortName} installer container using Podman. The installer runs in
2121
----
2222
podman run -it --rm --env-file tsf.env \
2323
--entrypoint bash -p 8228:8228 --pull always \
24-
{TSFInstallerImage} --login
24+
quay.io/redhat-ads/tsf-cli:unstable --login
2525
----
2626
+
2727
This command pulls the latest installer image and opens an interactive shell session inside the container. The `--login` flag sources the shell profile, and port 8228 is exposed for the GitHub App creation workflow.
@@ -93,6 +93,8 @@ products:
9393

9494
NOTE: The {TSFShortName} installer assumes a fresh cluster. If other {TSFShortName}-managed operators are already installed (such as Red Hat OpenShift Pipelines or {RHTASName}), set `manageSubscription: false` for each pre-installed component to prevent conflicts.
9595

96+
The `tsf-config` ConfigMap in the `tsf` namespace controls which components are installed. Each component has an `enabled` flag and a `manageSubscription` property. Set `manageSubscription` to `false` for any component that is already installed on the cluster.
97+
9698
=== Verification
9799

98100
Verify that the ConfigMap was created:
@@ -104,6 +106,13 @@ oc get configmap tsf-config -n tsf
104106

105107
The output shows the `tsf-config` ConfigMap in the `tsf` namespace.
106108

109+
To view the complete ConfigMap structure:
110+
111+
[source,bash]
112+
----
113+
oc get configmap tsf-config -n tsf -o yaml
114+
----
115+
107116
== Configure the GitHub integration
108117

109118
Create and install a GitHub App that enables {TSFShortName} to interact with your GitHub repositories. The GitHub App provides webhooks for triggering builds and access to repository contents.
@@ -175,11 +184,11 @@ If you are using GitLab instead of GitHub, configure the GitLab integration. Cre
175184
----
176185
oc create secret generic gitlab-auth-secret \
177186
-n <tenant-namespace> \
178-
--from-literal=password=<project-access-token> \
187+
--from-literal=password="$GITLAB__TOKEN" \
179188
--type=kubernetes.io/basic-auth
180189
----
181190
+
182-
Replace `<tenant-namespace>` with your tenant namespace and `<project-access-token>` with the token you copied.
191+
The default tenant namespace is `default-tenant`. If multiple namespaces are used, the secret must be created in each namespace where you onboard components. For more information about tenant namespaces, see link:https://konflux-ci.dev/docs/advanced-how-tos/managing/environments/[Managing environments] in the {KonfluxName} documentation.
183192

184193
. Label the secret so that {KonfluxName} can discover it:
185194
+
@@ -196,10 +205,8 @@ oc label secret gitlab-auth-secret \
196205
----
197206
oc annotate secret gitlab-auth-secret \
198207
-n <tenant-namespace> \
199-
appstudio.redhat.com/scm.host=gitlab.com
208+
appstudio.redhat.com/scm.host="$GITLAB__HOST"
200209
----
201-
+
202-
Replace `gitlab.com` with the hostname of your GitLab instance if you are using a self-hosted instance.
203210

204211
=== Verification
205212

docs/modules/ROOT/pages/preparing-to-install.adoc

Lines changed: 43 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,18 +50,20 @@ Create a Quay organization and generate an OAuth token. The {TSFShortName} insta
5050

5151
Follow the Quay documentation to complete these steps:
5252

53-
. link:https://docs.quay.io/guides/create-org.html[Create an organization] in your Quay registry.
54-
. link:https://docs.quay.io/api/[Create an OAuth application] within the organization and generate an access token with all permission scopes.
53+
. link:https://docs.quay.io/glossary/organizations.html[Create an organization] in your Quay registry.
54+
. link:https://docs.quay.io/glossary/access-token.html[Create an OAuth access token] within the organization and generate an access token with all permission scopes.
5555

5656
Copy the access token and save it securely. Use this token in the next step when preparing the environment file.
5757

5858
== Prepare the environment file
5959

60-
Create an environment file that contains the credentials and configuration for your {OCPShortName} cluster, GitHub organization, and Quay registry. The {TSFShortName} installer reads this file to configure all integrations.
60+
Create an environment file that contains the credentials and configuration for your {OCPShortName} cluster, Git provider, and Quay registry. The {TSFShortName} installer reads this file to configure all integrations.
6161

6262
=== Steps
6363

64-
. Create a file named `tsf.env` in your working directory with the following content:
64+
. Create a file named `tsf.env` in your working directory. Include the variables for your Git provider (GitHub or GitLab), along with the {OCPShortName} and Quay variables.
65+
+
66+
If you are using **GitHub**:
6567
+
6668
[source,bash]
6769
----
@@ -73,6 +75,26 @@ OCP__API_ENDPOINT=<your_cluster_api_url>
7375
OCP__USERNAME=<your_cluster_admin_username>
7476
OCP__PASSWORD=<your_cluster_admin_password>
7577
78+
# Quay registry
79+
QUAY__API_TOKEN=<your_quay_oauth_token>
80+
QUAY__ORG=<your_quay_organization>
81+
QUAY__URL=<your_quay_url>
82+
----
83+
+
84+
If you are using **GitLab**:
85+
+
86+
[source,bash]
87+
----
88+
# gitlab.com
89+
GITLAB__HOST=gitlab.com
90+
GITLAB__GROUP=<your_gitlab_group>
91+
GITLAB__TOKEN=glpat-xxxx
92+
93+
# OpenShift
94+
OCP__API_ENDPOINT=<your_cluster_api_url>
95+
OCP__USERNAME=<your_cluster_admin_username>
96+
OCP__PASSWORD=<your_cluster_admin_password>
97+
7698
# Quay registry
7799
QUAY__API_TOKEN=<your_quay_oauth_token>
78100
QUAY__ORG=<your_quay_organization>
@@ -85,9 +107,24 @@ QUAY__URL=<your_quay_url>
85107
|===
86108
| Variable | Description
87109

110+
2+h| GitHub
111+
88112
| `GITHUB__ORG`
89113
| The name of the GitHub organization to use with {TSFShortName}.
90114

115+
2+h| GitLab
116+
117+
| `GITLAB__HOST`
118+
| The hostname of your GitLab instance. For example: `gitlab.com`. Replace with your self-hosted instance hostname if applicable.
119+
120+
| `GITLAB__GROUP`
121+
| The name of the GitLab group that contains the projects to onboard.
122+
123+
| `GITLAB__TOKEN`
124+
| A GitLab Project Access Token with the *Maintainer* role and `api`, `read_repository`, `write_repository` scopes.
125+
126+
2+h| OpenShift
127+
91128
| `OCP__API_ENDPOINT`
92129
| The full URL of the {OCPShortName} cluster API endpoint. For example: `\https://api.example.com:6443`.
93130

@@ -97,6 +134,8 @@ QUAY__URL=<your_quay_url>
97134
| `OCP__PASSWORD`
98135
| The password for the cluster administrator user.
99136

137+
2+h| Quay registry
138+
100139
| `QUAY__API_TOKEN`
101140
| The OAuth token you generated for your Quay organization.
102141

docs/modules/ROOT/pages/troubleshooting.adoc

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,17 @@
11
= Troubleshooting {TSFShortName} installation
2+
:toc:
23

34
Use this guide to diagnose and resolve common issues during {TSFShortName} installation and deployment.
45

6+
**On this page:**
7+
8+
* <<quay-token-error-during-deployment>>
9+
* <<cert-manager-subscription-conflict>>
10+
* <<rhtpa-ui-url-is-not-accessible>>
11+
* <<deployment-appears-to-hang>>
12+
* <<browser-fails-to-open-during-github-integration>>
13+
14+
[id="quay-token-error-during-deployment"]
515
== Quay token error during deployment
616

717
**Symptom:** The `{TSFCli} deploy` command fails at the `tsf-konflux` chart with:
@@ -40,6 +50,7 @@ tsf integration quay \
4050
tsf deploy
4151
----
4252

53+
[id="cert-manager-subscription-conflict"]
4354
== Cert-Manager subscription conflict
4455

4556
**Symptom:** The deployment fails with a subscription conflict error for the Cert-Manager operator.
@@ -55,6 +66,7 @@ oc edit configmap tsf-config -n tsf
5566

5667
Locate the Cert-Manager entry and change `manageSubscription: true` to `manageSubscription: false`. Then re-run the deployment.
5768

69+
[id="rhtpa-ui-url-is-not-accessible"]
5870
== {RHTPAName} UI URL is not accessible
5971

6072
**Symptom:** The RHTPA UI URL displayed in the deployment output shows `server%s(<nil>)` or returns an error.
@@ -91,6 +103,7 @@ oc logs -n tsf-tpa deployment/rhtpa-operator
91103
oc get routes -n tsf-tpa
92104
----
93105

106+
[id="deployment-appears-to-hang"]
94107
== Deployment appears to hang
95108

96109
**Symptom:** The `{TSFCli} deploy` command runs for an extended period without producing any output.
@@ -106,6 +119,7 @@ oc get pods -A --watch
106119

107120
Wait for the deployment to complete. The full process typically takes about 15 minutes.
108121

122+
[id="browser-fails-to-open-during-github-integration"]
109123
== Browser fails to open during GitHub integration
110124

111125
**Symptom:** The `{TSFCli} integration github --create` command logs an error:

docs/modules/ROOT/pages/verifying-and-accessing.adoc

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -90,15 +90,6 @@ The installer also creates the following supporting namespaces:
9090
* `rhbk-operator`
9191
* `rhtpa-operator`
9292

93-
The `tsf-config` ConfigMap in the `tsf` namespace controls which components are installed. Each component has an `enabled` flag and a `manageSubscription` property. Set `manageSubscription` to `false` for any component that is already installed on the cluster.
94-
95-
To view the complete ConfigMap structure:
96-
97-
[source,bash]
98-
----
99-
oc get configmap tsf-config -n tsf -o yaml
100-
----
101-
10293
== Next step
10394

10495
Proceed to xref:getting-started.adoc[Getting started with {TSFShortName}] to onboard your first application.

0 commit comments

Comments
 (0)