Skip to content

Commit 4e9c939

Browse files
s-wojciechowskis-wojciechowski
committed
feat(nx-cloud): update value structure
1 parent f27a37c commit 4e9c939

16 files changed

Lines changed: 154 additions & 172 deletions

‎charts/nx-cloud/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: nx-cloud
33
description: Nx Cloud Helm Chart
44
type: application
5-
version: 1.0.0-rc8
5+
version: 1.0.0-rc9
66
maintainers:
77
- name: nx
88
url: "https://nx.app/"

‎charts/nx-cloud/ci/additional-paths-values.yaml‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
global:
22
nxCloudAppURL: "https://nx.test"
3+
mongodbConnectionString:
4+
secretName: nx-cloud-credentials
5+
secretKey: NX_CLOUD_MONGO_SERVER_ENDPOINT
36

47
ingress:
58
enabled: true
@@ -20,7 +23,8 @@ ingress:
2023
number: 9090
2124

2225
extraObjects:
23-
- apiVersion: v1
26+
appSecrets:
27+
apiVersion: v1
2428
kind: Secret
2529
metadata:
2630
name: nx-cloud-credentials
@@ -36,10 +40,6 @@ aggregator:
3640
NX_CLOUD_SKIP_SLOW_AGGREGATOR_QUERIES: 'true'
3741
NX_CLOUD_LOG_OUTPUT_FORMAT: 'json'
3842
envValueFrom:
39-
NX_CLOUD_MONGO_SERVER_ENDPOINT:
40-
secretKeyRef:
41-
name: nx-cloud-credentials
42-
key: NX_CLOUD_MONGO_SERVER_ENDPOINT
4343
ADMIN_PASSWORD:
4444
secretKeyRef:
4545
name: nx-cloud-credentials
@@ -50,11 +50,6 @@ frontend:
5050
deployment:
5151
env:
5252
NX_API_INTERNAL_BASE_URL: 'http://nx-cloud-nx-api-service'
53-
envValueFrom:
54-
NX_CLOUD_MONGO_SERVER_ENDPOINT:
55-
secretKeyRef:
56-
name: nx-cloud-credentials
57-
key: NX_CLOUD_MONGO_SERVER_ENDPOINT
5853
resources: null
5954

6055
api:
@@ -73,10 +68,6 @@ api:
7368
VALKEY_USERNAME: "default"
7469
ACTIVEMQ_ADDRESS: tcp://nx-cloud-messagequeue:61616
7570
envValueFrom:
76-
NX_CLOUD_MONGO_SERVER_ENDPOINT:
77-
secretKeyRef:
78-
name: nx-cloud-credentials
79-
key: NX_CLOUD_MONGO_SERVER_ENDPOINT
8071
VALKEY_PASSWORD:
8172
secretKeyRef:
8273
name: nx-cloud-credentials

‎charts/nx-cloud/ci/agent-configuration-values.yaml‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
global:
22
nxCloudAppURL: "https://nx.test"
3+
mongodbConnectionString:
4+
secretName: nx-cloud-credentials
5+
secretKey: NX_CLOUD_MONGO_SERVER_ENDPOINT
36

47
config:
58
agentConfigs: |
@@ -85,7 +88,8 @@ config:
8588
- "windows-2022"
8689
8790
extraObjects:
88-
- apiVersion: v1
91+
appSecrets:
92+
apiVersion: v1
8993
kind: Secret
9094
metadata:
9195
name: nx-cloud-credentials
@@ -101,10 +105,6 @@ aggregator:
101105
NX_CLOUD_SKIP_SLOW_AGGREGATOR_QUERIES: 'true'
102106
NX_CLOUD_LOG_OUTPUT_FORMAT: 'json'
103107
envValueFrom:
104-
NX_CLOUD_MONGO_SERVER_ENDPOINT:
105-
secretKeyRef:
106-
name: nx-cloud-credentials
107-
key: NX_CLOUD_MONGO_SERVER_ENDPOINT
108108
ADMIN_PASSWORD:
109109
secretKeyRef:
110110
name: nx-cloud-credentials
@@ -115,11 +115,6 @@ frontend:
115115
deployment:
116116
env:
117117
NX_API_INTERNAL_BASE_URL: 'http://nx-cloud-nx-api-service'
118-
envValueFrom:
119-
NX_CLOUD_MONGO_SERVER_ENDPOINT:
120-
secretKeyRef:
121-
name: nx-cloud-credentials
122-
key: NX_CLOUD_MONGO_SERVER_ENDPOINT
123118
resources: null
124119

