Skip to content

Commit fd5f041

Browse files
committed
fix shortcircuit-server name -> shortcircuit-analysis-server
1 parent e603a9d commit fd5f041

11 files changed

+58
-58
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ http://localhost:5010/swagger-ui.html // balances-adjustment-server
213213
http://localhost:5011/swagger-ui.html // case-validation-server
214214
http://localhost:5033/swagger-ui.html // user-admin-server
215215
http://localhost:5030/swagger-ui.html // sensitivity-analysis-server
216-
http://localhost:5031/swagger-ui.html // shortcircuit-server
216+
http://localhost:5031/swagger-ui.html // shortcircuit-analysis-server
217217
http://localhost:5037/swagger-ui.html // timeseries-server
218218
http://localhost:5038/swagger-ui.html // voltage-init-server
219219
http://localhost:5039/swagger-ui.html // case-import-server
@@ -408,7 +408,7 @@ http://<INGRESS_HOST>/filter-server/swagger-ui.html
408408
http://<INGRESS_HOST>/report-server/swagger-ui.html
409409
http://<INGRESS_HOST>/user-admin-server/swagger-ui.html
410410
http://<INGRESS_HOST>/sensitivity-analysis-server/swagger-ui.html
411-
http://<INGRESS_HOST>/shortcircuit-server/swagger-ui.html
411+
http://<INGRESS_HOST>/shortcircuit-analysis-server/swagger-ui.html
412412
http://<INGRESS_HOST>/timeseries-server/swagger-ui.html
413413
http://<INGRESS_HOST>/voltage-init-server/swagger-ui.html
414414
http://<INGRESS_HOST>/case-import-server/swagger-ui.html

docker-compose/study/docker-compose.override.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -445,18 +445,18 @@ services:
445445
limits:
446446
memory: 1792m #deployment: 3072m
447447

448-
shortcircuit-server:
448+
shortcircuit-analysis-server:
449449
profiles:
450450
- all
451451
- suite
452452
- study
453-
image: gridsuite/shortcircuit-server:latest
453+
image: gridsuite/shortcircuit-analysis-server:latest
454454
ports:
455455
- 5031:80
456456
volumes:
457-
- $PWD/../../k8s/resources/study/config/shortcircuit-server-application.yml:/config/specific/application.yml:Z
457+
- $PWD/../../k8s/resources/study/config/shortcircuit-analysis-server-application.yml:/config/specific/application.yml:Z
458458
- $PWD/../../k8s/resources/common/config/common-application.yml:/config/common/application.yml:Z
459-
- $PWD/../../k8s/resources/study/config/shortcircuit-server-config.yml:/home/powsybl/.itools/config.yml:Z
459+
- $PWD/../../k8s/resources/study/config/shortcircuit-analysis-server-config.yml:/home/powsybl/.itools/config.yml:Z
460460
restart: unless-stopped
461461
depends_on:
462462
logspout:

k8s/live/azure-integ/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ images:
101101
digest: 27368e11a16ced56422ff48ed66270f5d1a1f3f0649403dc5ffceff91243c592
102102
- name: docker.io/gridsuite/sensitivity-analysis-server
103103
digest: todo
104-
- name: docker.io/gridsuite/shortcircuit-server
104+
- name: docker.io/gridsuite/shortcircuit-analysis-server
105105
digest: todo
106106
- name: docker.io/gridsuite/voltage-init-server
107107
digest: todo

