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 d53caf96737..63a1e29f0f3 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 95c9b33ab2b..78631c2bad4 100644 --- a/argo-cd-apps/overlays/staging-downstream/delete-applications.yaml +++ b/argo-cd-apps/overlays/staging-downstream/delete-applications.yaml @@ -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 diff --git a/components/konflux-kite/staging/stone-stage-p01/database-secret-path.yaml b/components/konflux-kite/staging/stone-stage-p01/database-secret-path.yaml new file mode 100644 index 00000000000..4a112ca15f8 --- /dev/null +++ b/components/konflux-kite/staging/stone-stage-p01/database-secret-path.yaml @@ -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 diff --git a/components/konflux-kite/staging/stone-stage-p01/kustomization.yaml b/components/konflux-kite/staging/stone-stage-p01/kustomization.yaml new file mode 100644 index 00000000000..f8896ca1df4 --- /dev/null +++ b/components/konflux-kite/staging/stone-stage-p01/kustomization.yaml @@ -0,0 +1,33 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +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 diff --git a/components/konflux-kite/staging/stone-stg-rh01/kustomization.yaml b/components/konflux-kite/staging/stone-stg-rh01/kustomization.yaml index bff25e740e0..f8896ca1df4 100644 --- a/components/konflux-kite/staging/stone-stg-rh01/kustomization.yaml +++ b/components/konflux-kite/staging/stone-stg-rh01/kustomization.yaml @@ -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