Skip to content

Commit f38f570

Browse files
yesidevelopyesidevelop
committed
updated charts
1 parent c375657 commit f38f570

File tree

10 files changed

+252
-97
lines changed

10 files changed

+252
-97
lines changed

‎charts/curriki/templates/api-ing.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ metadata:
99
spec:
1010
tls:
1111
- hosts:
12-
- stage.currikistudio.org
12+
- {{.Values.host}}
1313
secretName: letsencrypt
1414
rules:
15-
- host: stage.currikistudio.org
15+
- host: {{.Values.host}}
1616
http:
1717
paths:
1818
- pathType: Prefix

‎charts/curriki/templates/api.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ spec:
6565
- name: nfs-volume
6666
nfs:
6767
server: {{ .Values.nfsServer }}
68-
path: /mnt/storage
68+
path: {{ .Values.volumePath }}
6969
readOnly: no
7070

7171

@@ -171,7 +171,7 @@ spec:
171171
- name: nfs-volume
172172
nfs:
173173
server: {{ .Values.nfsServer }}
174-
path: /mnt/storage
174+
path: {{ .Values.volumePath }}
175175
readOnly: no
176176

177177

@@ -225,7 +225,7 @@ spec:
225225
- name: nfs-volume
226226
nfs:
227227
server: {{ .Values.nfsServer }}
228-
path: /mnt/storage
228+
path: {{ .Values.volumePath }}
229229
readOnly: no
230230
backoffLimit: 4
231231

@@ -278,5 +278,5 @@ spec:
278278
- name: nfs-volume
279279
nfs:
280280
server: {{ .Values.nfsServer }}
281-
path: /mnt/storage
281+
path: {{ .Values.volumePath }}
282282
readOnly: no

‎charts/curriki/templates/client.yaml

Lines changed: 6 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ spec:
3737
- name: client-env-local
3838
mountPath: /usr/share/nginx/html/.env
3939
subPath: .env
40-
volumeMounts:
4140
- name: client-env-script
4241
mountPath: /usr/share/nginx/html/runtime-env.js
4342
subPath: runtime-env.js
@@ -69,23 +68,9 @@ kind: ConfigMap
6968
metadata:
7069
name: client-env
7170
data:
72-
REACT_APP_PEXEL_API: "563492ad6f91700001000001155d7b75f5424ea694b81ce9f867dddf"
73-
REACT_APP_API_URL: "https://stage.currikistudio.org/api/api"
74-
REACT_APP_RESOURCE_URL: "https://stage.currikistudio.org/api"
75-
REACT_APP_GOOGLE_CAPTCHA: "6LdImbgZAAAAAN4s1eEi53-ul7uJfLONrFuBcKS0"
76-
REACT_APP_GAPI_CLIENT_ID: "898143939834-9ioui2i9ghgrmcgmgtg0h6rsf83d0t0c.apps.googleusercontent.com"
77-
REACT_APP_HUBSPOT: "7874555"
78-
REACT_APP_API_VERSION: "v1"
79-
REACT_APP_H5P_KEY: "B6TFsmFD5TLZaWCAYZ91ly0D2We0xjLAtRmBJzQ"
80-
REACT_APP_TSUGI_SERVER_URL: "https://stage-tsugi.currikistudio.org/mod/curriki/"
81-
REACT_APP_SHARED_PROJECT_DEMO_USER: "demoaccount@gmail.com"
82-
REACT_APP_SHARED_PROJECT_DEMO_PASS: "Qwerty123"
83-
REACT_APP_SHARED_PROJECT_USERID: "1608"
84-
REACT_MS_APP_ID: "5e0ea881-693a-4f0a-94a7-dcef7b5accd6"
85-
REACT_MS_TENANT_ID: "75f881ff-c83b-44de-a964-f0f9ee64c60c"
86-
REACT_DOMAIN_URL: "https://stage.currikistudio.org/"
87-
REACT_MS_CLIENT_ID: "53fbf60b-ec1b-46da-8c72-6ba022d13631"
88-
REACT_MS_SECRET: "qeD8Q~-I9gKcI8uC1.hMryQYEOUspo2nXUT3Iapj"
71+
{{- with .Values.clientEnvConfigMap }}
72+
{{- toYaml . | nindent 2}}
73+
{{- end}}
8974

