add staging options and kube

.gitlab-ci.yml

@@ -62,37 +62,46 @@ dockerhub:
         - go.mod
         - Dockerfile
 
-production:
+staging:
   stage: deploy
   image:
     name: docker.io/blintmester/base-helm-kubectl:1.0.1
     entrypoint: [""]
   needs:
     - dockerhub
+  environment:
+    name: valkyrie
+    kubernetes:
+      namespace: becskasszasch-staging
   before_script:
     - echo $KUBECONFIG
     - chmod 600 $KUBECONFIG
   script:
     - bash
     - cd "$CI_PROJECT_DIR"/k8s
-    - envsubst < values.yaml | helm upgrade --install --wait becskasszasch . -n apps --values -
+    - envsubst < values.staging.yaml | helm upgrade --install --wait becskasszasch . -n becskasszasch-staging --values -
   rules:
-    - if: $CI_COMMIT_TAG
-      when: manual
+    - when: manual
 
-staging:
+production:
   stage: deploy
   image:
     name: docker.io/blintmester/base-helm-kubectl:1.0.1
     entrypoint: [""]
   needs:
     - dockerhub
+  environment:
+    name: valkyrie
+    kubernetes:
+      namespace: apps
   before_script:
     - echo $KUBECONFIG
     - chmod 600 $KUBECONFIG
   script:
     - bash
     - cd "$CI_PROJECT_DIR"/k8s
-    - envsubst < values.yaml | helm upgrade --install --wait becskasszasch . -n becskasszasch-staging --values -
+    - envsubst < values.yaml | helm upgrade --install --wait becskasszasch . -n apps --values -
   rules:
-    - when: manual
\ No newline at end of file
+    - if: $CI_COMMIT_TAG
+      when: manual
+

k8s/values.staging.yaml

+replicas: 1
+
+Domain: staging.becskassza.kszk.bme.hu
+CLIENTID: "${STAGING_CLIENTID}"
+CLIENTSECRET: "${STAGING_CLIENTSECRET}"
+POSTGRES: "${STAGING_POSTGRES}"
+POSTGRES_PASS: "${STAGING_POSTGRES_PASS}"
+POSTGRES_USER: "${STAGING_POSTGRES_USER}"
+POSTGRES_DB: "${STAGING_POSTGRES_DB}"
+Tag: "${CI_COMMIT_REF_NAME}"
+# for local deploy Tag: "vx.y.z"

k8s/values.yaml

@@ -9,4 +9,3 @@ POSTGRES_USER: "${POSTGRES_USER}"
 POSTGRES_DB: "${POSTGRES_DB}"
 Tag: "${CI_COMMIT_REF_NAME}"
 # for local deploy Tag: "vx.y.z"
-REGISTRY_CONF: "${REGISTRY_CONF}"