125120
api:
@@ -138,10 +133,6 @@ api:
138133
VALKEY_USERNAME: "default"
139134
ACTIVEMQ_ADDRESS: tcp://nx-cloud-messagequeue:61616
140135
envValueFrom:
141-
NX_CLOUD_MONGO_SERVER_ENDPOINT:
142-
secretKeyRef:
143-
name: nx-cloud-credentials
144-
key: NX_CLOUD_MONGO_SERVER_ENDPOINT
145136
VALKEY_PASSWORD:
146137
secretKeyRef:
147138
name: nx-cloud-credentials

‎charts/nx-cloud/ci/basic-values.yaml‎

Lines changed: 35 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,42 @@ global:
22
nxCloudAppURL: "https://nx.test"
33
imagePullSecrets:
44
- regcreds
5+
mongodbConnectionString:
6+
secretName: nx-cloud-credentials
7+
secretKey: NX_CLOUD_MONGO_SERVER_ENDPOINT
58

6-
objects:
7-
- apiVersion: v1
9+
# objects:
10+
# - apiVersion: v1
11+
# kind: Service
12+
# metadata:
13+
# name: backend-not-found
14+
# labels:
15+
# app: backend-not-found
16+
# app.kubernetes.io/name: nx-cloud
17+
# app.kubernetes.io/instance: nx-cloud
18+
# spec:
19+
# selector:
20+
# app: backend-not-found
21+
# type: ClusterIP
22+
# ports:
23+
# - name: http
24+
# port: 80
25+
# targetPort: 80
26+
27+
extraObjects:
28+
appSecrets:
29+
apiVersion: v1
30+
kind: Secret
31+
metadata:
32+
name: nx-cloud-credentials
33+
type: Opaque
34+
stringData:
35+
VALKEY_PASSWORD: password
36+
NX_CLOUD_MONGO_SERVER_ENDPOINT: mongodb://mongo-mongodb-0.mongo-mongodb-headless.mongodb.svc.cluster.local:27017
37+
ADMIN_PASSWORD: password
38+
39+
backendNotFoundService:
40+
apiVersion: v1
841
kind: Service
942
metadata:
1043
name: backend-not-found
@@ -21,27 +54,12 @@ objects:
2154
port: 80
2255
targetPort: 80
2356

24-
extraObjects:
25-
- apiVersion: v1
26-
kind: Secret
27-
metadata:
28-
name: nx-cloud-credentials
29-
type: Opaque
30-
stringData:
31-
VALKEY_PASSWORD: password
32-
NX_CLOUD_MONGO_SERVER_ENDPOINT: mongodb://mongo-mongodb-0.mongo-mongodb-headless.mongodb.svc.cluster.local:27017
33-
ADMIN_PASSWORD: password
34-
3557
aggregator:
3658
cronjob:
3759
env:
3860
NX_CLOUD_SKIP_SLOW_AGGREGATOR_QUERIES: 'true'
3961
NX_CLOUD_LOG_OUTPUT_FORMAT: 'json'
4062
envValueFrom:
41-
NX_CLOUD_MONGO_SERVER_ENDPOINT:
42-
secretKeyRef:
43-
name: nx-cloud-credentials
44-
key: NX_CLOUD_MONGO_SERVER_ENDPOINT
4563
ADMIN_PASSWORD:
4664
secretKeyRef:
4765
name: nx-cloud-credentials
@@ -52,11 +70,6 @@ frontend:
5270
deployment:
5371
env:
5472
NX_API_INTERNAL_BASE_URL: 'http://nx-cloud-nx-api-service'
55-
envValueFrom:
56-
NX_CLOUD_MONGO_SERVER_ENDPOINT:
57-
secretKeyRef:
58-
name: nx-cloud-credentials
59-
key: NX_CLOUD_MONGO_SERVER_ENDPOINT
6073
resources: null
6174