9075

9176

@@ -95,34 +80,16 @@ kind: ConfigMap
9580
metadata:
9681
name: client-env-local
9782
data:
98-
.env: |
99-
REACT_APP_PEXEL_API=563492ad6f91700001000001155d7b75f5424ea694b81ce9f867dddf
100-
REACT_APP_API_URL=https://stage.currikistudio.org/api/api
101-
REACT_APP_RESOURCE_URL=https://stage.currikistudio.org/api
102-
REACT_APP_GOOGLE_CAPTCHA=6LdImbgZAAAAAN4s1eEi53-ul7uJfLONrFuBcKS0
103-
REACT_APP_GAPI_CLIENT_ID=898143939834-9ioui2i9ghgrmcgmgtg0h6rsf83d0t0c.apps.googleusercontent.com
104-
REACT_APP_HUBSPOT=7874555
105-
REACT_APP_API_VERSION=v1
106-
REACT_APP_H5P_KEY=B6TFsmFD5TLZaWCAYZ91ly0D2We0xjLAtRmBJzQ
107-
REACT_APP_TSUGI_SERVER_URL=https://stage-tsugi.currikistudio.org/mod/curriki/
108-
REACT_APP_SHARED_PROJECT_DEMO_USER=demoaccount@gmail.com
109-
REACT_APP_SHARED_PROJECT_DEMO_PASS=Qwerty123
110-
REACT_APP_SHARED_PROJECT_USERID=1608
111-
REACT_MS_APP_ID=5e0ea881-693a-4f0a-94a7-dcef7b5accd6
112-
REACT_MS_TENANT_ID=75f881ff-c83b-44de-a964-f0f9ee64c60c
113-
REACT_DOMAIN_URL=https://stage.currikistudio.org/
114-
REACT_MS_CLIENT_ID=53fbf60b-ec1b-46da-8c72-6ba022d13631
115-
REACT_MS_SECRET=qeD8Q~-I9gKcI8uC1.hMryQYEOUspo2nXUT3Iapj
116-
83+
.env: {{- .Values.clientEnvLocalConfigMap | toYaml | indent 2 }}
84+
11785

11886
---
11987
apiVersion: v1
12088
kind: ConfigMap
12189
metadata:
12290
name: client-env-script
12391
data:
124-
runtime-env.js: |
125-
window.__RUNTIME_CONFIG__ = {"REACT_APP_PEXEL_API":"563492ad6f91700001000001155d7b75f5424ea694b81ce9f867dddf","REACT_APP_API_URL":"https://stage.currikistudio.org/api/api","REACT_APP_RESOURCE_URL":"https://stage.currikistudio.org/api","REACT_APP_GOOGLE_CAPTCHA":"6LdImbgZAAAAAN4s1eEi53-ul7uJfLONrFuBcKS0","REACT_APP_GAPI_CLIENT_ID":"898143939834-9ioui2i9ghgrmcgmgtg0h6rsf83d0t0c.apps.googleusercontent.com","REACT_APP_HUBSPOT":"7874555","REACT_APP_API_VERSION":"v1","REACT_APP_H5P_KEY":"B6TFsmFD5TLZaWCAYZ91ly0D2We0xjLAtRmBJzQ","REACT_APP_TSUGI_SERVER_URL":"https://stage-tsugi.currikistudio.org/mod/curriki/","REACT_APP_SHARED_PROJECT_DEMO_USER":"demoaccount@gmail.com","REACT_APP_SHARED_PROJECT_DEMO_PASS":"Qwerty123","REACT_APP_SHARED_PROJECT_USERID":"1608","REACT_MS_APP_ID":"5e0ea881-693a-4f0a-94a7-dcef7b5accd6","REACT_MS_TENANT_ID":"75f881ff-c83b-44de-a964-f0f9ee64c60c","REACT_DOMAIN_URL":"https://stage.currikistudio.org/","REACT_MS_CLIENT_ID": "53fbf60b-ec1b-46da-8c72-6ba022d13631","REACT_MS_SECRET":"qeD8Q~-I9gKcI8uC1.hMryQYEOUspo2nXUT3Iapj"};
92+
runtime-env.js: {{- .Values.clientRuntimeConfig | toYaml | indent 2 }}
12693

