Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename spreadsheet-config-server into study-config-server #470

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ on:
- voltage_init_server_updated
- case_import_server_updated
- gridadmin_app_updated
- spreadsheet_config_server_updated
- study_config_server_updated

jobs:
build:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ http://localhost:5033/swagger-ui.html // user-admin-server
http://localhost:5034/swagger-ui.html // user-identity-server
http://localhost:5030/swagger-ui.html // sensitivity-analysis-server
http://localhost:5031/swagger-ui.html // shortcircuit-server
http://localhost:5035/swagger-ui.html // spreadsheet-config-server
http://localhost:5035/swagger-ui.html // study-config-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
Expand Down Expand Up @@ -421,7 +421,7 @@ http://<INGRESS_HOST>/shortcircuit-server/swagger-ui.html
http://<INGRESS_HOST>/timeseries-server/swagger-ui.html
http://<INGRESS_HOST>/voltage-init-server/swagger-ui.html
http://<INGRESS_HOST>/case-import-server/swagger-ui.html
http://<INGRESS_HOST>/spreadsheet-config-server/swagger-ui.html
http://<INGRESS_HOST>/study-config-server/swagger-ui.html
```

## How to use a local docker image into Minikube?
Expand Down
6 changes: 3 additions & 3 deletions docker-compose/docker-compose.base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ services:
limits:
memory: 384m

spreadsheet-config-server:
study-config-server:
profiles:
- all
- suite
Expand All @@ -139,11 +139,11 @@ services:
- dynamic-mapping
- dynamic-simulation
- import
image: gridsuite/spreadsheet-config-server:latest
image: gridsuite/study-config-server:latest
ports:
- 5035:80
volumes:
- $PWD/../../k8s/resources/common/config/spreadsheet-config-server-application.yml:/config/specific/application.yml:Z
- $PWD/../../k8s/resources/common/config/study-config-server-application.yml:/config/specific/application.yml:Z
- $PWD/../../k8s/resources/common/config/common-application.yml:/config/common/application.yml:Z
restart: unless-stopped
depends_on:
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/technical/create-postgres-databases.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ psql --username $POSTGRES_USER --dbname $POSTGRES_DEFAULT_DB <<-EOSQL
create database "${DATABASE_PREFIX_NAME}voltageinit";
create database "${DATABASE_PREFIX_NAME}loadflow";
create database "${DATABASE_PREFIX_NAME}stateestimation";
create database "${DATABASE_PREFIX_NAME}spreadsheetconfig";
create database "${DATABASE_PREFIX_NAME}studyconfig";
create database "${DATABASE_PREFIX_NAME}useridentity_oidcreplication";
EOSQL
}
Expand Down
2 changes: 1 addition & 1 deletion k8s/live/local/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ resources:
- shortcircuit-server-ingress.yaml
- timeseries-server-ingress.yaml
- voltage-init-server-ingress.yaml
- spreadsheet-config-server-ingress.yaml
- study-config-server-ingress.yaml

configMapGenerator:
- name: gridapps-env-configmap
Expand Down
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: spreadsheet-config-server-ingress
name: study-config-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 ^/spreadsheet-config-server$ /spreadsheet-config-server/ permanent;
rewrite ^/study-config-server$ /study-config-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 /spreadsheet-config-server/;
proxy_set_header X-Forwarded-Prefix /study-config-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 ~ "^/spreadsheet-config-server(/.*)") {
if ($request_uri ~ "^/study-config-server(/.*)") {
proxy_pass http://upstream_balancer$1;
break;
}
spec:
rules:
- http:
paths:
- path: /spreadsheet-config-server(/|$)
- path: /study-config-server(/|$)
pathType: Prefix
backend:
service:
name: spreadsheet-config-server
name: study-config-server
port:
number: 80
8 changes: 4 additions & 4 deletions k8s/resources/common/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ resources:
- config-notification-server-service.yaml
- user-admin-server-deployment.yaml
- user-admin-server-service.yaml
- spreadsheet-config-server-deployment.yaml
- spreadsheet-config-server-service.yaml
- study-config-server-deployment.yaml
- study-config-server-service.yaml
- user-identity-oidc-replication-server-deployment.yaml
- user-identity-server-service.yaml

Expand Down Expand Up @@ -98,9 +98,9 @@ configMapGenerator:
- name: user-admin-server-configmap-specific
files:
- application.yml=config/user-admin-server-application.yml
- name: spreadsheet-config-server-configmap-specific
- name: study-config-server-configmap-specific
files:
- application.yml=config/spreadsheet-config-server-application.yml
- application.yml=config/study-config-server-application.yml
- name: user-identity-oidc-replication-server-configmap-specific
files:
- application.yml=config/user-identity-oidc-replication-server-application.yml
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: spreadsheet-config-server
name: study-config-server
labels:
name: spreadsheet-config-server
name: study-config-server
version: "1"
app.kubernetes.io/component: gridsuite-springboot
gridsuite.org/springboot-with-database: "true"
Expand All @@ -12,19 +12,19 @@ metadata:
spec:
selector:
matchLabels:
name: spreadsheet-config-server
name: study-config-server
template:
metadata:
labels:
name: spreadsheet-config-server
name: study-config-server
spec:
containers:
- name: main
image: docker.io/gridsuite/spreadsheet-config-server:latest
image: docker.io/gridsuite/study-config-server:latest
volumeMounts:
- mountPath: /config/specific
name: spreadsheet-config-server-configmap-specific-volume
name: study-config-server-configmap-specific-volume
volumes:
- name: spreadsheet-config-server-configmap-specific-volume
- name: study-config-server-configmap-specific-volume
configMap:
name: spreadsheet-config-server-configmap-specific
name: study-config-server-configmap-specific
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ apiVersion: v1
kind: Service
metadata:
labels:
name: spreadsheet-config-server
name: study-config-server
app.kubernetes.io/component: gridsuite-springboot
name: spreadsheet-config-server
name: study-config-server
spec:
selector:
name: spreadsheet-config-server
name: study-config-server