Skip to content

Commit 5a58784

Browse files
cowienduckiecowienduckie
authored
Merge pull request #10 from cowienduckie/dev
DevAdd project's endpoints and minor fixes
2 parents 72ce0df + 8306440 commit 5a58784

File tree

58 files changed

+1896
-145
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+1896
-145
lines changed

‎deploy-all.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ fi
8989

9090
if [[ $push_images ]]; then
9191
echo "#################### Pushing images to the container registry ####################"
92-
services=(portal-api identity-api communication-api personal-data-api master-data-api graph-gateway service-status)
92+
services=(portal-api identity-api communication-api personal-data-api master-data-api graph-gateway)
9393

9494
for service in "${services[@]}"
9595
do
@@ -122,10 +122,12 @@ if [[ -z $skip_infrastructure ]]; then
122122
helm upgrade --install --namespace $namespace -f k8s/charts/pvc/$value_file pvc k8s/charts/pvc
123123
echo "Install RabbitMQ"
124124
helm upgrade --install --namespace $namespace rabbitmq -f k8s/charts/rabbitmq/$value_file bitnami/rabbitmq
125-
echo "Install mailhog"
126-
helm upgrade --install --namespace $namespace mailhog -f k8s/charts/mailhog/$value_file codecentric/mailhog
125+
# echo "Install mailhog"
126+
# helm upgrade --install --namespace $namespace mailhog -f k8s/charts/mailhog/$value_file codecentric/mailhog
127127
echo "Install postgresql"
128128
helm upgrade --install --namespace $namespace postgresql -f k8s/charts/postgresql/$value_file bitnami/postgresql
129+
echo "Install redis"
130+
helm upgrade --install --namespace $namespace redis -f k8s/charts/redis/$value_file bitnami/redis
129131

130132
waitsecs=20; while [ $waitsecs -gt 0 ]; do echo -ne "$waitsecs\033[0K\r"; sleep 1; : $((waitsecs--)); done
131133
fi

‎k8s/charts/communication-api/values.local.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
replicaCount: 1
66

7-
image:
7+
image:
88
repository: localhost:32000/communication-api
99
tag: local
1010
pullPolicy: Always
@@ -13,19 +13,19 @@ imagePullSecrets: []
1313
nameOverride: ""
1414
fullnameOverride: "communication-api"
1515

16-
service:
16+
service:
1717
type: ClusterIP
1818
port: 5002
1919
grpcPort: 15002
2020

21-
ingress:
21+
ingress:
2222
enabled: false
2323

24-
resources:
25-
limits:
24+
resources:
25+
limits:
2626
cpu: 100m
27-
memory: 128Mi
28-
requests:
27+
memory: 256Mi
28+
requests:
2929
cpu: 100m
3030
memory: 128Mi
3131

@@ -37,8 +37,8 @@ affinity: {}
3737

3838
probes: []
3939

40-
env:
41-
normal:
40+
env:
41+
normal:
4242
- name: App__HealthCheckEnabled
4343
value: true
4444

@@ -73,7 +73,7 @@ env:
7373
- name: MessageBus__RabbitMQ__Url
7474
value: amqp://rabbitmq
7575

76-
secret:
76+
secret:
7777
- name: Logging__Seq__ApiKey
7878
key: Seq.Apikey
7979
- name: MessageBus__RabbitMQ__password

‎k8s/charts/graph-gateway/values.local.yaml

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
replicaCount: 1
66

7-
image:
7+
image:
88
repository: localhost:32000/graph-gateway
99
tag: local
1010
pullPolicy: Always
@@ -13,29 +13,27 @@ imagePullSecrets: []
1313
nameOverride: ""
1414
fullnameOverride: "graph-gateway"
1515

16-
service:
16+
service:
1717
type: NodePort
1818
port: 5100
1919
httpNodePort: 31100
2020

