Merge branch 'staging' into 'main'

Updating main to reflect staging

See merge request !37

.gitlab-ci.yml

@@ -134,7 +134,8 @@ deploy-image:
     - kubectl apply -f secrets.yaml --namespace "${ENVIRONMENT_NAME}-${K8S_NAMESPACE}"
     - kubectl apply -f gitlab-registry-credentials.yaml --namespace "${ENVIRONMENT_NAME}-${K8S_NAMESPACE}"
     - kubectl apply -f configmap.yaml --namespace "${ENVIRONMENT_NAME}-${K8S_NAMESPACE}"
-    - kubectl apply -f deployment.yaml --namespace "${ENVIRONMENT_NAME}-${K8S_NAMESPACE}"
+    - DEPLOYMENT_MANIFEST=$(sed -e "s,{{image}},${IMAGE},g" ./deployment.yaml.tmpl)
+    - echo "${DEPLOYMENT_MANIFEST}" | kubectl apply --namespace "${ENVIRONMENT_NAME}-${K8S_NAMESPACE}" --filename -
     - kubectl apply -f service.yaml --namespace "${ENVIRONMENT_NAME}-${K8S_NAMESPACE}"
     - kubectl apply -f ingress.yaml --namespace "${ENVIRONMENT_NAME}-${K8S_NAMESPACE}"
 

k8s-manifests/configmap.yaml

@@ -3,5 +3,5 @@ kind: ConfigMap
 metadata:
   name: todo-app-config
 data:
-  PORT: 3000
+  PORT: "3000"
   MONGODB_URL: mongodb-service

k8s-manifests/deployment.yaml → k8s-manifests/deployment.yaml.tmpl

@@ -19,7 +19,7 @@ spec:
       imagePullSecrets:
       - name: 'gitlab-registry-credentials'
       containers:
-      - image: devops-app
+      - image: {{image}}
         name: todo-app-container
         ports:
         - containerPort: 3000
@@ -27,6 +27,6 @@ spec:
         # env for mongodb username and pass?
         envFrom:
         - configMapRef:
-          name: todo-app-config
+            name: todo-app-config
         - secretRef:
-          name: todo-app-secrets
+            name: todo-app-secrets

k8s-manifests/gitlab-registry-credentials.yaml

@@ -2,7 +2,6 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: gitlab-registry-credentials
-  namespace: default
 type: kubernetes.io/dockerconfigjson
 data:
   .dockerconfigjson: ewogICAgImF1dGhzIjogewogICAgICAgICJodHRwczovL3JlZ2lzdHJ5LmdpdGxhYi5jb20iOnsKICAgICAgICAgICAgInVzZXJuYW1lIjoiazhzLXNlY3JldC1wdWxsZXIiLAogICAgICAgICAgICAicGFzc3dvcmQiOiJ5MnQzaXpaRTkxaUd6czlnYWg1eiIsCiAgICAgICAgICAgICJhdXRoIjoiYXpoekxYTmxZM0psZEMxd2RXeHNaWEk2ZVRKME0ybDZXa1U1TVdsSGVuTTVaMkZvTlhvPSIKICAgICAgICB9CiAgICB9Cn0K