diff --git a/README.md b/README.md index 26cbaeef..2ad8019c 100644 --- a/README.md +++ b/README.md @@ -213,7 +213,7 @@ http://localhost:5010/swagger-ui.html // balances-adjustment-server http://localhost:5011/swagger-ui.html // case-validation-server http://localhost:5033/swagger-ui.html // user-admin-server http://localhost:5030/swagger-ui.html // sensitivity-analysis-server -http://localhost:5031/swagger-ui.html // shortcircuit-server +http://localhost:5031/swagger-ui.html // shortcircuit-analysis-server http://localhost:5037/swagger-ui.html // timeseries-server http://localhost:5038/swagger-ui.html // voltage-init-server http://localhost:5039/swagger-ui.html // case-import-server @@ -408,7 +408,7 @@ http:///filter-server/swagger-ui.html http:///report-server/swagger-ui.html http:///user-admin-server/swagger-ui.html http:///sensitivity-analysis-server/swagger-ui.html -http:///shortcircuit-server/swagger-ui.html +http:///shortcircuit-analysis-server/swagger-ui.html http:///timeseries-server/swagger-ui.html http:///voltage-init-server/swagger-ui.html http:///case-import-server/swagger-ui.html diff --git a/docker-compose/study/docker-compose.override.yml b/docker-compose/study/docker-compose.override.yml index 03c951c1..36c8043b 100644 --- a/docker-compose/study/docker-compose.override.yml +++ b/docker-compose/study/docker-compose.override.yml @@ -445,18 +445,18 @@ services: limits: memory: 1792m #deployment: 3072m - shortcircuit-server: + shortcircuit-analysis-server: profiles: - all - suite - study - image: gridsuite/shortcircuit-server:latest + image: gridsuite/shortcircuit-analysis-server:latest ports: - 5031:80 volumes: - - $PWD/../../k8s/resources/study/config/shortcircuit-server-application.yml:/config/specific/application.yml:Z + - $PWD/../../k8s/resources/study/config/shortcircuit-analysis-server-application.yml:/config/specific/application.yml:Z - $PWD/../../k8s/resources/common/config/common-application.yml:/config/common/application.yml:Z - - $PWD/../../k8s/resources/study/config/shortcircuit-server-config.yml:/home/powsybl/.itools/config.yml:Z + - $PWD/../../k8s/resources/study/config/shortcircuit-analysis-server-config.yml:/home/powsybl/.itools/config.yml:Z restart: unless-stopped depends_on: logspout: diff --git a/k8s/live/azure-integ/kustomization.yaml b/k8s/live/azure-integ/kustomization.yaml index 8f9adcf1..ed6dd959 100644 --- a/k8s/live/azure-integ/kustomization.yaml +++ b/k8s/live/azure-integ/kustomization.yaml @@ -101,7 +101,7 @@ images: digest: 27368e11a16ced56422ff48ed66270f5d1a1f3f0649403dc5ffceff91243c592 - name: docker.io/gridsuite/sensitivity-analysis-server digest: todo - - name: docker.io/gridsuite/shortcircuit-server + - name: docker.io/gridsuite/shortcircuit-analysis-server digest: todo - name: docker.io/gridsuite/voltage-init-server digest: todo diff --git a/k8s/live/local/kustomization.yaml b/k8s/live/local/kustomization.yaml index cac24604..d5ef13ab 100644 --- a/k8s/live/local/kustomization.yaml +++ b/k8s/live/local/kustomization.yaml @@ -45,7 +45,7 @@ resources: - dynamic-mapping-server-ingress.yaml - user-admin-server-ingress.yaml - sensitivity-analysis-server-ingress.yaml - - shortcircuit-server-ingress.yaml + - shortcircuit-analysis-server-ingress.yaml - timeseries-server-ingress.yaml - voltage-init-server-ingress.yaml diff --git a/k8s/live/local/shortcircuit-server-ingress.yaml b/k8s/live/local/shortcircuit-analysis-server-ingress.yaml similarity index 80% rename from k8s/live/local/shortcircuit-server-ingress.yaml rename to k8s/live/local/shortcircuit-analysis-server-ingress.yaml index 21b752f2..27e5620e 100644 --- a/k8s/live/local/shortcircuit-server-ingress.yaml +++ b/k8s/live/local/shortcircuit-analysis-server-ingress.yaml @@ -1,24 +1,24 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: - name: shortcircuit-server-ingress + name: shortcircuit-analysis-server-ingress annotations: nginx.ingress.kubernetes.io/configuration-snippet: | # our containers host at '/' so can't possibly make a difference between # '/XXX/' and '/XXX' (trailing slash) (which would respectively become # '/' and '' inside the container but an empty path doesn't exist in http) # so always redirect '/XXX' to '/XXX/' in the client outside the container - rewrite ^/shortcircuit-server$ /shortcircuit-server/ permanent; + rewrite ^/shortcircuit-analysis-server$ /shortcircuit-analysis-server/ permanent; # springfox swagger-ui uses X-Forwarded-Prefix to find the # base url when behind a reverse proxy. # nginx-ingress-controller has an annotation to do the same thing # (nginx.ingress.kubernetes.io/x-forwarded-prefix) # but it only works when using rewrite-target, which we can't use because # we have properly encoded slashs in urls - proxy_set_header X-Forwarded-Prefix /shortcircuit-server/; + proxy_set_header X-Forwarded-Prefix /shortcircuit-analysis-server/; # using this instead of standard rewrite as a workaround to avoid decoding slashes in urls # we sometimes have ids in the urls that contain properly encoded slashes - if ($request_uri ~ "^/shortcircuit-server(/.*)") { + if ($request_uri ~ "^/shortcircuit-analysis-server(/.*)") { proxy_pass http://upstream_balancer$1; break; } @@ -26,10 +26,10 @@ spec: rules: - http: paths: - - path: /shortcircuit-server(/|$) + - path: /shortcircuit-analysis-server(/|$) pathType: Prefix backend: service: - name: shortcircuit-server + name: shortcircuit-analysis-server port: number: 80 \ No newline at end of file diff --git a/k8s/resources/study/config/shortcircuit-server-application.yml b/k8s/resources/study/config/shortcircuit-analysis-server-application.yml similarity index 100% rename from k8s/resources/study/config/shortcircuit-server-application.yml rename to k8s/resources/study/config/shortcircuit-analysis-server-application.yml diff --git a/k8s/resources/study/config/shortcircuit-server-config.yml b/k8s/resources/study/config/shortcircuit-analysis-server-config.yml similarity index 100% rename from k8s/resources/study/config/shortcircuit-server-config.yml rename to k8s/resources/study/config/shortcircuit-analysis-server-config.yml diff --git a/k8s/resources/study/kustomization.yaml b/k8s/resources/study/kustomization.yaml index 517ad95e..42c8fba1 100644 --- a/k8s/resources/study/kustomization.yaml +++ b/k8s/resources/study/kustomization.yaml @@ -39,8 +39,8 @@ resources: - directory-notification-server-service.yaml - sensitivity-analysis-server-deployment.yaml - sensitivity-analysis-server-service.yaml - - shortcircuit-server-deployment.yaml - - shortcircuit-server-service.yaml + - shortcircuit-analysis-server-deployment.yaml + - shortcircuit-analysis-server-service.yaml - timeseries-server-deployment.yaml - timeseries-server-service.yaml - voltage-init-server-deployment.yaml @@ -105,12 +105,12 @@ configMapGenerator: - name: sensitivity-analysis-server-itools-configmap files: - config.yml=config/sensitivity-analysis-server-config.yml - - name: shortcircuit-server-configmap-specific + - name: shortcircuit-analysis-server-configmap-specific files: - - application.yml=config/shortcircuit-server-application.yml - - name: shortcircuit-server-itools-configmap + - application.yml=config/shortcircuit-analysis-server-application.yml + - name: shortcircuit-analysis-server-itools-configmap files: - - config.yml=config/shortcircuit-server-config.yml + - config.yml=config/shortcircuit-analysis-server-config.yml - name: timeseries-server-configmap-specific files: - application.yml=config/timeseries-server-application.yml diff --git a/k8s/resources/study/shortcircuit-analysis-server-deployment.yaml b/k8s/resources/study/shortcircuit-analysis-server-deployment.yaml new file mode 100644 index 00000000..19d77676 --- /dev/null +++ b/k8s/resources/study/shortcircuit-analysis-server-deployment.yaml @@ -0,0 +1,35 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: shortcircuit-analysis-server + labels: + name: shortcircuit-analysis-server + version: "1" + app.kubernetes.io/component: gridsuite-springboot + gridsuite.org/springboot-with-database: "true" + annotations: + gridsuite.org/size: springboot-xl-forking +spec: + selector: + matchLabels: + name: shortcircuit-analysis-server + template: + metadata: + labels: + name: shortcircuit-analysis-server + spec: + containers: + - name: main + image: docker.io/gridsuite/shortcircuit-analysis-server:latest + volumeMounts: + - mountPath: /config/specific + name: shortcircuit-analysis-server-configmap-specific-volume + - mountPath: /home/powsybl/.itools + name: shortcircuit-analysis-server-itools-configmap-volume + volumes: + - name: shortcircuit-analysis-server-configmap-specific-volume + configMap: + name: shortcircuit-analysis-server-configmap-specific + - name: shortcircuit-analysis-server-itools-configmap-volume + configMap: + name: shortcircuit-analysis-server-itools-configmap diff --git a/k8s/resources/study/shortcircuit-server-service.yaml b/k8s/resources/study/shortcircuit-analysis-server-service.yaml similarity index 51% rename from k8s/resources/study/shortcircuit-server-service.yaml rename to k8s/resources/study/shortcircuit-analysis-server-service.yaml index 72195937..0555597b 100644 --- a/k8s/resources/study/shortcircuit-server-service.yaml +++ b/k8s/resources/study/shortcircuit-analysis-server-service.yaml @@ -2,10 +2,10 @@ apiVersion: v1 kind: Service metadata: labels: - name: shortcircuit-server + name: shortcircuit-analysis-server app.kubernetes.io/component: gridsuite-springboot - name: shortcircuit-server + name: shortcircuit-analysis-server spec: selector: - name: shortcircuit-server + name: shortcircuit-analysis-server diff --git a/k8s/resources/study/shortcircuit-server-deployment.yaml b/k8s/resources/study/shortcircuit-server-deployment.yaml deleted file mode 100644 index 4e360b25..00000000 --- a/k8s/resources/study/shortcircuit-server-deployment.yaml +++ /dev/null @@ -1,35 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: shortcircuit-server - labels: - name: shortcircuit-server - version: "1" - app.kubernetes.io/component: gridsuite-springboot - gridsuite.org/springboot-with-database: "true" - annotations: - gridsuite.org/size: springboot-xl-forking -spec: - selector: - matchLabels: - name: shortcircuit-server - template: - metadata: - labels: - name: shortcircuit-server - spec: - containers: - - name: main - image: docker.io/gridsuite/shortcircuit-server:latest - volumeMounts: - - mountPath: /config/specific - name: shortcircuit-server-configmap-specific-volume - - mountPath: /home/powsybl/.itools - name: shortcircuit-server-itools-configmap-volume - volumes: - - name: shortcircuit-server-configmap-specific-volume - configMap: - name: shortcircuit-server-configmap-specific - - name: shortcircuit-server-itools-configmap-volume - configMap: - name: shortcircuit-server-itools-configmap