🐈‍⬛ UPDATE - move from DC to D 🐱

.gitattributes

@@ -1 +1,25 @@
 * text eol=lf
+
+# (binary is a macro for -text -diff)
+*.png binary
+*.jpg binary
+*.jpeg binary
+*.gif binary
+*.ico binary
+*.mov binary
+*.mp4 binary
+*.mp3 binary
+*.flv binary
+*.fla binary
+*.swf binary
+*.gz binary
+*.zip binary
+*.7z binary
+*.ttf binary
+*.eot binary
+*.woff binary
+*.pyc binary
+*.pdf binary
+*.ez binary
+*.bz2 binary
+*.swp binary

.openshift-applier/params/ocp-pipeline

@@ -1,3 +1,4 @@
 PIPELINE_SOURCE_REPOSITORY_URL=
 PIPELINE_SOURCE_REPOSITORY_REF=develop
+PIPELINE_SOURCE_SECRET=git-auth
 NAME=todolist

.openshift-applier/requirements.yml

@@ -4,5 +4,5 @@
 # From 'openshift-applier'
 - src: https://github.com/redhat-cop/openshift-applier
   scm: git
-  version: v2.0.9
+  version: v2.1.2
   name: openshift-applier

.openshift-applier/templates/mongodb.yml

@@ -193,5 +193,5 @@ parameters:
 - name: MONGODB_VERSION
   displayName: Version of MongoDB Image
   description: Version of MongoDB image to be used (2.4, 2.6, 3.2 or latest).
-  value: '3.2'
+  value: '3.6'
   required: true

.openshift-applier/templates/todolist-deploy.yml

@@ -43,7 +43,7 @@ objects:
             name: '${NAME}'
         spec:
           containers:
-            - image: 'docker-registry.default.svc:5000/${NAMESPACE}/${NAME}:${APP_TAG}'
+            - image: 'image-registry.openshift-image-registry.svc:5000/${NAMESPACE}/${NAME}:${APP_TAG}'
               imagePullPolicy: Always
               name: '${NAME}'
               env:
@@ -91,6 +91,8 @@ objects:
     spec:
       port:
         targetPort: 9000-tcp
+      tls:
+        termination: edge
       to:
         kind: Service
         name: '${NAME}'

Dockerfile-vue

@@ -0,0 +1,4 @@
+FROM registry.access.redhat.com/ubi8/nodejs-12
+ADD dist .
+RUN npm i http-server
+CMD npx http-server -p 8080

Jenkinsfile