k8s/live/local/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ resources:
4545
- dynamic-mapping-server-ingress.yaml
4646
- user-admin-server-ingress.yaml
4747
- sensitivity-analysis-server-ingress.yaml
48-
- shortcircuit-server-ingress.yaml
48+
- shortcircuit-analysis-server-ingress.yaml
4949
- timeseries-server-ingress.yaml
5050
- voltage-init-server-ingress.yaml
5151

Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11
apiVersion: networking.k8s.io/v1
22
kind: Ingress
33
metadata:
4-
name: shortcircuit-server-ingress
4+
name: shortcircuit-analysis-server-ingress
55
annotations:
66
nginx.ingress.kubernetes.io/configuration-snippet: |
77
# our containers host at '/' so can't possibly make a difference between
88
# '/XXX/' and '/XXX' (trailing slash) (which would respectively become
99
# '/' and '' inside the container but an empty path doesn't exist in http)
1010
# so always redirect '/XXX' to '/XXX/' in the client outside the container
11-
rewrite ^/shortcircuit-server$ /shortcircuit-server/ permanent;
11+
rewrite ^/shortcircuit-analysis-server$ /shortcircuit-analysis-server/ permanent;
1212
# springfox swagger-ui uses X-Forwarded-Prefix to find the
1313
# base url when behind a reverse proxy.
1414
# nginx-ingress-controller has an annotation to do the same thing
1515
# (nginx.ingress.kubernetes.io/x-forwarded-prefix)
1616
# but it only works when using rewrite-target, which we can't use because
1717
# we have properly encoded slashs in urls
18-
proxy_set_header X-Forwarded-Prefix /shortcircuit-server/;
18+
proxy_set_header X-Forwarded-Prefix /shortcircuit-analysis-server/;
1919
# using this instead of standard rewrite as a workaround to avoid decoding slashes in urls
2020
# we sometimes have ids in the urls that contain properly encoded slashes
21-
if ($request_uri ~ "^/shortcircuit-server(/.*)") {
21+
if ($request_uri ~ "^/shortcircuit-analysis-server(/.*)") {
2222
proxy_pass http://upstream_balancer$1;
2323
break;
2424
}
2525
spec:
2626
rules:
2727
- http:
2828
paths:
29-
- path: /shortcircuit-server(/|$)
29+
- path: /shortcircuit-analysis-server(/|$)
3030
pathType: Prefix
3131
backend:
3232
service:
33-
name: shortcircuit-server
33+
name: shortcircuit-analysis-server
3434
port:
3535
number: 80

k8s/resources/study/kustomization.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ resources:
3939
- directory-notification-server-service.yaml
4040
- sensitivity-analysis-server-deployment.yaml
4141
- sensitivity-analysis-server-service.yaml
42-
- shortcircuit-server-deployment.yaml
43-
- shortcircuit-server-service.yaml
42+
- shortcircuit-analysis-server-deployment.yaml
43+
- shortcircuit-analysis-server-service.yaml
4444
- timeseries-server-deployment.yaml
4545
- timeseries-server-service.yaml
4646
- voltage-init-server-deployment.yaml
@@ -105,12 +105,12 @@ configMapGenerator:
105105
- name: sensitivity-analysis-server-itools-configmap
106106
files:
107107
- config.yml=config/sensitivity-analysis-server-config.yml
108-
- name: shortcircuit-server-configmap-specific
108+
- name: shortcircuit-analysis-server-configmap-specific
109109
files:
110-
- application.yml=config/shortcircuit-server-application.yml
111-
- name: shortcircuit-server-itools-configmap
110+
- application.yml=config/shortcircuit-analysis-server-application.yml
111+
- name: shortcircuit-analysis-server-itools-configmap
112112
files:
113-
- config.yml=config/shortcircuit-server-config.yml
113+
- config.yml=config/shortcircuit-analysis-server-config.yml
114114
- name: timeseries-server-configmap-specific
115115
files:
116116
- application.yml=config/timeseries-server-application.yml
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
apiVersion: apps/v1
2+
kind: Deployment
3+
metadata:
4+
name: shortcircuit-analysis-server
5+
labels:
6+
name: shortcircuit-analysis-server
7+
version: "1"
8+
app.kubernetes.io/component: gridsuite-springboot
9+
gridsuite.org/springboot-with-database: "true"
10+
annotations:
11+
gridsuite.org/size: springboot-xl-forking
12+
spec:
13+
selector:
14+
matchLabels:
15+
name: shortcircuit-analysis-server
16+
template:
17+
metadata:
18+
labels:
19+
name: shortcircuit-analysis-server
20+
spec:
21+
containers:
22+
- name: main
23+
image: docker.io/gridsuite/shortcircuit-analysis-server:latest
24+
volumeMounts:
25+
- mountPath: /config/specific
26+
name: shortcircuit-analysis-server-configmap-specific-volume
27+
- mountPath: /home/powsybl/.itools
28+
name: shortcircuit-analysis-server-itools-configmap-volume
29+
volumes:
30+
- name: shortcircuit-analysis-server-configmap-specific-volume
31+
configMap:
32+
name: shortcircuit-analysis-server-configmap-specific
33+
- name: shortcircuit-analysis-server-itools-configmap-volume
34+
configMap:
35+
name: shortcircuit-analysis-server-itools-configmap

k8s/resources/study/shortcircuit-server-service.yaml renamed to k8s/resources/study/shortcircuit-analysis-server-service.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ apiVersion: v1
22
kind: Service
33
metadata:
44
labels:
5-
name: shortcircuit-server
5+
name: shortcircuit-analysis-server
66
app.kubernetes.io/component: gridsuite-springboot
7-
name: shortcircuit-server
7+
name: shortcircuit-analysis-server
88
spec:
99
selector:
10-
name: shortcircuit-server
10+
name: shortcircuit-analysis-server
1111

0 commit comments

Comments
 (0)