12794
---
12895
apiVersion: v1

‎charts/curriki/templates/ingress.yaml

Lines changed: 6 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -8,49 +8,11 @@ metadata:
88
spec:
99
tls:
1010
- hosts:
11-
- stage.currikistudio.org
12-
- stage-api.currikistudio.org
13-
- stage-trax.currikistudio.org
14-
- stage-tsugi.currikistudio.org
11+
{{- with .Values.ingHosts }}
12+
{{- toYaml . | nindent 6}}
13+
{{- end}}
1514
secretName: letsencrypt
1615
rules:
17-
- host: stage.currikistudio.org
18-
http:
19-
paths:
20-
- pathType: Prefix
21-
path: "/"
22-
backend:
23-
service:
24-
name: client-svc
25-
port:
26-
number: 80
27-
- host: stage-api.currikistudio.org
28-
http:
29-
paths:
30-
- pathType: Prefix
31-
path: "/"
32-
backend:
33-
service:
34-
name: api-svc
35-
port:
36-
number: 80
37-
- host: stage-trax.currikistudio.org
38-
http:
39-
paths:
40-
- pathType: Prefix
41-
path: "/"
42-
backend:
43-
service:
44-
name: trax-svc
45-
port:
46-
number: 80
47-
- host: stage-tsugi.currikistudio.org
48-
http:
49-
paths:
50-
- pathType: Prefix
51-
path: "/"
52-
backend:
53-
service:
54-
name: tsugi-svc
55-
port:
56-
number: 80
16+
{{- with .Values.ingRules }}
17+
{{- toYaml . | nindent 4}}
18+
{{- end}}

‎charts/curriki/templates/trax.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ spec:
6868
- name: nfs-volume
6969
nfs:
7070
server: {{ .Values.nfsServer }}
71-
path: /mnt/traxstorage
71+
path: {{ .Values.traxStorage }}
7272
readOnly: no
7373

7474

‎charts/curriki/templates/tsugi.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,8 @@ kind: ConfigMap
6666
metadata:
6767
name: tsugi-mod-config
6868
data:
69-
config.php: |
70-
<?php
71-
define('CURRIKI_STUDIO_HOST', 'https://stage.currikistudio.org');
69+
config.php: {{- .Values.currikiTsugiHost | toYaml | indent 2 }}
70+
7271

7372

7473
---

‎charts/curriki/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace: staging
1+
namespace: default
22
image:
33
apirepo: nginx
44
cronrepo: nginx

