Skip to content

chore(KFLUXUI-943): deploy kite to stone-stage-p01 #9620

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Dec 12, 2025
Merged

chore(KFLUXUI-943): deploy kite to stone-stage-p01 #9620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions argo-cd-apps/base/member/infra-deployments/konflux-kite/konflux-kite.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ spec:
# Staging clusters
- nameNormalized: stone-stg-rh01
values.clusterDir: stone-stg-rh01
- nameNormalized: stone-stage-p01
values.clusterDir: stone-stage-p01
template:
metadata:
name: konflux-kite-{{nameNormalized}}
Expand Down
6 changes: 0 additions & 6 deletions argo-cd-apps/overlays/staging-downstream/delete-applications.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,3 @@ metadata:
name: quality-dashboard
$patch: delete
---
# At this time we're starting with external staging
apiVersion: argoproj.io/v1alpha1
kind: ApplicationSet
metadata:
name: konflux-kite
$patch: delete
4 changes: 4 additions & 0 deletions components/konflux-kite/staging/stone-stage-p01/database-secret-path.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
- op: add
path: /spec/dataFrom/0/extract/key
value: integrations-output/external-resources/appsres11ue1/stonesoup-infra-stage/issues-dashboard-staging-rds
33 changes: 33 additions & 0 deletions components/konflux-kite/staging/stone-stage-p01/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
apiVersion: kustomize.config.k8s.io/v1beta1
Copy link
Contributor

@hugares hugares Dec 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

kite application is not deployed in staging-downtream overlay, you need to remove the patch deleting the application but also change the applicatset to generate application with right path. Here is the diff of what is missing:

git diff
diff --git a/argo-cd-apps/base/member/infra-deployments/konflux-kite/konflux-kite.yaml b/argo-cd-apps/base/member/infra-deployments/konflux-kite/konflux-kite.yaml
index d53caf967..63a1e29f0 100644
--- a/argo-cd-apps/base/member/infra-deployments/konflux-kite/konflux-kite.yaml
+++ b/argo-cd-apps/base/member/infra-deployments/konflux-kite/konflux-kite.yaml
@@ -19,6 +19,8 @@ spec:
                 # Staging clusters
                 - nameNormalized: stone-stg-rh01
                   values.clusterDir: stone-stg-rh01
+                - nameNormalized: stone-stage-p01
+                  values.clusterDir: stone-stage-p01
   template:
     metadata:
       name: konflux-kite-{{nameNormalized}}
diff --git a/argo-cd-apps/overlays/staging-downstream/delete-applications.yaml b/argo-cd-apps/overlays/staging-downstream/delete-applications.yaml
index 95c9b33ab..44583d45e 100644
--- a/argo-cd-apps/overlays/staging-downstream/delete-applications.yaml
+++ b/argo-cd-apps/overlays/staging-downstream/delete-applications.yaml
@@ -10,10 +10,3 @@ kind: ApplicationSet
 metadata:
   name: quality-dashboard
 $patch: delete
----
-# At this time we're starting with external staging
-apiVersion: argoproj.io/v1alpha1
-kind: ApplicationSet
-metadata:
-  name: konflux-kite
-$patch: delete

Copy link
Contributor Author

@JoaoPedroPP JoaoPedroPP Dec 12, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated in new version.

Out of curiosity, why did we need to delete konflux-kite ApplicationSet if we only had deploy set?

Copy link
Contributor

@hugares hugares Dec 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we deploy to all the clusters part of the overlay, without the delete applicationSet, it would have been deployed to all downstream staging cluster, i.e. stone-stage-p01

kind: Kustomization
resources:
- ../../base
- ../../base/external-secrets

patches:
- path: database-secret-path.yaml
target:
name: database-secret
group: external-secrets.io
version: v1beta1
kind: ExternalSecret
# Delete the base secret since we're using External Secret
- patch: |-
$patch: delete
apiVersion: v1
kind: Secret
metadata:
name: kite-database-credentials
namespace: konflux-kite

# Only update some parts of the generated development configmap
configMapGenerator:
- name: kite-config
namespace: konflux-kite
literals:
- KITE_PROJECT_ENV=staging
- KITE_DB_SSL_MODE=require
- KITE_LOG_LEVEL=info
- KITE_LOG_FORMAT=json
- KITE_FEATURE_NAMESPACE_CHECKING=true
behavior: merge
2 changes: 1 addition & 1 deletion components/konflux-kite/staging/stone-stg-rh01/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@ configMapGenerator:
- KITE_DB_SSL_MODE=require
- KITE_LOG_LEVEL=info
- KITE_LOG_FORMAT=json
- KITE_FEATURE_NAMESPACE_CHECKING=false
- KITE_FEATURE_NAMESPACE_CHECKING=true
behavior: merge
Loading