21-
ingress:
21+
ingress:
2222
enabled: false
23-
annotations:
23+
annotations:
2424
kubernetes.io/ingress.class: nginx
25-
hosts:
25+
hosts:
2626
- host: promag.local
27-
paths: [
28-
/gateway
29-
]
30-
27+
paths: [/gateway]
28+
3129
tls: []
3230

33-
resources:
34-
limits:
35-
cpu: 100m
36-
memory: 128Mi
37-
requests:
38-
cpu: 100m
31+
resources:
32+
limits:
33+
cpu: 500m
34+
memory: 256Mi
35+
requests:
36+
cpu: 250m
3937
memory: 128Mi
4038

4139
nodeSelector: {}
@@ -46,8 +44,8 @@ affinity: {}
4644

4745
probes: []
4846

49-
env:
50-
normal:
47+
env:
48+
normal:
5149
- name: App__HealthCheckEnabled
5250
value: true
5351

@@ -93,6 +91,6 @@ env:
9391
- name: Services__IdentityService__GrpcUrl
9492
value: http://identity-api:15101
9593

96-
secret:
94+
secret:
9795
- name: Logging__Seq__ApiKey
9896
key: Seq.Apikey

‎k8s/charts/identity-api/values.local.yaml

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
replicaCount: 1
66

7-
image:
7+
image:
88
repository: localhost:32000/identity-api
99
tag: local
1010
pullPolicy: Always
@@ -13,31 +13,27 @@ imagePullSecrets: []
1313
nameOverride: ""
1414
fullnameOverride: "identity-api"
1515

16-
service:
16+
service:
1717
type: NodePort
1818
port: 5101
1919
grpcPort: 15101
2020
httpNodePort: 31101
2121

22-
ingress:
22+
ingress:
2323
enabled: false
24-
annotations: {
25-
kubernetes.io/ingress.class: nginx,
26-
}
27-
hosts:
24+
annotations: { kubernetes.io/ingress.class: nginx }
25+
hosts:
2826
- host: id.promag.local
29-
paths: [
30-
/
31-
]
27+
paths: [/]
3228
tls: []
3329

34-
resources:
35-
limits:
36-
cpu: 100m
37-
memory: 128Mi
38-
requests:
39-
cpu: 100m
40-
memory: 128Mi
30+
resources:
31+
limits:
32+
cpu: 500m
33+
memory: 512Mi
34+
requests:
35+
cpu: 250m
36+
memory: 256Mi
4137

4238
nodeSelector: {}
4339

@@ -47,8 +43,8 @@ affinity: {}
4743

4844
probes: []
4945

50-
env:
51-
normal:
46+
env:
47+
normal:
5248
- name: ASPNETCORE_ENVIRONMENT
5349
value: Development
5450
- name: PathBase
@@ -79,7 +75,7 @@ env:
7975
- name: IdentityServiceOptions__ExternalIdentityBaseUrl
8076
value: http://localhost:31101 #change to host IP if do not use NAT
8177

82-
secret:
78+
secret:
8379
- name: ConnectionStrings__identity
8480
key: ConnectionString.Identity
8581
- name: Logging__Seq__ApiKey

‎k8s/charts/master-data-api/values.local.yaml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ image:
99
tag: local
1010
pullPolicy: Always
1111

12-
imagePullSecrets: [ ]
12+
imagePullSecrets: []
1313
nameOverride: ""
1414
fullnameOverride: "master-data-api"
1515

@@ -24,18 +24,18 @@ ingress:
2424
resources:
2525
limits:
2626
cpu: 100m
27-
memory: 128Mi
27+
memory: 256Mi
2828
requests:
2929
cpu: 100m
3030
memory: 128Mi
3131

32-
nodeSelector: { }
32+
nodeSelector: {}
3333

34-
tolerations: [ ]
34+
tolerations: []
3535

36-
affinity: { }
36+
affinity: {}
3737

38-
probes: [ ]
38+
probes: []
3939

