Merge branch 'dev' into 'main'

add production deployment

See merge request !11

.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

kubernetes/configmap-dev.yaml → kubernetes/configmap-prod.yaml

 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"

kubernetes/deployment-dev.yaml → kubernetes/deployment-prod.yaml

 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

kubernetes/service-dev.yaml

-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