‎charts/pilots.yaml

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,47 @@
1+
namespace: pilots
12
image:
23
apirepo: quay.io/curriki/api:pilots
34
cronrepo: quay.io/curriki/cron:pilots
45
clientrepo: quay.io/curriki/client:pilots
56
tsugirepo: quay.io/curriki/tsugi:pilots
67
traxrepo: quay.io/curriki/trax:pilots
7-
nfsServer: 0.0.0.0
8+
nfsServer: 139.144.231.192
9+
host: studio.curriki.org
10+
volumePath: /mnt/pilotsStorage
11+
traxStorage: /mnt/pilotsTraxStorage
12+
clientEnvConfigMap:
13+
REACT_APP_PEXEL_API: "563492ad6f91700001000001155d7b75f5424ea694b81ce9f867dddf"
14+
REACT_APP_API_URL: "https://stage.currikistudio.org/api/api"
15+
REACT_APP_RESOURCE_URL: "https://stage.currikistudio.org/api"
16+
REACT_APP_GOOGLE_CAPTCHA: "6LdImbgZAAAAAN4s1eEi53-ul7uJfLONrFuBcKS0"
17+
REACT_APP_GAPI_CLIENT_ID: "898143939834-9ioui2i9ghgrmcgmgtg0h6rsf83d0t0c.apps.googleusercontent.com"
18+
REACT_APP_HUBSPOT: "7874555"
19+
REACT_APP_API_VERSION: "v1"
20+
REACT_APP_H5P_KEY: "B6TFsmFD5TLZaWCAYZ91ly0D2We0xjLAtRmBJzQ"
21+
REACT_APP_TSUGI_SERVER_URL: "https://stage-tsugi.currikistudio.org/mod/curriki/"
22+
REACT_APP_SHARED_PROJECT_DEMO_USER: "demoaccount@gmail.com"
23+
REACT_APP_SHARED_PROJECT_DEMO_PASS: "Qwerty123"
24+
REACT_APP_SHARED_PROJECT_USERID: "1608"
25+
REACT_MS_APP_ID: "5e0ea881-693a-4f0a-94a7-dcef7b5accd6"
26+
REACT_MS_TENANT_ID: "75f881ff-c83b-44de-a964-f0f9ee64c60c"
27+
REACT_DOMAIN_URL: "https://stage.currikistudio.org/"
28+
REACT_MS_CLIENT_ID: "53fbf60b-ec1b-46da-8c72-6ba022d13631"
29+
REACT_MS_SECRET: "qeD8Q~-I9gKcI8uC1.hMryQYEOUspo2nXUT3Iapj"
30+
clientEnvLocalConfigMap: |
31+
REACT_APP_PEXEL_API=563492ad6f91700001000001155d7b75f5424ea694b81ce9f867dddf
32+
REACT_APP_API_URL=https://stage.currikistudio.org/api/api
33+
REACT_APP_RESOURCE_URL=https://stage.currikistudio.org/api
34+
REACT_APP_GOOGLE_CAPTCHA=6LdImbgZAAAAAN4s1eEi53-ul7uJfLONrFuBcKS0
35+
REACT_APP_GAPI_CLIENT_ID=898143939834-9ioui2i9ghgrmcgmgtg0h6rsf83d0t0c.apps.googleusercontent.com
36+
REACT_APP_HUBSPOT=7874555
37+
REACT_APP_API_VERSION=v1
38+
REACT_APP_H5P_KEY=B6TFsmFD5TLZaWCAYZ91ly0D2We0xjLAtRmBJzQ
39+
REACT_APP_TSUGI_SERVER_URL=https://stage-tsugi.currikistudio.org/mod/curriki/
40+
REACT_APP_SHARED_PROJECT_DEMO_USER=demoaccount@gmail.com
41+
REACT_APP_SHARED_PROJECT_DEMO_PASS=Qwerty123
42+
REACT_APP_SHARED_PROJECT_USERID=1608
43+
REACT_MS_APP_ID=5e0ea881-693a-4f0a-94a7-dcef7b5accd6
44+
REACT_MS_TENANT_ID=75f881ff-c83b-44de-a964-f0f9ee64c60c
45+
REACT_DOMAIN_URL=https://stage.currikistudio.org/
46+
REACT_MS_CLIENT_ID=53fbf60b-ec1b-46da-8c72-6ba022d13631
47+
REACT_MS_SECRET=qeD8Q~-I9gKcI8uC1.hMryQYEOUspo2nXUT3Iapj

‎charts/prod.yaml