4040
env:
4141
normal:
@@ -46,7 +46,7 @@ env:
4646
value: Development
4747

4848
- name: Logging__Seq__Enabled
49-
value: true
49+
value: false
5050
- name: Logging__Seq__Url
5151
value: http://seq:5341/
5252
- name: Logging__MinimumLevel__Default
@@ -72,11 +72,11 @@ env:
7272
value: http://identity-api:15101
7373

7474
- name: Redis__Enabled
75-
value: 'false'
75+
value: "true"
7676
- name: Redis__InstanceName
77-
value: 'Promag_'
77+
value: "Promag_"
7878
- name: Redis__SlidingExpirationInSecond
79-
value: '3600'
79+
value: "3600"
8080

8181
secret:
8282
- name: ConnectionStrings__masterData
@@ -86,4 +86,4 @@ env:
8686
- name: MessageBus__RabbitMQ__password
8787
key: RabbitMQ.Password
8888
- name: Redis__Configuration
89-
key: Redis.Configuration
89+
key: Redis.Configuration

‎k8s/charts/personal-data-api/values.local.yaml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ image:
99
tag: local
1010
pullPolicy: Always
1111

12-
imagePullSecrets: [ ]
12+
imagePullSecrets: []
1313
nameOverride: ""
1414
fullnameOverride: "personal-data-api"
1515

@@ -23,27 +23,27 @@ ingress:
2323

2424
resources:
2525
limits:
26-
cpu: 100m
27-
memory: 128Mi
26+
cpu: 200m
27+
memory: 256Mi
2828
requests:
2929
cpu: 100m
3030
memory: 128Mi
3131

32-
nodeSelector: { }
32+
nodeSelector: {}
3333

34-
tolerations: [ ]
34+
tolerations: []
3535

36-
affinity: { }
36+
affinity: {}
3737

38-
probes: [ ]
38+
probes: []
3939

4040
env:
4141
normal:
4242
- name: ASPNETCORE_ENVIRONMENT
4343
value: Development
4444

4545
- name: App__HealthCheckEnabled
46-
value: 'true'
46+
value: "true"
4747

4848
- name: MessageBus__TransportType
4949
value: RabbitMQ
@@ -53,7 +53,7 @@ env:
5353
value: amqp://rabbitmq
5454

5555
- name: Logging__Seq__Enabled
56-
value: 'false'
56+
value: "false"
5757
- name: Logging__Seq__Url
5858
value: http://seq:5341/
5959
- name: Logging__MinimumLevel__Default
@@ -71,16 +71,16 @@ env:
7171
value: http://master-data-api:15004
7272

7373
- name: OpenTelemetry__Enabled
74-
value: 'false'
74+
value: "false"
7575
- name: OpenTelemetry__zipkinEndpoint
7676
value: http://zipkin:9411/api/v2/spans
7777

7878
- name: Redis__Enabled
79-
value: 'false'
79+
value: "true"
8080
- name: Redis__InstanceName
81-
value: 'Promag_'
81+
value: "Promag_"
8282
- name: Redis__SlidingExpirationInSecond
83-
value: '3600'
83+
value: "3600"
8484

8585
secret:
8686
- name: ConnectionStrings__personalData
@@ -90,4 +90,4 @@ env:
9090
- name: MessageBus__RabbitMQ__password
9191
key: RabbitMQ.Password
9292
- name: Redis__Configuration
93-
key: Redis.Configuration
93+
key: Redis.Configuration

‎k8s/charts/portal-api/values.local.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ ingress:
2323

2424
resources:
2525
limits:
26-
cpu: 100m
27-
memory: 128Mi
26+
cpu: 500m
27+
memory: 512Mi
2828
requests:
29-
cpu: 100m
30-
memory: 128Mi
29+
cpu: 200m
30+
memory: 256Mi
3131

3232
nodeSelector: {}
3333

0 commit comments

Comments
 (0)