@@ -8,8 +8,8 @@ pipeline {
     environment {
         // Global Vars
         NAMESPACE_PREFIX="<YOUR_NAME>"
-        GITLAB_DOMAIN = "gitlab.apps.change.me.com"
-        GITLAB_PROJECT = "<GIT_USERNAME>"
+        GITLAB_DOMAIN = "<GITLAB_FQDN>"
+        GITLAB_USERNAME = "<GITLAB_USERNAME>"
 
         PIPELINES_NAMESPACE = "${NAMESPACE_PREFIX}-ci-cd"
         APP_NAME = "todolist"
@@ -18,12 +18,12 @@ pipeline {
         JOB_NAME = "${JOB_NAME}".replace("/", "-")
 
         GIT_SSL_NO_VERIFY = true
-        GIT_CREDENTIALS = credentials('jenkins-git-creds')
+        GIT_CREDENTIALS = credentials("${NAMESPACE_PREFIX}-ci-cd-git-auth")
     }
 
     // The options directive is for configuration that applies to the whole job.
     options {
-        buildDiscarder(logRotator(numToKeepStr:'10'))
+        buildDiscarder(logRotator(numToKeepStr:'5'))
         timeout(time: 15, unit: 'MINUTES')
         ansiColor('xterm')
         timestamps()
@@ -69,20 +69,17 @@ pipeline {
         stage("node-build") {
             agent {
                 node {
-                    label "jenkins-slave-npm"  
+                    label "jenkins-agent-npm"  
                 }
             }
             steps {
-                // git branch: 'develop',
-                //     credentialsId: 'jenkins-git-creds',
-                //     url: 'https://gitlab-${NAMESPACE_PREFIX}-ci-cd.apps.somedomain.com/${NAMESPACE_PREFIX}/todolist.git'
                 sh 'printenv'
 
                 echo '### Install deps ###'
                 sh 'npm install'
 
                 echo '### Running tests ###'
-                sh 'npm run test:all:ci'
+                // sh 'npm run test:all:ci'
 
                 echo '### Running build ###'
                 sh 'npm run build:ci'
@@ -96,19 +93,21 @@ pipeline {
             post {
                 always {
                     archive "**"
-                    junit 'test-report.xml'
-                    junit 'reports/server/mocha/test-results.xml'
+                    // ADD TESTS REPORTS HERE
+
                     // publish html
 
-                    // Notify slack or some such
                 }
                 success {
                     echo "Git tagging"
+                    script {
+                      env.ENCODED_PSW=URLEncoder.encode(GIT_CREDENTIALS_PSW, "UTF-8")
+                    }
                     sh'''
                         git config --global user.email "jenkins@jmail.com"
                         git config --global user.name "jenkins-ci"
                         git tag -a ${JENKINS_TAG} -m "JENKINS automated commit"
-                        # git push https://${GIT_CREDENTIALS_USR}:${GIT_CREDENTIALS_PSW}@${GITLAB_DOMAIN}/${GITLAB_PROJECT}/${APP_NAME}.git --tags
+                        git push https://${GIT_CREDENTIALS_USR}:${ENCODED_PSW}@${GITLAB_DOMAIN}/${GITLAB_USERNAME}/${APP_NAME}.git --tags
                     '''
                 }
                 failure {
@@ -140,11 +139,12 @@ pipeline {
                         oc start-build ${APP_NAME} --from-dir=package-contents/ --follow
                     '''
             }
-            post {
-                always {
-                    archive "**"
-                }
-            }
+            // this post step chews up space. uncomment if you want all bake artefacts archived
+            // post {
+                //always {                    
+                    // archive "**"
+                //}
+            //}
         }
 
         stage("node-deploy") {
@@ -157,48 +157,25 @@ pipeline {
                 expression { GIT_BRANCH ==~ /(.*master|.*develop)/ }
             }
             steps {
-                echo '### tag image for namespace ###'
-                sh  '''
-                    oc project ${PROJECT_NAMESPACE}
-                    oc tag ${PIPELINES_NAMESPACE}/${APP_NAME}:${JENKINS_TAG} ${PROJECT_NAMESPACE}/${APP_NAME}:${JENKINS_TAG}
-                    '''
-                echo '### set env vars and image for deployment ###'
-                sh '''
-                    oc set env dc ${APP_NAME} NODE_ENV=${NODE_ENV}
-                    oc set image dc/${APP_NAME} ${APP_NAME}=docker-registry.default.svc:5000/${PROJECT_NAMESPACE}/${APP_NAME}:${JENKINS_TAG}
-                    oc rollout latest dc/${APP_NAME}
-                '''
-                echo '### Verify OCP Deployment ###'
-                openshiftVerifyDeployment depCfg: env.APP_NAME, 
-                    namespace: env.PROJECT_NAMESPACE, 
-                    replicaCount: '1', 
-                    verbose: 'false', 
-                    verifyReplicaCount: 'true', 
-                    waitTime: '',
-                    waitUnit: 'sec'
-            }
-        }
-        stage("e2e test") {
-            agent {
-                node {
-                    label "jenkins-slave-npm"
-                }
-            }
-            when {
-                expression { GIT_BRANCH ==~ /(.*master|.*develop)/ }
-            }
-            steps {
-              unstash 'source'
-
-              echo '### Install deps ###'
-              sh 'npm install'
-
-              echo '### Running end to end tests ###'
-              sh 'npm run e2e:ci'
-            }
-            post {
-                always {
-                    junit 'reports/e2e/specs/*.xml'
+                script {
+                  openshift.withCluster() {
+                    openshift.withProject("${PROJECT_NAMESPACE}") {
+                      echo '### tag image for namespace ###'
+                      openshift.tag("${PIPELINES_NAMESPACE}/${APP_NAME}:${JENKINS_TAG}", "${PROJECT_NAMESPACE}/${APP_NAME}:${JENKINS_TAG}")
+
+                      echo '### set env vars and image for deployment ###'
+                      openshift.raw("set","env","dc/${APP_NAME}","NODE_ENV=${NODE_ENV}")
+                      openshift.raw("set", "image", "dc/${APP_NAME}", "${APP_NAME}=image-registry.openshift-image-registry.svc:5000/${PROJECT_NAMESPACE}/${APP_NAME}:${JENKINS_TAG}")
+
+                      echo '### Rollout and Verify OCP Deployment ###'
+                      openshift.selector("dc", "${APP_NAME}").rollout().latest()
+                      openshift.selector("dc", "${APP_NAME}").rollout().status("-w")
+                      openshift.selector("dc", "${APP_NAME}").scale("--replicas=1")
+                      openshift.selector("dc", "${APP_NAME}").related('pods').untilEach("1".toInteger()) {
+                        return (it.object().status.phase == "Running")
+                      }
+                    }
+                  }
                 }
             }
         }

chart/Chart.yaml

@@ -0,0 +1,11 @@
+apiVersion: v2
+name: todolist
+description: DO500 App - todolist Frontend
+type: application
+version: 1.2.0
+appVersion: 1.2.0
+home: https://petbattle.github.io/helm-charts
+icon: https://avatars1.githubusercontent.com/u/68044996?s=200&v=4
+maintainers:
+  - name: springdo
+  - name: eformat

chart/templates/_helpers.tpl

@@ -0,0 +1,57 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "todolist.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "todolist.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "todolist.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Common labels
+*/}}
+{{- define "todolist.labels" -}}
+helm.sh/chart: {{ include "todolist.chart" . }}
+{{ include "todolist.selectorLabels" . }}
+{{- if .Values.image_version }}
+app.kubernetes.io/version: {{ .Values.image_version | quote }}
+{{- else }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end -}}
+
+{{/*
+Selector labels
+*/}}
+{{- define "todolist.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "todolist.name" . }}
+app.kubernetes.io/component: {{ include "todolist.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+app.kubernetes.io/part-of: {{ include "todolist.name" . }}
+deploymentconfig: {{ include "todolist.fullname" . }}
+{{- end -}}

chart/templates/configmap.yaml

@@ -0,0 +1,12 @@
+{{- if .Values.config_map }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name:  "{{ include "todolist.fullname" . }}-environment"
+  labels:
+    {{- include "todolist.labels" . | nindent 4 }}
+data:
+  config.json: |-
+    {{ .Values.config_map }}
+{{- end }}

chart/templates/deployment.yaml

@@ -0,0 +1,77 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    {{- include "todolist.labels" . | nindent 4 }}
+  name: {{ include "todolist.fullname" . }}
+spec:
+  replicas: {{ .Values.replicas }}
+  revisionHistoryLimit: 10
+  selector:
+    matchLabels:
+        {{- include "todolist.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      annotations:
+        rollme: {{ randAlphaNum 5 | quote }}
+      labels:
+        {{- include "todolist.selectorLabels" . | nindent 8 }}
+    spec:
+      containers:
+      - image: "{{ .Values.image_repository }}/{{ .Values.image_namespace }}/{{ .Values.image_name }}:{{ .Values.image_version }}"
+        imagePullPolicy: Always
+        env:
+        - name: NODE_ENV
+          value: "development"
+        - name: MESSAGE
+          value: {{ .Values.message }}
+        {{- range $key := .Values.env_vars }}
+        {{- if .value }}
+        - name: {{ .name }}
+          value: {{ .value | default "" | quote }}
+        {{- end }}
+        {{- end }}
+        name: {{ include "todolist.name" . }}
+        ports:
+        - containerPort: 9000
+          protocol: TCP
+        resources: {}
+        terminationMessagePath: /dev/termination-log
+        terminationMessagePolicy: File
+        volumeMounts:
+          {{- if .Values.config_map }}
+          - mountPath: "/opt/app-root/src/assets/configuration/"
+            name: "{{ include "todolist.fullname" . }}-config"
+          {{- end }}          
+          {{- if .Values.fathom }}
+          - mountPath: "/opt/app-root/src/assets/analytics/"
+            name: "fathom-config"
+          {{- end }}          
+        readinessProbe:
+          failureThreshold: 3
+          httpGet:
+            path: /
+            port: 9000
+            scheme: HTTP
+          initialDelaySeconds: 10
+          periodSeconds: 10
+          successThreshold: 1
+          timeoutSeconds: 1
+      dnsPolicy: ClusterFirst
+      restartPolicy: Always
+      schedulerName: default-scheduler
+      securityContext: {}
+      terminationGracePeriodSeconds: 30
+      volumes:
+      {{- if .Values.config_map }}
+      - name: "{{ include "todolist.fullname" . }}-config"
+        configMap:
+          name: "{{ include "todolist.fullname" . }}-environment"
+          defaultMode: 420
+      {{- end }}    
+      {{- if .Values.fathom }}
+      - name: "fathom-config"
+        configMap:
+          name: "fathom-client-config"
+          defaultMode: 420
+      {{- end }}