Merge branch 'just-a-test' into 'main'

updated logic of the test-job See merge request !31

Merge branch 'just-a-test' into 'main'
b45a0254 · Dobromir Palushev · f1fa079b · cd5553c5 · b45a0254 · b45a0254
Commit b45a0254 authored 2 years ago by Dobromir Palushev
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,13 +7,15 @@ workflow:

 variables:
  DOCKER_VERSION: '20.10.17'
-  K8S_VERSION: '1.24'
-  GOOGLE_CLOUD_SDK_IMAGE_VERSION: '400.0.0'
+  MONGO_VERSION: '4.4'
  K8S_NAMESPACE: 'todoapp-devops'
+  GOOGLE_CLOUD_SDK_IMAGE_VERSION: '400.0.0'
+  GCP_PROJECT_ID: ss22-devops-app
+  GCP_COMPUTE_REGION: 'europe-west4'
  CONTAINER_TAG: '${CI_REGISTRY_IMAGE}:${CI_PIPELINE_IID}-${CI_COMMIT_SHORT_SHA}'

 stages:
-  - test
+  # - test
  - build
  - release
  - deploy
@@ -26,27 +28,33 @@ stages:
    - gcloud config set compute/zone ${GCP_COMPUTE_REGION}
    - gcloud container clusters get-credentials ${GCP_PROJECT_ID}-gke

-test-image:
-  stage: test
-  tags:
-    - docker-priviliged
-  image: docker:${DOCKER_VERSION}
-  services:
-    - name: docker:${DOCKER_VERSION}-dind
-  script:
-    - docker build
-      --tag "${CONTAINER_TAG}-test"
-      --target=test
-      "./"
-  after_script:
-    - docker image rm --force "${CONTAINER_TAG}-test"
+# run-tests:
+#   stage: test
+#   tags:
+#     - docker-privileged
+#   image: docker:${DOCKER_VERSION}
+#   services:
+#     - name: docker:${DOCKER_VERSION}-dind
+#       alias: containerhost
+#   script:
+#     - docker run -p 27017:27017 -d --name mongo-container --rm mongo:${MONGO_VERSION}
+#     - docker build
+#       --tag "${CONTAINER_TAG}-test"
+#       --target=test
+#       --build-arg MONGODB_URL_TEST=mongodb://containerhost:27017/todo-app
+#       --build-arg JWT_SECRET_TEST=my-very-secret-jwt
+#       "./app"
+#   after_script:
+#     - docker stop mongo-container
+#     - docker images -a | grep "mongo" | awk '{print $3}' | xargs docker rmi --force
+#     - docker image rm --force "${CONTAINER_TAG}-test"

 build-image:
  stage: build
-  needs:
-    - 'test-image'
+  # needs:
+  #   - 'run-tests'
  tags:
-    - docker-priviliged
+    - docker-privileged
  image: docker:${DOCKER_VERSION}
  services:
    - name: docker:${DOCKER_VERSION}-dind
@@ -55,6 +63,7 @@ build-image:
  script:
    - docker image build
      --tag "${CONTAINER_TAG}"
+      --target=build
      "./app"
    # - docker image build
    #   --tag "${CONTAINER_TAG}-google-sdk"
@@ -67,9 +76,6 @@ build-image:

 create-release_image:
  stage: release
-  rules:
-    - if: $CI_COMMIT_REF_NAME =~ /main/
-      when: 'always'
  tags:
    - docker-privileged
  image: docker:${DOCKER_VERSION}
@@ -108,7 +114,7 @@ deploy-image:
  extends: .gke-initialization
  stage: deploy
  needs:
-    - 'build-image'
+    - 'create-release_image'
  rules:
    - if: $CI_COMMIT_REF_NAME =~ /staging/
      when: 'always'
@@ -124,13 +130,13 @@ deploy-image:
  script:
    - VERSION="${CI_PIPELINE_IID}-${CI_COMMIT_SHORT_SHA}"
    - IMAGE="${CI_REGISTRY_IMAGE}:${VERSION}"
