pipeline upgrades

* the managed-cert reference should be correctly set now
* app version is abstracted into its own data file

.gitlab-ci.yml

@@ -23,6 +23,7 @@ stages:
 .gke-initialization:
   image: google/cloud-sdk:${GOOGLE_CLOUD_SDK_IMAGE_VERSION}
   before_script:
+    # BASE64_GOOGLE_CREDENTIALS is a masked CI/CD GitLab variable
     - echo $BASE64_GOOGLE_CREDENTIALS | base64 -d > ~/service_account.json
     - gcloud auth activate-service-account --key-file ~/service_account.json
     - gcloud config set project ${GCP_PROJECT_ID}
@@ -34,17 +35,7 @@ stages:
   tags:
   - docker
   script:
-    - IMAGE="${CI_REGISTRY_IMAGE}:$VERSION"
-    - cd "./k8s-manifests"
-    - kubectl apply -f gitlab-registry-credentials.yaml --namespace "${ENVIRONMENT_NAME}-${K8S_NAMESPACE}"
-    - SECRETS_MANIFEST=$(sed -e "s,{{jwtSecret}},${JWT_SECRET},g" ./secrets.yaml.tmpl)
-    - echo "${SECRETS_MANIFEST}" | kubectl apply --namespace "${ENVIRONMENT_NAME}-${K8S_NAMESPACE}" --filename -
-    - kubectl apply -f configmap.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}"
-    - INGRESS_MANIFEST=$(sed -e "s,{{static-ip-name}},${STATIC_IP},g" -e "s,{{allowHttpFlag}},true,g" -e "s,{{portNumber}},80,g" ./ingress.yaml.tmpl)
-    - echo "${INGRESS_MANIFEST}" | kubectl apply --namespace "${ENVIRONMENT_NAME}-${K8S_NAMESPACE}" --filename -
+
 
 run-tests:
   stage: test
@@ -108,7 +99,7 @@ create-release-image:
     - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY}
     - docker pull "${CONTAINER_TAG}"
   script:
-    - VERSION=$(grep '"version"' ./app/client/package.json | cut -d '"' -f 4 | head -n 1)
+    - VERSION=$(grep '"version"' ./app/app-version.json | cut -d '"' -f 4 | head -n 1)
     - docker tag "${CONTAINER_TAG}" "${CI_REGISTRY_IMAGE}:${VERSION}"
     - docker push "${CI_REGISTRY_IMAGE}:${VERSION}"
   after_script:
@@ -132,7 +123,7 @@ create-release-tag:
     - PROJECT_URL=$(echo $CI_PROJECT_URL | sed 's/https:\/\///')
     - git remote set-url origin https://oauth2:${APP_CI_ACCESS_TOKEN}@${PROJECT_URL}
   script:
-    - VERSION=$(grep '"version"' ./app/client/package.json | cut -d '"' -f 4 | head -n 1)
+    - VERSION=$(grep '"version"' ./app/app-version.json | cut -d '"' -f 4 | head -n 1)
     - echo ${VERSION}
     - TAG=v${VERSION}
     - git tag $TAG && git push origin $TAG
@@ -143,6 +134,8 @@ deploy-new-staging-version:
   stage: deploy
   needs:
     - 'build-image'
+  tags:
+    - docker
   rules:
     - if: $CI_COMMIT_REF_NAME =~ /staging/
       when: 'always'
@@ -151,6 +144,19 @@ deploy-new-staging-version:
         STATIC_IP: staging-todoapp-ip
         VERSION: ${CI_PIPELINE_IID}-${CI_COMMIT_SHORT_SHA}
     - when: never
+  script:
+    - IMAGE="${CI_REGISTRY_IMAGE}:$VERSION"
+    - cd "./k8s-manifests"
+    - kubectl apply -f gitlab-registry-credentials.yaml --namespace "${ENVIRONMENT_NAME}-${K8S_NAMESPACE}"
+    # JWT_SECRET is a masked CI/CD GitLab variable
+    - SECRETS_MANIFEST=$(sed -e "s,{{jwtSecret}},${JWT_SECRET},g" ./secrets.yaml.tmpl)
+    - echo "${SECRETS_MANIFEST}" | kubectl apply --namespace "${ENVIRONMENT_NAME}-${K8S_NAMESPACE}" --filename -
+    - kubectl apply -f configmap.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}"
+    - INGRESS_MANIFEST=$(sed -e "s,{{static-ip-name}},${STATIC_IP},g" -e "s,{{allowHttpFlag}},true,g" -e "s,{{portNumber}},80,g" -e "s,{{suffix}},${ENVIRONMENT_NAME},g" ./ingress.yaml.tmpl)
+    - echo "${INGRESS_MANIFEST}" | kubectl apply --namespace "${ENVIRONMENT_NAME}-${K8S_NAMESPACE}" --filename -
 
 deploy-new-release:
   extends: .gke-initialization
@@ -167,17 +173,18 @@ deploy-new-release:
   tags:
     - docker
   script:
-    - VERSION=$(grep '"version"' ./app/client/package.json | cut -d '"' -f 4 | head -n 1)
+    - VERSION=$(grep '"version"' ./app/app-version.json | cut -d '"' -f 4 | head -n 1)
     - IMAGE="${CI_REGISTRY_IMAGE}:$VERSION"
     - cd "./k8s-manifests"
     - kubectl apply -f gitlab-registry-credentials.yaml --namespace "${ENVIRONMENT_NAME}-${K8S_NAMESPACE}"
+    # JWT_SECRET is a masked CI/CD GitLab variable
     - SECRETS_MANIFEST=$(sed -e "s,{{jwtSecret}},${JWT_SECRET},g" ./secrets.yaml.tmpl)
     - echo "${SECRETS_MANIFEST}" | kubectl apply --namespace "${ENVIRONMENT_NAME}-${K8S_NAMESPACE}" --filename -
     - kubectl apply -f configmap.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}"
-    - INGRESS_MANIFEST=$(sed -e "s,{{static-ip-name}},${STATIC_IP},g" -e "s,{{allowHttpFlag}},true,g" -e "s,{{portNumber}},80,g"  -e "s,{{suffix}},production,g" ./ingress.yaml.tmpl)
+    - INGRESS_MANIFEST=$(sed -e "s,{{static-ip-name}},${STATIC_IP},g" -e "s,{{allowHttpFlag}},true,g" -e "s,{{portNumber}},80,g"  -e "s,{{suffix}},${ENVIRONMENT_NAME},g" ./ingress.yaml.tmpl)
     - echo "${INGRESS_MANIFEST}" | kubectl apply --namespace "${ENVIRONMENT_NAME}-${K8S_NAMESPACE}" --filename -
 
 switch-to-https:
@@ -197,6 +204,6 @@ switch-to-https:
   tags:
     - docker
   script:
-    - INGRESS_MANIFEST=$(sed -e "s,{{static-ip-name}},${STATIC_IP},g" -e "s,{{allowHttpFlag}},false,g" -e "s,{{portNumber}},443,g" ./k8s-manifests/ingress.yaml.tmpl)
+    - INGRESS_MANIFEST=$(sed -e "s,{{static-ip-name}},${STATIC_IP},g" -e "s,{{allowHttpFlag}},false,g" -e "s,{{portNumber}},443,g" -e "s,{{suffix}},${ENVIRONMENT_NAME},g" ./k8s-manifests/ingress.yaml.tmpl)
     - echo "${INGRESS_MANIFEST}" | kubectl apply --namespace "${ENVIRONMENT_NAME}-${K8S_NAMESPACE}" --filename -
   when: manual

app/app-version.json

+{
+    "version": "2.0.1"
+}