Skip to content

Commit 9e66f0b

Browse files
CryptoRodeoCryptoRodeo
committed
Deploy Kite to public staging
Signed-off-by: Bryan Ramos <[email protected]>
1 parent 08a8ed8 commit 9e66f0b

File tree

10 files changed

+108
-45
lines changed

10 files changed

+108
-45
lines changed

‎argo-cd-apps/base/member/infra-deployments/konflux-kite/konflux-kite.yaml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,12 @@ spec:
2424
name: konflux-kite-{{nameNormalized}}
2525
spec:
2626
ignoreDifferences:
27-
# Ignore generated ConfigMap and Secret names with hash suffixes
27+
# Ignore generated ConfigMap with hash suffixes
2828
- kind: ConfigMap
2929
group: ""
3030
name: kite-config-*
3131
jsonPointers:
3232
- /data
33-
- kind: Secret
34-
group: ""
35-
name: kite-database-credentials-*
36-
jsonPointers:
37-
- /data
3833
project: default
3934
source:
4035
path: "{{values.sourceRoot}}/{{values.environment}}/{{values.clusterDir}}"

‎argo-cd-apps/overlays/konflux-public-staging/delete-applications.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,3 @@ kind: ApplicationSet
1111
metadata:
1212
name: nvme-storage-configurator
1313
$patch: delete
14-
---
15-
apiVersion: argoproj.io/v1alpha1
16-
kind: ApplicationSet
17-
metadata:
18-
name: konflux-kite
19-
$patch: delete

‎argo-cd-apps/overlays/staging-downstream/delete-applications.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,10 @@ kind: ApplicationSet
3636
metadata:
3737
name: kubearchive
3838
$patch: delete
39+
---
40+
# At this time we're starting with external staging
41+
apiVersion: argoproj.io/v1alpha1
42+
kind: ApplicationSet
43+
metadata:
44+
name: konflux-kite
45+
$patch: delete

‎components/konflux-kite/base/deployment.yaml

Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,27 @@ spec:
5858
valueFrom:
5959
secretKeyRef:
6060
name: kite-database-credentials
61-
key: password
61+
key: DB_PASSWORD
6262
- name: KITE_DB_USER
6363
valueFrom:
6464
secretKeyRef:
6565
name: kite-database-credentials
66-
key: username
66+
key: DB_USER
67+
- name: KITE_DB_HOST
68+
valueFrom:
69+
secretKeyRef:
70+
name: kite-database-credentials
71+
key: DB_HOST
72+
- name: KITE_DB_PORT
73+
valueFrom:
74+
secretKeyRef:
75+
name: kite-database-credentials
76+
key: DB_PORT
77+
- name: KITE_DB_NAME
78+
valueFrom:
79+
secretKeyRef:
80+
name: kite-database-credentials
81+
key: DB_NAME
6782
resources:
6883
requests:
6984
memory: 128Mi
@@ -98,12 +113,27 @@ spec:
98113
valueFrom:
99114
secretKeyRef:
100115
name: kite-database-credentials
101-
key: password
116+
key: DB_PASSWORD
102117
- name: KITE_DB_USER
103118
valueFrom:
104119
secretKeyRef:
105120
name: kite-database-credentials
106-
key: username
121+
key: DB_USER
122+
- name: KITE_DB_HOST
123+
valueFrom:
124+
secretKeyRef:
125+
name: kite-database-credentials
126+
key: DB_HOST
127+
- name: KITE_DB_PORT
128+
valueFrom:
129+
secretKeyRef:
130+
name: kite-database-credentials
131+
key: DB_PORT
132+
- name: KITE_DB_NAME
133+
valueFrom:
134+
secretKeyRef:
135+
name: kite-database-credentials
136+
key: DB_NAME
107137
startupProbe:
108138
httpGet:
109139
path: /health

‎components/konflux-kite/base/external-secrets/database-secret.yaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,11 @@ spec:
1717
target:
1818
creationPolicy: Owner
1919
deletionPolicy: Delete
20-
name: database-secret
20+
name: kite-database-credentials
21+
template:
22+
data:
23+
DB_USER: '{{ index . "db.user" }}'
24+
DB_PASSWORD: '{{ index . "db.password" }}'
25+
DB_HOST: '{{ index . "db.host" }}'
26+
DB_PORT: "5432"
27+
DB_NAME: '{{ index . "db.name" }}'

‎components/konflux-kite/base/kustomization.yaml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ resources:
66
- rbac.yaml
77
- deployment.yaml
88
- service.yaml
9+
- routes.yaml
910

1011
namespace: konflux-kite
1112