6275
api:
@@ -75,10 +88,6 @@ api:
7588
VALKEY_USERNAME: "default"
7689
ACTIVEMQ_ADDRESS: tcp://nx-cloud-messagequeue:61616
7790
envValueFrom:
78-
NX_CLOUD_MONGO_SERVER_ENDPOINT:
79-
secretKeyRef:
80-
name: nx-cloud-credentials
81-
key: NX_CLOUD_MONGO_SERVER_ENDPOINT
8291
VALKEY_PASSWORD:
8392
secretKeyRef:
8493
name: nx-cloud-credentials

‎charts/nx-cloud/ci/existing-serviceaccount-values.yaml‎

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
global:
22
nxCloudAppURL: "https://nx.test"
3+
mongodbConnectionString:
4+
secretName: nx-cloud-credentials
5+
secretKey: NX_CLOUD_MONGO_SERVER_ENDPOINT
36

47
extraObjects:
5-
- apiVersion: v1
8+
appSecrets:
9+
apiVersion: v1
610
kind: Secret
711
metadata:
812
name: nx-cloud-credentials
@@ -12,26 +16,26 @@ extraObjects:
1216
NX_CLOUD_MONGO_SERVER_ENDPOINT: mongodb://mongo-mongodb-0.mongo-mongodb-headless.mongodb.svc.cluster.local:27017
1317
ADMIN_PASSWORD: password
1418

15-
# Service account for file-server
16-
- apiVersion: v1
19+
fileServerServiceAccount:
20+
apiVersion: v1
1721
kind: ServiceAccount
1822
metadata:
1923
name: existing-file-server-sa
2024

21-
# Service account for aggregator
22-
- apiVersion: v1
25+
aggregatorServiceAccount:
26+
apiVersion: v1
2327
kind: ServiceAccount
2428
metadata:
2529
name: existing-aggregator-sa
2630

27-
# Service account for frontend
28-
- apiVersion: v1
31+
frontendServiceAccount:
32+
apiVersion: v1
2933
kind: ServiceAccount
3034
metadata:
3135
name: existing-frontend-sa
3236

33-
# Service account for api
34-
- apiVersion: v1
37+
apiServiceAccount:
38+
apiVersion: v1
3539
kind: ServiceAccount
3640
metadata:
3741
name: existing-api-sa
@@ -53,10 +57,6 @@ aggregator:
5357
NX_CLOUD_SKIP_SLOW_AGGREGATOR_QUERIES: 'true'
5458
NX_CLOUD_LOG_OUTPUT_FORMAT: 'json'
5559
envValueFrom:
56-
NX_CLOUD_MONGO_SERVER_ENDPOINT:
57-
secretKeyRef:
58-
name: nx-cloud-credentials
59-
key: NX_CLOUD_MONGO_SERVER_ENDPOINT
6060
ADMIN_PASSWORD:
6161
secretKeyRef:
6262
name: nx-cloud-credentials
@@ -71,7 +71,6 @@ frontend:
7171
env:
7272
NX_API_INTERNAL_BASE_URL: 'http://nx-cloud-nx-api-service'
7373
envValueFrom:
74-
NX_CLOUD_MONGO_SERVER_ENDPOINT:
7574
secretKeyRef:
7675
name: nx-cloud-credentials
7776
key: NX_CLOUD_MONGO_SERVER_ENDPOINT
@@ -96,10 +95,6 @@ api:
9695
VALKEY_USERNAME: "default"
9796
ACTIVEMQ_ADDRESS: tcp://nx-cloud-messagequeue:61616
9897
envValueFrom:
99-
NX_CLOUD_MONGO_SERVER_ENDPOINT:
100-
secretKeyRef:
101-
name: nx-cloud-credentials
102-
key: NX_CLOUD_MONGO_SERVER_ENDPOINT
10398
VALKEY_PASSWORD:
10499
secretKeyRef:
105100
name: nx-cloud-credentials

‎charts/nx-cloud/ci/file-server-values.yaml‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
global:
22
nxCloudAppURL: "https://nx.test"
3+
mongodbConnectionString:
4+
secretName: nx-cloud-credentials
5+
secretKey: NX_CLOUD_MONGO_SERVER_ENDPOINT
36

