update console URLs for staging clusters

[filariow]

follows up to #6187, #6125, #6089

Signed-off-by: Francesco Ilario [email protected]

[enarha]

1. deploy.yaml files should not be updated manually, instead one should update the base file for the environment https://github.com/redhat-appstudio/infra-deployments/blob/main/components/pipeline-service/staging/base/main-pipeline-service-configuration.yaml and run the https://github.com/redhat-appstudio/infra-deployments/blob/main/hack/generate-deploy-config.sh as in the help message, replacing production with staging for the staging envionment. This will update and keep in sync the deploy.yaml files. If the change is intended for a single cluster (not all staging/prod clusters), use a kustomization.
2. We keep the development overlay https://github.com/redhat-appstudio/infra-deployments/blob/main/components/pipeline-service/development/main-pipeline-service-configuration.yaml in sync with staging. We always update both envs together, because the development overlay is what the CI tests.
3. I also see some unrelated changes (updating the SCC)

[filariow]

@enarha thanks for the feedback. I followed the procedure you posted to generate these changes.

It seems something in current main branch status is not correct, as I get diff below (collapsed) when I run the script on main:

git clone https://github.com/redhat-appstudio/infra-deployments
cd infra-deployments
./hack/generate-deploy-config.sh -c components/pipeline-service/staging

click here for git diff result

diff --git a/components/pipeline-service/staging/stone-stage-p01/deploy.yaml b/components/pipeline-service/staging/stone-stage-p01/deploy.yaml
index 668804b5..ad4506cf 100644
--- a/components/pipeline-service/staging/stone-stage-p01/deploy.yaml
+++ b/components/pipeline-service/staging/stone-stage-p01/deploy.yaml
@@ -2450,10 +2450,10 @@ spec:
         settings:
           application-name: Konflux Staging Internal
           custom-console-name: Konflux Staging Internal
-          custom-console-url: https://konflux.apps.stone-stage-p01.hpmt.p1.openshiftapps.com/application-pipeline
-          custom-console-url-pr-details: https://konflux.apps.stone-stage-p01.hpmt.p1.openshiftapps.com/application-pipeline/ns/{{
+          custom-console-url: https://konflux-ui.apps.stone-stage-p01.hpmt.p1.openshiftapps.com
+          custom-console-url-pr-details: https://konflux-ui.apps.stone-stage-p01.hpmt.p1.openshiftapps.com/ns/{{
             namespace }}/pipelinerun/{{ pr }}
-          custom-console-url-pr-tasklog: https://konflux.apps.stone-stage-p01.hpmt.p1.openshiftapps.com/application-pipeline/ns/{{
+          custom-console-url-pr-tasklog: https://konflux-ui.apps.stone-stage-p01.hpmt.p1.openshiftapps.com/ns/{{
             namespace }}/pipelinerun/{{ pr }}/logs/{{ task }}
           remember-ok-to-test: "false"
   profile: all
@@ -2576,7 +2576,7 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
     argocd.argoproj.io/sync-wave: "0"
-  name: appstudio-pipelines-scc
+  name: appstudio-pipelines-nested-containerization-scc
 priority: 10
 readOnlyRootFilesystem: false
 requiredDropCapabilities:
@@ -2584,6 +2584,8 @@ requiredDropCapabilities:
 runAsUser:
   type: RunAsAny
 seLinuxContext:
+  seLinuxOptions:
+    type: container_runtime_t
   type: MustRunAs
 supplementalGroups:
   type: RunAsAny
@@ -2616,7 +2618,7 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
     argocd.argoproj.io/sync-wave: "0"
-  name: appstudio-pipelines-nested-containerization-scc
+  name: appstudio-pipelines-scc
 priority: 10
 readOnlyRootFilesystem: false
 requiredDropCapabilities:
@@ -2625,8 +2627,6 @@ runAsUser:
   type: RunAsAny
 seLinuxContext:
   type: MustRunAs
-  seLinuxOptions:
-    type: container_runtime_t
 supplementalGroups:
   type: RunAsAny
 users: []
diff --git a/components/pipeline-service/staging/stone-stg-rh01/deploy.yaml b/components/pipeline-service/staging/stone-stg-rh01/deploy.yaml
index ffa3e4c6..0122be2e 100644
--- a/components/pipeline-service/staging/stone-stg-rh01/deploy.yaml
+++ b/components/pipeline-service/staging/stone-stg-rh01/deploy.yaml
@@ -2462,10 +2462,10 @@ spec:
         settings:
           application-name: Konflux Staging
           custom-console-name: Konflux Staging
-          custom-console-url: https://konflux-ui.apps.stone-stg-rh01.l2vh.p1.openshiftapps.com/
-          custom-console-url-pr-details: https://konflux-ui.apps.stone-stg-rh01.l2vh.p1.openshiftapps.com/ns/{{
+          custom-console-url: https://console.dev.redhat.com/application-pipeline
+          custom-console-url-pr-details: https://console.dev.redhat.com/application-pipeline/ns/{{
             namespace }}/pipelinerun/{{ pr }}
-          custom-console-url-pr-tasklog: https://konflux-ui.apps.stone-stg-rh01.l2vh.p1.openshiftapps.com/ns/{{
+          custom-console-url-pr-tasklog: https://console.dev.redhat.com/application-pipeline/ns/{{
             namespace }}/pipelinerun/{{ pr }}/logs/{{ task }}
   profile: all
   pruner:
@@ -2587,7 +2587,7 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
     argocd.argoproj.io/sync-wave: "0"
-  name: appstudio-pipelines-scc
+  name: appstudio-pipelines-nested-containerization-scc
 priority: 10
 readOnlyRootFilesystem: false
 requiredDropCapabilities:
@@ -2595,6 +2595,8 @@ requiredDropCapabilities:
 runAsUser:
   type: RunAsAny
 seLinuxContext:
+  seLinuxOptions:
+    type: container_runtime_t
   type: MustRunAs
 supplementalGroups:
   type: RunAsAny
@@ -2627,7 +2629,7 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
     argocd.argoproj.io/sync-wave: "0"
-  name: appstudio-pipelines-nested-containerization-scc
+  name: appstudio-pipelines-scc
 priority: 10
 readOnlyRootFilesystem: false
 requiredDropCapabilities:
@@ -2636,8 +2638,6 @@ runAsUser:
   type: RunAsAny
 seLinuxContext:
   type: MustRunAs
-  seLinuxOptions:
-    type: container_runtime_t
 supplementalGroups:
   type: RunAsAny
 users: []

How do you suggest to proceed?

[enarha]

some previous changes did not update properly the deploy.yaml configs, getting the base out of sync with the per cluster deploy.yaml files. I've opened #6272 to get things in sync. Once we get that merged, you can rebase your PR and get the proper diff.

You also missed to update the development overlay. See 2. from my previous comment. It is a standalone file, you do not need to generate configs for development, just update the main file.

[enarha]

@filariow feel free to rebase this PR.

[filariow]

@enarha thanks! rebased

[hugares]

/lgtm

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: filariow, hugares

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• components/pipeline-service/OWNERS [hugares]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[enarha]

/lgtm