@@ -16,10 +17,6 @@ configMapGenerator:
1617
- KITE_PROJECT_ENV=production
1718
- KITE_HOST=0.0.0.0
1819
- KITE_PORT=8080
19-
- KITE_DB_HOST=postgresql
20-
- KITE_DB_PORT=5432
21-
- KITE_DB_USER=kite
22-
- KITE_DB_NAME=issuesdb
2320
- KITE_DB_SSL_MODE=require
2421
- KITE_LOG_LEVEL=info
2522
- KITE_LOG_FORMAT=json
@@ -32,10 +29,14 @@ configMapGenerator:
3229
- KITE_IDLE_TIMEOUT=60s
3330
- KITE_SHUTDOWN_TIMEOUT=10s
3431

32+
# Not using external secrets here for development env.
3533
secretGenerator:
3634
- name: kite-database-credentials
3735
namespace: konflux-kite
3836
type: Opaque
3937
literals:
40-
- username=kite
41-
- password=postgres
38+
- DB_USER=kite
39+
- DB_PASSWORD=postgres
40+
- DB_HOST=postgresql
41+
- DB_PORT=5432
42+
- DB_NAME=issuesdb

‎components/konflux-kite/base/routes.yaml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
---
2+
apiVersion: route.openshift.io/v1
3+
kind: Route
4+
metadata:
5+
name: konflux-kite-api
6+
namespace: konflux-kite
7+
labels:
8+
app: konflux-kite
9+
component: backend
10+
annotations:
11+
# Use the auto-generated TLS certificate
12+
service.beta.openshift.io/serving-cert-secret-name: konflux-kite-tls
13+
spec:
14+
to:
15+
kind: Service
16+
name: konflux-kite
17+
weight: 100
18+
port:
19+
targetPort: http
20+
tls:
21+
termination: edge
22+
destinationCACertificate: ""
23+
wildcardPolicy: None

‎components/konflux-kite/development/kustomization.yaml

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@ configMapGenerator:
1515
- KITE_PROJECT_ENV=development
1616
- KITE_HOST=0.0.0.0
1717
- KITE_PORT=8080
18-
- KITE_DB_HOST=postgresql
19-
- KITE_DB_PORT=5432
20-
- KITE_DB_USER=kite
21-
- KITE_DB_NAME=issuesdb
2218
- KITE_DB_SSL_MODE=disable
2319
- KITE_LOG_LEVEL=debug
2420
- KITE_LOG_FORMAT=text
@@ -34,16 +30,6 @@ configMapGenerator:
3430
- KITE_SHUTDOWN_TIMEOUT=10s
3531
behavior: replace
3632

37-
# Keep the same database credentials as base, or override if needed
38-
secretGenerator:
39-
- name: kite-database-credentials
40-
namespace: konflux-kite
41-
type: Opaque
42-
behavior: replace
43-
literals:
44-
- username=kite
45-
- password=postgres
46-
4733
patches:
4834
# Development-specific patches
4935
- patch: |-
@@ -64,4 +50,4 @@ patches:
6450
memory: 256Mi
6551
requests:
6652
cpu: 50m
67-
memory: 128Mi
53+
memory: 128Mi

‎components/konflux-kite/development/postgresql.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,17 @@ spec:
4343
valueFrom:
4444
secretKeyRef:
4545
name: kite-database-credentials
46-
key: username
46+
key: DB_USER
4747
- name: POSTGRESQL_PASSWORD
4848
valueFrom:
4949
secretKeyRef:
5050
name: kite-database-credentials
51-
key: password
51+
key: DB_PASSWORD
5252
- name: POSTGRESQL_DATABASE
5353
valueFrom:
54-
configMapKeyRef:
55-
name: kite-config
56-
key: KITE_DB_NAME
54+
secretKeyRef:
55+
name: kite-database-credentials
56+
key: DB_NAME
5757
volumeMounts:
5858
- name: postgresql-data
5959
mountPath: /var/lib/pgsql/data

‎components/konflux-kite/staging/stone-stg-rh01/kustomization.yaml

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,33 @@
11
apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33
resources:
4-
# only include secret for now, include base when ready to deploy kite to stone-stg-rh01
5-
# - ../../base
4+
- ../../base
65
- ../../base/external-secrets
6+
77
patches:
88
- path: database-secret-path.yaml
99
target:
1010
name: database-secret
1111
group: external-secrets.io
1212
version: v1beta1
1313
kind: ExternalSecret
14+
# Delete the base secret since we're using External Secret
15+
- patch: |-
16+
$patch: delete
17+
apiVersion: v1
18+
kind: Secret
19+
metadata:
20+
name: kite-database-credentials
21+
namespace: konflux-kite
22+
23+
# Only update some parts of the generated development configmap
24+
configMapGenerator:
25+
- name: kite-config
26+
namespace: konflux-kite
27+
literals:
28+
- KITE_PROJECT_ENV=staging
29+
- KITE_DB_SSL_MODE=require
30+
- KITE_LOG_LEVEL=info
31+
- KITE_LOG_FORMAT=json
32+
- KITE_FEATURE_NAMESPACE_CHECKING=true
33+
behavior: merge

0 commit comments

Comments
 (0)