-    - cd "app/k8s-manifests"
-    - kubectl apply secrets.yaml --namespace "${ENVIRONMENT_NAME}-${K8S_NAMESPACE}"
-    - kubectl apply gitlab-registry-credentials.yaml --namespace "${ENVIRONMENT_NAME}-${K8S_NAMESPACE}"
-    - kubectl apply configmap.yaml --namespace "${ENVIRONMENT_NAME}-${K8S_NAMESPACE}"
-    - kubectl apply deployment.yaml --namespace "${ENVIRONMENT_NAME}-${K8S_NAMESPACE}"
-    - kubectl apply service.yaml --namespace "${ENVIRONMENT_NAME}-${K8S_NAMESPACE}"
-    - kubectl apply ingress.yaml --namespace "${ENVIRONMENT_NAME}-${K8S_NAMESPACE}"
+    - cd "./k8s-manifests"
+    - 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}"
+    - kubectl apply -f service.yaml --namespace "${ENVIRONMENT_NAME}-${K8S_NAMESPACE}"
+    - kubectl apply -f ingress.yaml --namespace "${ENVIRONMENT_NAME}-${K8S_NAMESPACE}"



--- a/README.md
+++ b/README.md
-Lecture: DevOps - Application
+SS22-DevOps-Deployable
 =============================

+### Introduction 

-> :warning: __Invoking `make` in a path containing white spaces will break execution and may lead to
-> unforeseen side effects like DATA LOSS !__
+This repository demonstrates the automated deployment of a simple web application. It consists of two branches - **staging** and **main**.
+These branches are protected, meaning that commits targetting them will fail.
+Changes to the codebase are realized through the use of other temporary branches and Merge Requests to **staging**. Merge Requests to **main** should
+only be opened from **staging** as a source branch.

+As soon as a new change through a MR is commited to **staging**, a pipeline is triggered. It deploys the application to the **staging-todoapp-devops** namespace in a Kubernetes cluster, run on GKE. After that, the application is accessible on the URL:

-This repository contains the [application](./app/README.md) that can be used as *deployable workload* for the
-[project assignment](https://github.com/lucendio/lecture-devops-material/blob/master/assignments/project-work.md)
-implementation.
+> https://staging.todoapp-devops.software

-In order to adapt the application and integrate it into your automation and deployment processes, it's usually not
-required to change any existing code. Instead, you probably just want to add some *pipeline* code or even a container
-file (e.g. `Dockerfile`).
+The same process happens with commits (merged from **staging**) on the **main** branch. The web application is then accessible on:

-
-### Getting started 
-
-For more information regarding the app, please take a look into its [README](./app/README.md).
-
-The `Makefile` in this directory can be seen as the main entry point for this repository. It's meant to locally run the
-application and allow to mess around with the source code in order to better understand how it works and to be able to
-tear it apart if necessary.
-Additionally, it documents various invocations that may help you adapting this application as *workload* for the
-assignment. 
-
-**_Please note, that the `Makefile` is only meant to showcase steps that are usually taken to automate the deployment
-lifecycle of such an application and code base.
-It is NOT recommended to invoke `make` targets from the CI/CD, but rather to utilize platform-specific interfaces 
-(e.g. `.gitlab-ci.yml`, `Jenkinsfile`, etc.), which may then invoke commands shown in the `make` target or in the
-`scripts` section of one of the `package.json` files._**
-
-
-### Prerequisites
-
-The following software must be installed and available in `${PATH}`:
-
-* `node` ([NodeJS](https://nodejs.org/en/download)): latest v16
-* `npm` ([npm](https://www.npmjs.com/get-npm)): latest v8
-* `mongod` ([MongoDB](https://docs.mongodb.com/manual/installation/)): latest v4.4
-
-*NOTE: the application in this repository has not been tested with versions newer than that*
-
-Choose for yourself how you want to install these dependencies. Perhaps you can use the package manager
-available on your operating system, or maybe you prefer using container images. 
-
-
-### Commands
-
-The following commands are available from the root directory:
-
-
-#### `make install`
-
-* installs all *server* and *client* dependencies via package manager `npm` 
-
-
-#### `make build`
-
-1. copy server source into some empty location
-2. copy dependency manifest (`package*`) into the same location right next to the server source
-3. install server dependencies there
-4. install all client dependencies next to its source
-5. build client code and put it next to the server source (step 1)   
-
-
-#### `make test`
-
-*NOTE: requires/assumes a MongoDB service (see `MONGODB_URL`) to be reachable from the context where tests are being
-executed*
-
-* runs client & server tests in [CI mode](https://jestjs.io/docs/en/cli.html#--ci) (exits regardless of the test outcome;
-  closed tty)
-
-
-#### `make dev-test-client`
-
-*NOTE: only demonstrates a use case during local development and are not meant to run in any other context (e.g. automation)*
-
-* runs client tests in a local development mode
-
-
-#### `make dev-start-db`
-
-*NOTE: only demonstrates a use case during local development and are not meant to run in any other context (e.g. automation)*
-
-* starts a local MongoDB service
-
-
-#### `make dev-start-app`
-
-*NOTE (1): only demonstrates a use case during local development and are not meant to run in any other context (e.g. automation)*
-*NOTE (2): it might be desired to first start a database service (e.g. `make dev-start-db`)*
-
-* builds client
-* starts server in development mode with development configuration
-
-
-#### `make run`
-
-*NOTE (1): showcases plain executable invocation with a shared parent process. Press `Ctrl+C` to send termination signal.*
-*NOTE (2): in reality those two services would always be invoked independently and __never__ share a parent process!*
-
-* starts a MongoDB service as a child process with an explicit inline-configuration
-* starts the application service with variables being set in a way so that they are only *visible* to that invocation
-  (as an alternative to the configuration file `app/server/dev.env` that is used to set environment variables)
-* blocks terminal and keeps it as output device until termination signal is being send.
-
-
-#### `make clean`
-
-* removes all `node_modules` dependencies that have been installed locally via `npm`
-* removes other temporarily created folder in `.local` 
+> https://todoapp-devops.software
--- a/app/Dockerfile
+++ b/app/Dockerfile
@@ -5,36 +5,42 @@ ARG NODEJS_VERSION='16.17.0'

 FROM node:$NODEJS_VERSION-alpine AS base

+ARG \
+    MONGODB_URL_TEST=mongodb://host.docker.internal:27017/todo-app \
+    JWT_SECRET_TEST=<my-very-secret-jwt>
+
 ENV \
    PORT=3000 \
-    # For local dev - mongodb://host.docker.internal:27017/todo-app
-    MONGODB_URL=<should-be-dynamically-set> \
-    JWT_SECRET=<should-be-dynamically-set>
+    MONGODB_URL=<dynamically-set-from-k8s> \
+    JWT_SECRET=<dynamically-set-from-k8s>

 # ------------------------------------------------------------------
-# Test stage
-FROM base AS test
+# # Test stage
+# FROM base AS test

-# client tests
-WORKDIR /client
+# # client tests
+# WORKDIR /client

-COPY ./client .
+# COPY ./client .
+
+# RUN npm ci --no-audit --no-fund

-RUN npm ci --no-audit --no-fund
+# RUN npm run test

-RUN npm run test
+# # server tests
+# WORKDIR /server

-# server tests
-WORKDIR /server
+# COPY ./server/src ./src/

-COPY ./server/src ./src/
+# COPY ./server/package*.json ./

-COPY ./server/package*.json .
+# RUN npm ci --no-audit --no-fund

-RUN npm ci --no-audit --no-fund
+# ARG MONGODB_URL_TEST
+# ARG JWT_SECRET_TEST

-# MONGODB_URL and JWT_SECRET are available as env variables
-RUN npm run test
+# # MONGODB_URL and JWT_SECRET are available as env variables
+# RUN MONGODB_URL=$MONGODB_URL_TEST JWT_SECRET=$JWT_SECRET_TEST npm run test

 # ------------------------------------------------------------------
 # Build stage
@@ -47,7 +53,7 @@ WORKDIR $APP_BUILD_PATH

 COPY ./server/src .

-COPY ./server/package*.json .
+COPY ./server/package*.json ./

 RUN \
    npm ci --prod --no-audit --no-fund \

--- a/app/README.md
+++ b/app/README.md
 Todo-App
 ========

-
 This application represents the *deployable workload* for the
 [lecture assignment](https://github.com/lucendio/lecture-devops-material/blob/master/assignments/exercise.md). 


--- a/k8s-manifests/configmap.yaml
+++ b/k8s-manifests/configmap.yaml
@@ -4,6 +4,4 @@ metadata:
  name: todo-app-config
 data:
  PORT: 3000
-  # MONGODB_URL: mongodb://<mongo-service>:27017/todo-app
-  # mongodb-service.<namespace>?
  MONGODB_URL: mongodb-service
--- a/k8s-manifests/secrets.yaml
+++ b/k8s-manifests/secrets.yaml
@@ -4,4 +4,4 @@ metadata:
  name: todo-app-secrets
 type: Opaque
 data:
-  JWT_SECRET: <jwt-secret in base64>
+  JWT_SECRET: dmVyYmlnand0c2VjcmV0d293