47
extraObjects:
5-
- apiVersion: v1
8+
appSecrets:
9+
apiVersion: v1
610
kind: Secret
711
metadata:
812
name: nx-cloud-credentials
@@ -63,10 +67,6 @@ api:
6367
VALKEY_USERNAME: "default"
6468
ACTIVEMQ_ADDRESS: tcp://nx-cloud-messagequeue:61616
6569
envValueFrom:
66-
NX_CLOUD_MONGO_SERVER_ENDPOINT:
67-
secretKeyRef:
68-
name: nx-cloud-credentials
69-
key: NX_CLOUD_MONGO_SERVER_ENDPOINT
7070
VALKEY_PASSWORD:
7171
secretKeyRef:
7272
name: nx-cloud-credentials
@@ -78,11 +78,6 @@ frontend:
7878
deployment:
7979
env:
8080
NX_API_INTERNAL_BASE_URL: 'http://nx-cloud-nx-api-service'
81-
envValueFrom:
82-
NX_CLOUD_MONGO_SERVER_ENDPOINT:
83-
secretKeyRef:
84-
name: nx-cloud-credentials
85-
key: NX_CLOUD_MONGO_SERVER_ENDPOINT
8681
resources: null
8782

8883
# Configure aggregator
@@ -92,10 +87,6 @@ aggregator:
9287
NX_CLOUD_SKIP_SLOW_AGGREGATOR_QUERIES: 'true'
9388
NX_CLOUD_LOG_OUTPUT_FORMAT: 'json'
9489
envValueFrom:
95-
NX_CLOUD_MONGO_SERVER_ENDPOINT:
96-
secretKeyRef:
97-
name: nx-cloud-credentials
98-
key: NX_CLOUD_MONGO_SERVER_ENDPOINT
9990
ADMIN_PASSWORD:
10091
secretKeyRef:
10192
name: nx-cloud-credentials

‎charts/nx-cloud/ci/labels-annotations-values.yaml‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
global:
22
nxCloudAppURL: "https://nx.test"
3+
mongodbConnectionString:
4+
secretName: nx-cloud-credentials
5+
secretKey: NX_CLOUD_MONGO_SERVER_ENDPOINT
36
labels:
47
dummy-global-label-1: "dummy-value-1"
58
dummy-global-label-2: "dummy-value-2"
@@ -16,7 +19,8 @@ ingress:
1619
dummy-ingress-label-2: "dummy-value-2"
1720

1821
extraObjects:
19-
- apiVersion: v1
22+
appSecrets:
23+
apiVersion: v1
2024
kind: Secret
2125
metadata:
2226
name: nx-cloud-credentials
@@ -79,10 +83,6 @@ aggregator:
7983
NX_CLOUD_SKIP_SLOW_AGGREGATOR_QUERIES: 'true'
8084
NX_CLOUD_LOG_OUTPUT_FORMAT: 'json'
8185
envValueFrom:
82-
NX_CLOUD_MONGO_SERVER_ENDPOINT:
83-
secretKeyRef:
84-
name: nx-cloud-credentials
85-
key: NX_CLOUD_MONGO_SERVER_ENDPOINT
8686
ADMIN_PASSWORD:
8787
secretKeyRef:
8888
name: nx-cloud-credentials
@@ -118,11 +118,6 @@ frontend:
118118
dummy-frontend-pod-label-2: "dummy-value-2"
119119
env:
120120
NX_API_INTERNAL_BASE_URL: 'http://nx-cloud-nx-api-service'
121-
envValueFrom:
122-
NX_CLOUD_MONGO_SERVER_ENDPOINT:
123-
secretKeyRef:
124-
name: nx-cloud-credentials
125-
key: NX_CLOUD_MONGO_SERVER_ENDPOINT
126121
resources: null
127122

128123
serviceAccount:
@@ -166,10 +161,6 @@ api:
166161
VALKEY_USERNAME: "default"
167162
ACTIVEMQ_ADDRESS: tcp://nx-cloud-messagequeue:61616
168163
envValueFrom:
169-
NX_CLOUD_MONGO_SERVER_ENDPOINT:
170-
secretKeyRef:
171-
name: nx-cloud-credentials
172-
key: NX_CLOUD_MONGO_SERVER_ENDPOINT
173164
VALKEY_PASSWORD:
174165
secretKeyRef:
175166
name: nx-cloud-credentials

0 commit comments

Comments
 (0)