Lines changed: 90 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,96 @@
1+
namespace: prod
12
image:
23
apirepo: quay.io/curriki/api:prod
34
cronrepo: quay.io/curriki/cron:prod
45
clientrepo: quay.io/curriki/client:prod
56
tsugirepo: quay.io/curriki/tsugi:prod
67
traxrepo: quay.io/curriki/trax:prod
7-
nfsServer: 0.0.0.0
8+
nfsServer: 139.144.231.192
9+
host: my.currikistudio.org
10+
volumePath: /mnt/prodStorage
11+
traxStorage: /mnt/prodTraxStorage
12+
clientEnvConfigMap:
13+
REACT_APP_PEXEL_API: "563492ad6f91700001000001155d7b75f5424ea694b81ce9f867dddf"
14+
REACT_APP_API_URL: "https://my.currikistudio.org/api/api"
15+
REACT_APP_RESOURCE_URL: "https://my.currikistudio.org/api"
16+
REACT_APP_GOOGLE_CAPTCHA: "6LdImbgZAAAAAN4s1eEi53-ul7uJfLONrFuBcKS0"
17+
REACT_APP_GAPI_CLIENT_ID: "898143939834-9ioui2i9ghgrmcgmgtg0h6rsf83d0t0c.apps.googleusercontent.com"
18+
REACT_APP_HUBSPOT: "7874555"
19+
REACT_APP_API_VERSION: "v1"
20+
REACT_APP_H5P_KEY: "B6TFsmFD5TLZaWCAYZ91ly0D2We0xjLAtRmBJzQ"
21+
REACT_APP_TSUGI_SERVER_URL: "https://tsugi.currikistudio.org/mod/curriki/"
22+
REACT_APP_SHARED_PROJECT_DEMO_USER: "demoaccount@gmail.com"
23+
REACT_APP_SHARED_PROJECT_DEMO_PASS: "Qwerty123"
24+
REACT_APP_SHARED_PROJECT_USERID: "726"
25+
REACT_APP_SAFELEARN_AUTH: "https://api.v10.learnsafe.com/accounts/AC5771e791affd4176966bf63c846c8701/integrators/auth/token"
26+
REACT_APP_SAFELEARN_CHECK: "https://api.v10.learnsafe.com/accounts/AC5771e791affd4176966bf63c846c8701/integrators/content/check"
27+
REACT_APP_SAFELEARN_APPLICATIONNAME: "null"
28+
REACT_APP_SAFELEARN_UNITPATH: "null"
29+
REACT_APP_SAFELEARN_KEY: "null"
30+
REACT_APP_STEMULI: "true"
31+
REACT_DOMAIN_URL: "https://my.currikistudio.org/"
32+
33+
clientEnvLocalConfigMap: |
34+
REACT_APP_PEXEL_API=563492ad6f91700001000001155d7b75f5424ea694b81ce9f867dddf
35+
REACT_APP_API_URL=https://my.currikistudio.org/api/api
36+
REACT_APP_RESOURCE_URL=https://my.currikistudio.org/api
37+
REACT_APP_GOOGLE_CAPTCHA=6LdImbgZAAAAAN4s1eEi53-ul7uJfLONrFuBcKS0
38+
REACT_APP_GAPI_CLIENT_ID=898143939834-9ioui2i9ghgrmcgmgtg0h6rsf83d0t0c.apps.googleusercontent.com
39+
REACT_APP_HUBSPOT=7874555
40+
REACT_APP_API_VERSION=v1
41+
REACT_APP_H5P_KEY=B6TFsmFD5TLZaWCAYZ91ly0D2We0xjLAtRmBJzQ
42+
REACT_APP_TSUGI_SERVER_URL=https://tsugi.currikistudio.org/mod/curriki/
43+
REACT_APP_SHARED_PROJECT_DEMO_USER=demoaccount@gmail.com
44+
REACT_APP_SHARED_PROJECT_DEMO_PASS=Qwerty123
45+
REACT_APP_SHARED_PROJECT_USERID=726
46+
REACT_APP_SAFELEARN_AUTH=https://api.v10.learnsafe.com/accounts/AC5771e791affd4176966bf63c846c8701/integrators/auth/token
47+
REACT_APP_SAFELEARN_CHECK=https://api.v10.learnsafe.com/accounts/AC5771e791affd4176966bf63c846c8701/integrators/content/check
48+
REACT_APP_SAFELEARN_APPLICATIONNAME=null
49+
REACT_APP_SAFELEARN_UNITPATH=null
50+
REACT_APP_SAFELEARN_KEY=null
51+
REACT_APP_STEMULI=true
52+
REACT_DOMAIN_URL=https://my.currikistudio.org/
53+
clientRuntimeConfig: |
54+
window.__RUNTIME_CONFIG__ = { "REACT_APP_PEXEL_API": "563492ad6f91700001000001155d7b75f5424ea694b81ce9f867dddf", "REACT_APP_API_URL": "https://my.currikistudio.org/api/api", "REACT_APP_RESOURCE_URL": "https://my.currikistudio.org/api", "REACT_APP_GOOGLE_CAPTCHA": "6LdImbgZAAAAAN4s1eEi53-ul7uJfLONrFuBcKS0", "REACT_APP_GAPI_CLIENT_ID": "898143939834-9ioui2i9ghgrmcgmgtg0h6rsf83d0t0c.apps.googleusercontent.com", "REACT_APP_HUBSPOT": "7874555", "REACT_APP_API_VERSION": "v1", "REACT_APP_H5P_KEY": "B6TFsmFD5TLZaWCAYZ91ly0D2We0xjLAtRmBJzQ", "REACT_APP_TSUGI_SERVER_URL": "https://tsugi.currikistudio.org/mod/curriki/", "REACT_APP_SHARED_PROJECT_DEMO_USER": "demoaccount@gmail.com", "REACT_APP_SHARED_PROJECT_DEMO_PASS": "Qwerty123", "REACT_APP_SHARED_PROJECT_USERID": "726", "REACT_APP_SAFELEARN_AUTH": "https://api.v10.learnsafe.com/accounts/AC5771e791affd4176966bf63c846c8701/integrators/auth/token", "REACT_APP_SAFELEARN_CHECK": "https://api.v10.learnsafe.com/accounts/AC5771e791affd4176966bf63c846c8701/integrators/content/check", "REACT_APP_SAFELEARN_APPLICATIONNAME": "null", "REACT_APP_SAFELEARN_UNITPATH": "null", "REACT_APP_SAFELEARN_KEY": "null", "REACT_APP_STEMULI": "true", "REACT_DOMAIN_URL": "https://my.currikistudio.org/" };
55+
56+
currikiTsugiHost: |
57+
<?php
58+
define('CURRIKI_STUDIO_HOST', 'https://my.currikistudio.org');
59+
60+
ingHosts:
61+
- my.currikistudio.org
62+
- trax.currikistudio.org
63+
- tsugi.currikistudio.org
64+
ingRules:
65+
- host: my.currikistudio.org
66+
http:
67+
paths:
68+
- pathType: Prefix
69+
path: "/"
70+
backend:
71+
service:
72+
name: client-svc
73+
port:
74+
number: 80
75+
- host: trax.currikistudio.org
76+
http:
77+
paths:
78+
- pathType: Prefix
79+
path: "/"
80+
backend:
81+
service:
82+
name: trax-svc
83+
port:
84+
number: 80
85+
- host: tsugi.currikistudio.org
86+
http:
87+
paths:
88+
- pathType: Prefix
89+
path: "/"
90+
backend:
91+
service:
92+
name: tsugi-svc
93+
port:
94+
number: 80
95+
96+

0 commit comments

Comments
 (0)