From 5ea08bb415722c6cab626569cfcb894278edbcf9 Mon Sep 17 00:00:00 2001 From: Martin Weise <martin.weise@tuwien.ac.at> Date: Mon, 3 Mar 2025 18:24:00 +0100 Subject: [PATCH] Released staging deployment Signed-off-by: Martin Weise <martin.weise@tuwien.ac.at> --- .gitlab-ci.yml | 21 ---- .gitlab/agents/dev/config.yaml | 0 .gitlab/agents/dev/values.yaml | 175 --------------------------------- 3 files changed, 196 deletions(-) delete mode 100644 .gitlab/agents/dev/config.yaml delete mode 100644 .gitlab/agents/dev/values.yaml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f61bd139cd..5e1bd497a5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -223,27 +223,6 @@ build-helm: script: - make build-helm -deploy-staging: - image: docker.io/alpine:${ALPINE_VERSION} - stage: deploy - variables: - KUBECONFIG: ./kubecfg - environment: - name: staging/datalab - url: ${CI_ENV_STAGING_URL} - before_script: - - apk add --no-cache helm kubectl make - - echo ${CI_K8S_CONFIG} | base64 -d > ./kubecfg - - make build-helm - - helm -n ${CI_ENV_STAGING_NAMESPACE} uninstall ${CI_ENV_STAGING_RELEASE_NAME} --ignore-not-found - - kubectl -n ${CI_ENV_STAGING_NAMESPACE} delete pvc --all - script: - - helm -n ${CI_ENV_STAGING_NAMESPACE} upgrade --install ${CI_ENV_STAGING_RELEASE_NAME} ./build/dbrepo-${CHART_VERSION}.tgz --create-namespace -f ./.gitlab/agents/dev/values.yaml - only: - refs: - - dev - - master - test-metadata-service: image: maven:3-openjdk-${JAVA_VERSION} stage: test diff --git a/.gitlab/agents/dev/config.yaml b/.gitlab/agents/dev/config.yaml deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/.gitlab/agents/dev/values.yaml b/.gitlab/agents/dev/values.yaml deleted file mode 100644 index 50a1615d0e..0000000000 --- a/.gitlab/agents/dev/values.yaml +++ /dev/null @@ -1,175 +0,0 @@ -hostname: s155.datalab.tuwien.ac.at -gateway: https://s155.datalab.tuwien.ac.at - -metadatadb: - enabled: true - rootUser: - user: root - password: da19c7cf5c0deba7bd47c174a0eb273b - galera: - mariabackup: - user: mariabackup - password: 9e447eeaf3e4b6aa26ea01582f0e8a54 - persistence: - enabled: true - -authservice: - enabled: true - auth: - adminUser: admin - adminPassword: ea72038fa14b968fc0ed09e182ecf624 - postgresql: - auth: - postgresPassword: 129d5b888b8df271fa482da39f15c513 - jwt: - pubkey: "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQAB" - client: - id: dbrepo-client - secret: MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG - setupJob: - image: - name: registry.datalab.tuwien.ac.at/dbrepo/auth-service-init:1.7.0 - persistence: - enabled: true - -brokerservice: - enabled: true - ldap: - bindpw: b8534187c9adf9618e7bd1c79c7f4639 - -identityservice: - enabled: true - global: - adminUser: admin - adminPassword: b8534187c9adf9618e7bd1c79c7f4639 - users: admin - userPasswords: ea72038fa14b968fc0ed09e182ecf624 - -datadb: - enabled: true - rootUser: - user: root - password: fdf8578499b2083eb3aa03a861ac7912 - galera: - mariabackup: - user: mariabackup - password: ef60e32e3217525474635cd28422c829 - replicaCount: 3 - persistence: - enabled: true - -searchdb: - enabled: true - security: - enabled: false - extraEnvs: - - name: DISABLE_INSTALL_DEMO_CONFIG - value: "true" - persistence: - enabled: true - -analyseservice: - enabled: true - image: - name: registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.7.0 - -metadataservice: - enabled: true - image: - name: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.7.0 - admin: - email: noreply@example.com - deletedRecord: permanent - repositoryName: Database Repository - granularity: YYYY-MM-DDThh:mm:ssZ - datacite: - enabled: false - url: https://api.datacite.org - prefix: "" - username: "" - password: "" - -dataservice: - enabled: true - image: - name: registry.datalab.tuwien.ac.at/dbrepo/data-service:1.7.0 - rabbitmq: - consumer: - username: admin - password: ea72038fa14b968fc0ed09e182ecf624 - s3: - auth: - username: a45e7a77607a8906e92237f00ea72f58 - password: e2c4303dcbfd3a2c606fe30d19fcb82b - filePath: /s3 - -searchservice: - enabled: true - image: - name: registry.datalab.tuwien.ac.at/dbrepo/search-service:1.7.0 - init: - image: - name: registry.datalab.tuwien.ac.at/dbrepo/search-service-init:1.7.0 - -storageservice: - enabled: true - init: - image: - name: registry.datalab.tuwien.ac.at/dbrepo/storage-service-init:1.7.0 - -uploadservice: - enabled: true - -dashboardservice: - enabled: true - -metricdb: - enabled: true - server: - rbac: - create: false - -ui: - enabled: true - image: - name: registry.datalab.tuwien.ac.at/dbrepo/ui:1.7.0 - public: - api: - client: https://s155.datalab.tuwien.ac.at - server: https://s155.datalab.tuwien.ac.at - title: "Database Repository" - logo: "https://ec.tuwien.ac.at/~weise/images/DS_white_hiRes.png" - icon: "https://ec.tuwien.ac.at/~weise/images/favicon.ico" - touch: "https://ec.tuwien.ac.at/~weise/images/DS-icon_white_hiRes.png" - broker: - host: s155.datalab.tuwien.ac.at - extra: "128.130.0.0/15" - database: - extra: "128.130.0.0/15" - pid: - default: - publisher: "TU Wien" - doi: - enabled: false - endpoint: https://doi.org - extraVolumes: [ ] - # - name: images-map - # configMap: - # name: ui-config - extraVolumeMounts: [ ] - # - name: images-map - # mountPath: /static/logo.svg - # subPath: logo.svg - -gatewayservice: - enabled: true - -ingress: - enabled: true - className: nginx - tls: - enabled: true - secretName: ingress-cert - annotations: - cert-manager.io/cluster-issuer: letsencrypt-cluster-issuer -# nginx.ingress.kubernetes.io/whitelist-source-range: 128.130.0.0/15 -- GitLab