Skip to content

Commit a69a017

Browse files
authored
update infrastructure (#1060)
1 parent ef9e4e8 commit a69a017

File tree

8 files changed

+24
-56
lines changed

8 files changed

+24
-56
lines changed

OutOfSchool/OutOfSchool.IdentityServer/appsettings.Release.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
]
6363
},
6464
"ReverseProxy": {
65-
"BasePath": "users"
65+
"BasePath": "/users"
6666
},
6767
"Issuer": {
6868
"Uri": "https://pozashkillia.iea.gov.ua/users",

OutOfSchool/OutOfSchool.WebApi/appsettings.Release.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565

6666
"AllowedCorsOrigins": "https://pozashkillia.iea.gov.ua",
6767
"ReverseProxy": {
68-
"BasePath": "web"
68+
"BasePath": "/web"
6969
},
7070

7171
"FeatureManagement": {

k8s/infrastructure/Chart.lock

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,8 @@ dependencies:
2323
- name: ingress-nginx
2424
repository: https://kubernetes.github.io/ingress-nginx
2525
version: 4.3.0
26-
digest: sha256:f636bb1f570f9e7ff3d0a0e9724c9bdff256b41f78a01868df5bde3ac9271224
27-
generated: "2023-04-14T12:24:51.374995+03:00"
26+
- name: outofschool
27+
repository: file://../outofschool
28+
version: 1.0.0
29+
digest: sha256:079ded4335ea9730b07025f8bd4baf07a33df12f3c2443849882bc742bfc71b2
30+
generated: "2023-04-20T21:55:48.151168+03:00"

k8s/infrastructure/Chart.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,7 @@ dependencies:
3232
repository: https://helm.vector.dev
3333
- name: ingress-nginx
3434
version: 4.3.0
35-
repository: https://kubernetes.github.io/ingress-nginx
35+
repository: https://kubernetes.github.io/ingress-nginx
36+
- name: outofschool
37+
version: 1.0.0
38+
repository: "file://../outofschool"
5.66 KB
Binary file not shown.

k8s/outofschool/Chart.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ dependencies:
99
repository: file://../webapp
1010
version: 0.2.1
1111
digest: sha256:db251c2b96dddd61828e77e7c7cc1b7f66415475d1ba8859bb8a41454918991b
12-
generated: "2023-04-18T16:47:28.080993+03:00"
12+
generated: "2023-04-20T21:34:25.296462+03:00"
2 Bytes
Binary file not shown.

k8s/outofschool/values.yaml

Lines changed: 12 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -8,64 +8,26 @@ nameOverride: ""
88
fullnameOverride: ""
99

1010
webapi:
11-
enabled: true
11+
enabled: false
1212
image:
13-
registry: gcr.io/gcp101292-pozashkillya
14-
repository: oos-api
13+
registry: gcr.io
14+
repository: gcp101292-pozashkillya
15+
name: oos-api
1516
pullPolicy: IfNotPresent
16-
tag: testing
1717
containerPort: 8080
18-
configuration:
19-
extraEnvironment:
20-
ASPNETCORE_ENVIRONMENT: Kubernetes
21-
AppDefaults__Version: testing
22-
secrets:
23-
- type: env
24-
name: mysql-api-auth
25-
keys:
26-
- key: API_PASSWORD
27-
envKey: ConnectionStringsOverride__DefaultConnection__Password
28-
upper: false
29-
- type: env
30-
name: elasticsearch-credentials
31-
keys:
32-
- key: apipass
33-
envKey: Elasticsearch__Password
34-
upper: false
35-
- type: env
36-
name: redis-auth
37-
keys:
38-
- key: password
39-
envKey: Redis__Password
40-
upper: false
41-
# TODO: add geo api key to secrets
42-
# - type: env
43-
# name: mysql-api-auth
44-
# keys:
45-
# - key: API_PASSWORD
46-
# envKey: GeoCoding__ApiKey
47-
# upper: false
48-
resources:
49-
limits:
50-
memory: 512Mi
5118
identity:
5219
enabled: false
5320
image:
54-
registry: gcr.io/gcp101292-pozashkillya
55-
repository: oos-auth
21+
registry: gcr.io
22+
repository: gcp101292-pozashkillya
23+
name: oos-auth
5624
pullPolicy: IfNotPresent
57-
tag: 1.0.0-RC1
58-
extraEnvironment: {}
59-
# ReverseProxy__BasePath: /identity
60-
connectionString:
61-
username: oos
62-
secret:
63-
name: mysql-auth
64-
key: mysql-password
25+
containerPort: 8080
6526
frontend:
6627
enabled: false
6728
image:
68-
registry: gcr.io/gcp101292-pozashkillya
69-
repository: oos-frontend
29+
registry: gcr.io
30+
repository: gcp101292-pozashkillya
31+
name: oos-frontend
7032
pullPolicy: IfNotPresent
71-
tag: 1.0.0-RC1
33+
containerPort: 8080

0 commit comments

Comments
 (0)