diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4af5a3d5e4b3f22ed44abb7c74be8d06c4cd4b72..e49b7f33f6fb9c7928c899b8f1cd7271fe300be1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -86,18 +86,6 @@ deploy_development: - kubectl set image -f ./kubernetes/deployment.yaml b-container=registry.opencode.de/opencode-analyzer/data-provider:dev_${CI_COMMIT_SHORT_SHA} --namespace=fraunhofer --local -o yaml | kubectl apply --namespace=fraunhofer -f - - kubectl apply --namespace=fraunhofer -f ./kubernetes/service.yaml -deploy_development_2: - image: bitnami/kubectl - before_script: - - export KUBECONFIG=$KUBECONFIG_FILE - stage: deploy - only: - - dev - script: - - kubectl apply --namespace=fraunhofer -f ./kubernetes/configmap-dev.yaml - - kubectl set image -f ./kubernetes/deployment-dev.yaml b-dev-container=registry.opencode.de/opencode-analyzer/data-provider:dev_${CI_COMMIT_SHORT_SHA} --namespace=fraunhofer --local -o yaml | kubectl apply --namespace=fraunhofer -f - - - kubectl apply --namespace=fraunhofer -f ./kubernetes/service-dev.yaml - deploy_production: image: bitnami/kubectl before_script: @@ -106,6 +94,6 @@ deploy_production: only: - main script: - - kubectl apply --namespace=fraunhoferprod -f ./kubernetes/configmap.yaml - - kubectl set image -f ./kubernetes/deployment.yaml b-container=registry.opencode.de/opencode-analyzer/data-provider:${CI_COMMIT_SHORT_SHA} --namespace=fraunhoferprod --local -o yaml | kubectl apply --namespace=fraunhoferprod -f - + - kubectl apply --namespace=fraunhoferprod -f ./kubernetes/configmap-prod.yaml + - kubectl set image -f ./kubernetes/deployment-prod.yaml b-container=registry.opencode.de/opencode-analyzer/data-provider:${CI_COMMIT_SHORT_SHA} --namespace=fraunhoferprod --local -o yaml | kubectl apply --namespace=fraunhoferprod -f - - kubectl apply --namespace=fraunhoferprod -f ./kubernetes/service.yaml diff --git a/kubernetes/configmap-dev.yaml b/kubernetes/configmap-prod.yaml similarity index 72% rename from kubernetes/configmap-dev.yaml rename to kubernetes/configmap-prod.yaml index e3090bf34d2f5336446d245e53067d0f4b5a14e0..037ea07a402139fba3b08a469a774d34fc0c6118 100644 --- a/kubernetes/configmap-dev.yaml +++ b/kubernetes/configmap-prod.yaml @@ -1,11 +1,11 @@ apiVersion: v1 kind: ConfigMap metadata: - name: data-provider-dev-config-map + name: data-provider-config-map data: GIT_CLONE_TARGET_DIRECTORY: "/app/git" OCCMD_PATH: "/app/scripts/occmd.sh" PORT: "5000" MANAGEMENT_PORT: "5001" XDG_CONFIG_HOME: "/app/.config" - CORS_ORIGIN: "https://dev-kpi.o4oe.de" + CORS_ORIGIN: "https://sec-kpi.opencode.de" diff --git a/kubernetes/deployment-dev.yaml b/kubernetes/deployment-prod.yaml similarity index 89% rename from kubernetes/deployment-dev.yaml rename to kubernetes/deployment-prod.yaml index bdcd81587a6a457813a889ac7a50ea95cd274c7c..577a30c2b183603a1c3db7e8575102115a58a9b2 100644 --- a/kubernetes/deployment-dev.yaml +++ b/kubernetes/deployment-prod.yaml @@ -1,29 +1,29 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: b-dev-deployment + name: b-deployment annotations: field.cattle.io/description: Backend of Fraunhofer OpenCoDE Analyzer labels: - workload.user.cattle.io/workloadselector: apps.deployment-fraunhofer-b-dev-deployment + workload.user.cattle.io/workloadselector: apps.deployment-fraunhofer-b-deployment spec: selector: matchLabels: - workload.user.cattle.io/workloadselector: apps.deployment-fraunhofer-b-dev-deployment + workload.user.cattle.io/workloadselector: apps.deployment-fraunhofer-b-deployment template: metadata: labels: - workload.user.cattle.io/workloadselector: apps.deployment-fraunhofer-b-dev-deployment + workload.user.cattle.io/workloadselector: apps.deployment-fraunhofer-b-deployment spec: securityContext: runAsNonRoot: true volumes: - name: db-secret-volume secret: - secretName: cockroachdb.client.fraunhoferpoc + secretName: cockroachdb.client.fraunhoferpocprod containers: - imagePullPolicy: Always - name: b-dev-container + name: b-container image: registry.opencode.de/opencode-analyzer/data-provider:latest volumeMounts: - mountPath: "/cockroach-certs" @@ -37,7 +37,7 @@ spec: cpu: 4000m memory: 8G ports: - - name: b-dev-service + - name: b-service containerPort: 5000 env: - name: ADMIN_PASSWORD @@ -64,6 +64,6 @@ spec: - configMapRef: name: crdbconf - configMapRef: - name: data-provider-dev-config-map + name: data-provider-config-map restartPolicy: Always replicas: 1 diff --git a/kubernetes/service-dev.yaml b/kubernetes/service-dev.yaml deleted file mode 100644 index c616a09ba34fdc06a2cda3a599be9255cfb2d4ac..0000000000000000000000000000000000000000 --- a/kubernetes/service-dev.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: b-dev-service -spec: - selector: - workload.user.cattle.io/workloadselector: apps.deployment-fraunhofer-b-dev-deployment - ports: - - port: 5000 - targetPort: 5000