From 0a0831a685dcca6d2f8de466be7bcf6210288dd3 Mon Sep 17 00:00:00 2001 From: vijayaraja Date: Mon, 23 Sep 2024 11:30:10 +0100 Subject: [PATCH 01/12] code cleanup --- .gitlab-ci.yml | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4c97c16..8513c12 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,6 @@ variables: DOCKER_TAG: $CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA DOCKER_IMAGE_NAME: $CI_REGISTRY_IMAGE:$DOCKER_TAG DOCKER_PULL_SECRET: docker-registry-secret - MONGO_URL: $MONGO_URL cache: paths: @@ -22,7 +21,7 @@ build: image: maven:3.8.3-openjdk-17 stage: build variables: - MONGO_URL: $MONGO_URL + MONGO_URL: $DEV_MONGO_URL script: - mvn $MAVEN_CLI_OPTS clean package -Pdocker artifacts: @@ -49,16 +48,38 @@ build_docker_image: # script: # - mvn $MAVEN_CLI_OPTS test # -deploy: + +deploy_dev: + variables: + NAMESPACE: schema-store + HOST: wwwdev.ebi.ac.uk + MONGO_URL: $DEV_MONGO_URL + environment: + name: dev + url: https://wwwdev.ebi.ac.uk/schema-store + when: manual + extends: .kube_deploy_script + +deploy_prod: + variables: + NAMESPACE: schema-store-prod + HOST: www.ebi.ac.uk + MONGO_URL: $PROD_MONGO_URL + environment: + name: prod + url: https://www.ebi.ac.uk/schema-store + when: manual + extends: .kube_deploy_script + +.kube_deploy_script: stage: deploy - image: dtzar/helm-kubectl:3.11.0 + image: dtzar/helm-kubectl script: - kubectl create namespace $KUBECTL_NAMESPACE || true - - kubectl config set-context --current --namespace=${KUBECTL_NAMESPACE} + - kubectl config set-context --current --namespace=${NAMESPACE} - kubectl delete secret $DOCKER_PULL_SECRET || true - kubectl create secret docker-registry $DOCKER_PULL_SECRET --docker-server=$CI_REGISTRY --docker-username=$CI_DEPLOY_USER --docker-password=$CI_DEPLOY_PASSWORD - envsubst < deployment.yaml > kubernetes.yaml - kubectl apply -f kubernetes.yaml - kubectl rollout restart deployments json-schema-store - when: manual From 5af04628487f2ce18d79d70d0d3717b0f9299def Mon Sep 17 00:00:00 2001 From: vijayaraja Date: Mon, 23 Sep 2024 12:18:33 +0100 Subject: [PATCH 02/12] db url at deploy time --- .gitlab-ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8513c12..ffb77e3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,8 +33,6 @@ build_docker_image: services: - docker:dind stage: publish - variables: - MONGO_URL: $MONGO_URL script: - echo "$CI_DEPLOY_PASSWORD" | docker login $CI_REGISTRY -u $CI_DEPLOY_USER --password-stdin - echo $DOCKER_IMAGE_NAME From 912988b4b9aabe5be0d0557bdf9571e9e525ce59 Mon Sep 17 00:00:00 2001 From: vijayaraja Date: Wed, 25 Sep 2024 10:20:06 +0100 Subject: [PATCH 03/12] root path --- src/main/resources/application-dev.yml | 5 ++++- src/main/resources/application-docker.yml | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index b64af5c..98fe8e9 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -3,7 +3,10 @@ spring: data: mongodb: uri: mongodb://localhost:27017/schemastore - +server: + port: 8085 + servlet: + context-path: /schema-store # spring actuator management: endpoints: diff --git a/src/main/resources/application-docker.yml b/src/main/resources/application-docker.yml index 71e5fd3..c8d3370 100644 --- a/src/main/resources/application-docker.yml +++ b/src/main/resources/application-docker.yml @@ -5,6 +5,8 @@ spring: uri: ${MONGO_URL} server: port: 8085 + servlet: + context-path: /schema-store # spring actuator management: endpoints: From 685121fa33f483b2a0f3822dd6a2c63f391de0d4 Mon Sep 17 00:00:00 2001 From: vijayaraja Date: Thu, 26 Sep 2024 11:39:01 +0100 Subject: [PATCH 04/12] namespace enc variable removed --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ffb77e3..a098ba5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -73,7 +73,7 @@ deploy_prod: stage: deploy image: dtzar/helm-kubectl script: - - kubectl create namespace $KUBECTL_NAMESPACE || true + - kubectl create namespace $NAMESPACE || true - kubectl config set-context --current --namespace=${NAMESPACE} - kubectl delete secret $DOCKER_PULL_SECRET || true - kubectl create secret docker-registry $DOCKER_PULL_SECRET --docker-server=$CI_REGISTRY --docker-username=$CI_DEPLOY_USER --docker-password=$CI_DEPLOY_PASSWORD From 2628bac90b8c9e4fc077ec3c84c0798564ab8d8b Mon Sep 17 00:00:00 2001 From: vijayaraja Date: Tue, 8 Oct 2024 15:21:01 +0100 Subject: [PATCH 05/12] spring profile --- .gitlab-ci.yml | 10 +++++-- config/application.yaml | 22 ++++++++++++++ k8s/deployment.yaml | 35 ++++++++++++++++------- k8s/ingress_template.yaml | 10 +++---- src/main/resources/application-dev.yml | 21 -------------- src/main/resources/application-docker.yml | 20 ------------- src/main/resources/application-prod.yml | 19 +----------- src/main/resources/application.yml | 15 +--------- 8 files changed, 61 insertions(+), 91 deletions(-) create mode 100644 config/application.yaml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a098ba5..c9e1333 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,7 +23,7 @@ build: variables: MONGO_URL: $DEV_MONGO_URL script: - - mvn $MAVEN_CLI_OPTS clean package -Pdocker + - mvn $MAVEN_CLI_OPTS clean package artifacts: paths: - target/json-schema-store-0.0.2.jar @@ -52,6 +52,8 @@ deploy_dev: NAMESPACE: schema-store HOST: wwwdev.ebi.ac.uk MONGO_URL: $DEV_MONGO_URL + PROFILE: docker + VALIDATOR_URL: https://wwwdev.ebi.ac.uk/ait/biovalidator/validate environment: name: dev url: https://wwwdev.ebi.ac.uk/schema-store @@ -63,6 +65,8 @@ deploy_prod: NAMESPACE: schema-store-prod HOST: www.ebi.ac.uk MONGO_URL: $PROD_MONGO_URL + PROFILE: prod + VALIDATOR_URL: https://wwwdev.ebi.ac.uk/ait/biovalidator/validate environment: name: prod url: https://www.ebi.ac.uk/schema-store @@ -77,7 +81,9 @@ deploy_prod: - kubectl config set-context --current --namespace=${NAMESPACE} - kubectl delete secret $DOCKER_PULL_SECRET || true - kubectl create secret docker-registry $DOCKER_PULL_SECRET --docker-server=$CI_REGISTRY --docker-username=$CI_DEPLOY_USER --docker-password=$CI_DEPLOY_PASSWORD - - envsubst < deployment.yaml > kubernetes.yaml + - envsubst < config/application.yml > config/application.yml + - kubectl apply -f config/application.yml + - envsubst < k8s/deployment.yaml > kubernetes.yaml - kubectl apply -f kubernetes.yaml - kubectl rollout restart deployments json-schema-store diff --git a/config/application.yaml b/config/application.yaml new file mode 100644 index 0000000..5276da3 --- /dev/null +++ b/config/application.yaml @@ -0,0 +1,22 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: app-config + namespace: ${NAMESPACE} +data: + application.yaml: | + spring: + profiles: + active: ${PROFILE} + server: + port: 8085 + servlet: + context-path: /schema-store + management: + endpoints: + web: + exposure: + include: "*" + schemastore: + validator: + url: ${VALIDATOR_URL} diff --git a/k8s/deployment.yaml b/k8s/deployment.yaml index 30f5f29..ee58277 100644 --- a/k8s/deployment.yaml +++ b/k8s/deployment.yaml @@ -2,37 +2,50 @@ apiVersion: apps/v1 kind: Deployment metadata: labels: - app: schema-store - name: schema-store + app: json-schema-store + name: json-schema-store spec: - replicas: 2 + replicas: 1 selector: matchLabels: - app: schema-store + app: json-schema-store template: metadata: labels: - app: schema-store + app: json-schema-store spec: imagePullSecrets: - name: $DOCKER_PULL_SECRET containers: - - name: schema-store + - name: json-schema-store image: $DOCKER_IMAGE_NAME imagePullPolicy: Always ports: - - containerPort: 8080 + - containerPort: 8085 + volumeMounts: + - name: config-volume + mountPath: /config/application.yaml + subPath: application.yaml + env: + - name: SPRING_DATA_MOBGODB_URI + value: ${MONGO_URL} + - name: SPRING_CONFIG_LOCATION + value: "classpath:/config/,file:/config/application.yaml" + volumes: + - name: config-volume + configMap: + name: app-config --- apiVersion: v1 kind: Service metadata: - name: biovalidator-service + name: json-schema-store-service spec: type: NodePort selector: - app: schema-store + app: json-schema-store ports: - protocol: TCP - port: 8080 - targetPort: 8080 \ No newline at end of file + port: 8085 + targetPort: 8085 diff --git a/k8s/ingress_template.yaml b/k8s/ingress_template.yaml index fe9765c..554fef6 100644 --- a/k8s/ingress_template.yaml +++ b/k8s/ingress_template.yaml @@ -1,10 +1,10 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: - name: schema-store-ingress + name: json-schema-store-ingress namespace: ${NAMESPACE} labels: - app: schema-store-service + app: json-schema-store-service annotations: nginx.ingress.kubernetes.io/rewrite-target: /$2 spec: @@ -13,10 +13,10 @@ spec: - host: ${HOST} http: paths: - - path: /ait/schemastore(/|$)(.*) + - path: /biosamples/schemastore(/|$)(.*) pathType: Prefix backend: service: - name: schema-store-service + name: json-schema-store-service port: - number: 8080 \ No newline at end of file + number: 8080 diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 98fe8e9..eedab7a 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,24 +1,3 @@ -# MongoDB conf -spring: - data: - mongodb: - uri: mongodb://localhost:27017/schemastore -server: - port: 8085 - servlet: - context-path: /schema-store -# spring actuator -management: - endpoints: - web: - exposure: - include: "*" - -# Elixir Validator -schemastore: - validator: - url: https://wwwdev.ebi.ac.uk/ait/biovalidator/validate - logging: level: org: diff --git a/src/main/resources/application-docker.yml b/src/main/resources/application-docker.yml index c8d3370..e69de29 100644 --- a/src/main/resources/application-docker.yml +++ b/src/main/resources/application-docker.yml @@ -1,20 +0,0 @@ -# MongoDB conf -spring: - data: - mongodb: - uri: ${MONGO_URL} -server: - port: 8085 - servlet: - context-path: /schema-store -# spring actuator -management: - endpoints: - web: - exposure: - include: "*" - -# Elixir Validator -schemastore: - validator: - url: https://wwwdev.ebi.ac.uk/ait/biovalidator/validate diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 9f2607d..79e1833 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -1,24 +1,7 @@ -# MongoDB conf -spring: - data: - mongodb: - port: 27017 - host: localhost - database: schemastore - repositories: - type: auto + # spring actuator management: endpoints: web: exposure: include: "*" - -# Elixir Validator -schemastore: - validator: - url: http://localhost:3020/biosamples/schema/validator/validate - -server: - servlet: - context-path: /biosamples/schema/store \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 1de05e0..ab1c736 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,18 +1,11 @@ spring: - profiles: - active: dev mvc: pathmatch: matching-strategy: ant_path_matcher data: rest: basePath: /api/v2 -# spring actuator -management: - endpoints: - web: - exposure: - include: "*" + logging: level: org: @@ -28,9 +21,3 @@ logging: ebi: biosamples: jsonschemastore: INFO - - -# Elixir Validator -schemastore: - validator: - url: http://localhost:3020/validate From f65c608cb79035d245e99789dfa73b79523ddb7b Mon Sep 17 00:00:00 2001 From: vijayaraja Date: Tue, 8 Oct 2024 15:35:20 +0100 Subject: [PATCH 06/12] yaml extension mismatch --- .gitlab-ci.yml | 2 +- config/{application.yaml => application_cfgmap.yaml} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename config/{application.yaml => application_cfgmap.yaml} (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c9e1333..af72588 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -81,7 +81,7 @@ deploy_prod: - kubectl config set-context --current --namespace=${NAMESPACE} - kubectl delete secret $DOCKER_PULL_SECRET || true - kubectl create secret docker-registry $DOCKER_PULL_SECRET --docker-server=$CI_REGISTRY --docker-username=$CI_DEPLOY_USER --docker-password=$CI_DEPLOY_PASSWORD - - envsubst < config/application.yml > config/application.yml + - envsubst < config/application_cfgmap.yaml > config/application.yaml - kubectl apply -f config/application.yml - envsubst < k8s/deployment.yaml > kubernetes.yaml - kubectl apply -f kubernetes.yaml diff --git a/config/application.yaml b/config/application_cfgmap.yaml similarity index 100% rename from config/application.yaml rename to config/application_cfgmap.yaml From a521625e05609c6174d72a76a92fbaf2b86717cc Mon Sep 17 00:00:00 2001 From: vijayaraja Date: Tue, 8 Oct 2024 15:44:01 +0100 Subject: [PATCH 07/12] yaml extension --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index af72588..ed63cab 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -82,7 +82,7 @@ deploy_prod: - kubectl delete secret $DOCKER_PULL_SECRET || true - kubectl create secret docker-registry $DOCKER_PULL_SECRET --docker-server=$CI_REGISTRY --docker-username=$CI_DEPLOY_USER --docker-password=$CI_DEPLOY_PASSWORD - envsubst < config/application_cfgmap.yaml > config/application.yaml - - kubectl apply -f config/application.yml + - kubectl apply -f config/application.yaml - envsubst < k8s/deployment.yaml > kubernetes.yaml - kubectl apply -f kubernetes.yaml - kubectl rollout restart deployments json-schema-store From 475baf2b1dc3ac220c7dbce19596b31a6433f8d0 Mon Sep 17 00:00:00 2001 From: vijayaraja Date: Wed, 9 Oct 2024 14:37:05 +0100 Subject: [PATCH 08/12] simplified deployment --- .gitlab-ci.yml | 23 +++++++----- config/application_cfgmap.yaml | 22 ------------ k8s/.gitlab-ci.old.yml | 44 ----------------------- k8s/deployment.yaml | 26 ++------------ k8s/service.yaml | 8 ++--- src/main/resources/application-dev.yml | 5 --- src/main/resources/application-docker.yml | 0 src/main/resources/application-prod.yml | 7 ---- src/main/resources/application.yml | 17 +++++++++ 9 files changed, 38 insertions(+), 114 deletions(-) delete mode 100644 config/application_cfgmap.yaml delete mode 100644 k8s/.gitlab-ci.old.yml delete mode 100644 src/main/resources/application-dev.yml delete mode 100644 src/main/resources/application-docker.yml delete mode 100644 src/main/resources/application-prod.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ed63cab..1e56ac6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -46,17 +46,26 @@ build_docker_image: # script: # - mvn $MAVEN_CLI_OPTS test # - deploy_dev: variables: NAMESPACE: schema-store - HOST: wwwdev.ebi.ac.uk + HOST: wwwint.ebi.ac.uk MONGO_URL: $DEV_MONGO_URL - PROFILE: docker VALIDATOR_URL: https://wwwdev.ebi.ac.uk/ait/biovalidator/validate environment: name: dev - url: https://wwwdev.ebi.ac.uk/schema-store + url: https://wwwint.ebi.ac.uk/biosamples/schema-store + extends: .kube_deploy_script + +deploy_test: + variables: + NAMESPACE: schema-store + HOST: wwwdev.ebi.ac.uk + MONGO_URL: $TEST_MONGO_URL + VALIDATOR_URL: https://wwwdev.ebi.ac.uk/ait/biovalidator/validate + environment: + name: test + url: https://wwwdev.ebi.ac.uk/biosamples/schema-store when: manual extends: .kube_deploy_script @@ -65,11 +74,10 @@ deploy_prod: NAMESPACE: schema-store-prod HOST: www.ebi.ac.uk MONGO_URL: $PROD_MONGO_URL - PROFILE: prod VALIDATOR_URL: https://wwwdev.ebi.ac.uk/ait/biovalidator/validate environment: name: prod - url: https://www.ebi.ac.uk/schema-store + url: https://www.ebi.ac.uk/biosamples/schema-store when: manual extends: .kube_deploy_script @@ -81,9 +89,8 @@ deploy_prod: - kubectl config set-context --current --namespace=${NAMESPACE} - kubectl delete secret $DOCKER_PULL_SECRET || true - kubectl create secret docker-registry $DOCKER_PULL_SECRET --docker-server=$CI_REGISTRY --docker-username=$CI_DEPLOY_USER --docker-password=$CI_DEPLOY_PASSWORD - - envsubst < config/application_cfgmap.yaml > config/application.yaml - - kubectl apply -f config/application.yaml - envsubst < k8s/deployment.yaml > kubernetes.yaml - kubectl apply -f kubernetes.yaml + - kubectl apply -f k8s/service.yaml - kubectl rollout restart deployments json-schema-store diff --git a/config/application_cfgmap.yaml b/config/application_cfgmap.yaml deleted file mode 100644 index 5276da3..0000000 --- a/config/application_cfgmap.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: app-config - namespace: ${NAMESPACE} -data: - application.yaml: | - spring: - profiles: - active: ${PROFILE} - server: - port: 8085 - servlet: - context-path: /schema-store - management: - endpoints: - web: - exposure: - include: "*" - schemastore: - validator: - url: ${VALIDATOR_URL} diff --git a/k8s/.gitlab-ci.old.yml b/k8s/.gitlab-ci.old.yml deleted file mode 100644 index 132dbfc..0000000 --- a/k8s/.gitlab-ci.old.yml +++ /dev/null @@ -1,44 +0,0 @@ -image: maven:latest - -variables: - MAVEN_CLI_OPTS: "-DskipTests" - -cache: - paths: - - .m2/repository/ - - target/ - -stages: - - build -# - test - - deploy - -build: - stage: build - script: - - mvn $MAVEN_CLI_OPTS package -Pprod - artifacts: - paths: - - target/json-schema-store-0.0.1-SNAPSHOT.jar - -#test: -# stage: test -# script: -# - mvn $MAVEN_CLI_OPTS test -# -deploy: - image: ubuntu - stage: deploy - script: - - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client git -y )' - - eval $(ssh-agent -s) - - echo "$BSD_PROD_SSH_KEY" | tr -d '\r' | ssh-add - - - mkdir -p ~/.ssh - - chmod 700 ~/.ssh - - ssh-keyscan ebi-cli >> ~/.ssh/known_hosts - - chmod 644 ~/.ssh/known_hosts - - ssh -v -o StrictHostKeyChecking=no tc_spo01@wp-p1m2-3d "rm -rf ~/deployments/sw/www/json-schema-store/*" - - scp -r -v -o StrictHostKeyChecking=no ./target/json-schema-store-*.jar tc_spo01@wp-p1m2-3d:~/deployments/sw/www/json-schema-store/json-schema-store.jar - - ssh -v -o StrictHostKeyChecking=no tc_spo01@wp-p1m2-3d "~/config/start.sh" -# only: -# - master \ No newline at end of file diff --git a/k8s/deployment.yaml b/k8s/deployment.yaml index ee58277..70b4309 100644 --- a/k8s/deployment.yaml +++ b/k8s/deployment.yaml @@ -22,30 +22,8 @@ spec: imagePullPolicy: Always ports: - containerPort: 8085 - volumeMounts: - - name: config-volume - mountPath: /config/application.yaml - subPath: application.yaml env: - name: SPRING_DATA_MOBGODB_URI value: ${MONGO_URL} - - name: SPRING_CONFIG_LOCATION - value: "classpath:/config/,file:/config/application.yaml" - volumes: - - name: config-volume - configMap: - name: app-config - ---- -apiVersion: v1 -kind: Service -metadata: - name: json-schema-store-service -spec: - type: NodePort - selector: - app: json-schema-store - ports: - - protocol: TCP - port: 8085 - targetPort: 8085 + - name: BIO_VALIDATOR_URL + value: ${VALIDATOR_URL} diff --git a/k8s/service.yaml b/k8s/service.yaml index 5826ba7..a5393ff 100644 --- a/k8s/service.yaml +++ b/k8s/service.yaml @@ -1,12 +1,12 @@ apiVersion: v1 kind: Service metadata: - name: schema-store + name: json-schema-store-service spec: type: NodePort selector: - app: schema-store + app: json-schema-store ports: - protocol: TCP - port: 8080 - targetPort: 8080 \ No newline at end of file + port: 8085 + targetPort: 8085 diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml deleted file mode 100644 index eedab7a..0000000 --- a/src/main/resources/application-dev.yml +++ /dev/null @@ -1,5 +0,0 @@ -logging: - level: - org: - springframework: - security: DEBUG diff --git a/src/main/resources/application-docker.yml b/src/main/resources/application-docker.yml deleted file mode 100644 index e69de29..0000000 diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml deleted file mode 100644 index 79e1833..0000000 --- a/src/main/resources/application-prod.yml +++ /dev/null @@ -1,7 +0,0 @@ - -# spring actuator -management: - endpoints: - web: - exposure: - include: "*" diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index ab1c736..f8bc706 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,3 +1,4 @@ +# MongoDB conf spring: mvc: pathmatch: @@ -5,6 +6,22 @@ spring: data: rest: basePath: /api/v2 +server: + port: 8085 + servlet: + context-path: /biosamples/schema-store +# spring actuator +management: + endpoints: + web: + exposure: + include: "*" + +# Elixir Validator +schemastore: + validator: + url: ${BIO_VALIDATOR_URL} + logging: level: From 1ee620106634bceb0aa1a7a7591b1a1f529ed360 Mon Sep 17 00:00:00 2001 From: vijayaraja Date: Wed, 9 Oct 2024 14:38:52 +0100 Subject: [PATCH 09/12] namespaces renamed --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1e56ac6..4e2df21 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,7 +48,7 @@ build_docker_image: # deploy_dev: variables: - NAMESPACE: schema-store + NAMESPACE: biosamples-dev HOST: wwwint.ebi.ac.uk MONGO_URL: $DEV_MONGO_URL VALIDATOR_URL: https://wwwdev.ebi.ac.uk/ait/biovalidator/validate @@ -59,7 +59,7 @@ deploy_dev: deploy_test: variables: - NAMESPACE: schema-store + NAMESPACE: biosamples-test HOST: wwwdev.ebi.ac.uk MONGO_URL: $TEST_MONGO_URL VALIDATOR_URL: https://wwwdev.ebi.ac.uk/ait/biovalidator/validate @@ -71,7 +71,7 @@ deploy_test: deploy_prod: variables: - NAMESPACE: schema-store-prod + NAMESPACE: biosamples-prod HOST: www.ebi.ac.uk MONGO_URL: $PROD_MONGO_URL VALIDATOR_URL: https://wwwdev.ebi.ac.uk/ait/biovalidator/validate From d7f99624b37e968fb9e5ce77f0895562f8ab5c5d Mon Sep 17 00:00:00 2001 From: vijayaraja Date: Wed, 9 Oct 2024 14:57:56 +0100 Subject: [PATCH 10/12] profile removed --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index dc790d6..cddf5fa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,4 +2,4 @@ FROM openjdk:17-jdk-slim EXPOSE 27017 ARG JAR_FILE=target/json-schema-store-0.0.2.jar COPY ${JAR_FILE} json-schema-store.jar -ENTRYPOINT ["java","-jar","/json-schema-store.jar", "--spring.profiles.active=docker"] +ENTRYPOINT ["java","-jar","/json-schema-store.jar"] From 50c717d599df9ccfeda1086362f50a659c69d4c4 Mon Sep 17 00:00:00 2001 From: vijayaraja Date: Thu, 10 Oct 2024 10:45:37 +0100 Subject: [PATCH 11/12] mongo url added --- k8s/deployment.yaml | 2 +- src/main/resources/application.yml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/k8s/deployment.yaml b/k8s/deployment.yaml index 70b4309..f1fb442 100644 --- a/k8s/deployment.yaml +++ b/k8s/deployment.yaml @@ -23,7 +23,7 @@ spec: ports: - containerPort: 8085 env: - - name: SPRING_DATA_MOBGODB_URI + - name: MONGO_URL value: ${MONGO_URL} - name: BIO_VALIDATOR_URL value: ${VALIDATOR_URL} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index f8bc706..d54dccc 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -4,6 +4,8 @@ spring: pathmatch: matching-strategy: ant_path_matcher data: + mongodb: + uri: ${MONGO_URL} rest: basePath: /api/v2 server: From 55e83ff614d54def6b48c0a6eb141f63f1521811 Mon Sep 17 00:00:00 2001 From: vijayaraja Date: Thu, 10 Oct 2024 11:17:07 +0100 Subject: [PATCH 12/12] service name change --- k8s/ingress_template.yaml | 22 ---------------------- k8s/service.yaml | 2 +- 2 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 k8s/ingress_template.yaml diff --git a/k8s/ingress_template.yaml b/k8s/ingress_template.yaml deleted file mode 100644 index 554fef6..0000000 --- a/k8s/ingress_template.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: json-schema-store-ingress - namespace: ${NAMESPACE} - labels: - app: json-schema-store-service - annotations: - nginx.ingress.kubernetes.io/rewrite-target: /$2 -spec: - ingressClassName: nginx - rules: - - host: ${HOST} - http: - paths: - - path: /biosamples/schemastore(/|$)(.*) - pathType: Prefix - backend: - service: - name: json-schema-store-service - port: - number: 8080 diff --git a/k8s/service.yaml b/k8s/service.yaml index a5393ff..3cf9b24 100644 --- a/k8s/service.yaml +++ b/k8s/service.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Service metadata: - name: json-schema-store-service + name: json-schema-store spec: type: NodePort selector: