Merge branch 'main' of https://github.com/codeWithUtkarsh/ortelius-ms-compitem-crud

Author: codeWithUtkarsh

chart/ms-validate-user/.helmignore

@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/

chart/ms-validate-user/Chart.yaml

@@ -0,0 +1,6 @@
+apiVersion: v2
+name: ms-compitem-crud
+description: Dependency Packages
+type: application
+version: 0.1.0
+appVersion: "1.0"

chart/ms-validate-user/templates/_helpers.tpl

@@ -0,0 +1,32 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "ms-compitem-crud.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 "ms-compitem-crud.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 "ms-compitem-crud.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+

chart/ms-validate-user/templates/deployment.yaml

@@ -0,0 +1,52 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name:  {{ include "ms-compitem-crud.name" . }}
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app:  {{ include "ms-compitem-crud.name" . }}
+      tier: backend
+      track: stable
+  template:
+    metadata:
+      labels:
+        app:  {{ include "ms-compitem-crud.name" . }}
+        tier: backend
+        track: stable
+    spec:
+      containers:
+        - name: {{ include "ms-compitem-crud.name" . }}
+          image: "{{ .Values.DockerRepo }}:{{ .Values.DockerTag }}"
+          imagePullPolicy: Always
+          env:
+            - name: DB_USER
+              valueFrom:
+                secretKeyRef:
+                  name: pgcred
+                  key: DBUserName
+            - name: DB_PASS
+              valueFrom:
+                secretKeyRef:
+                  name: pgcred
+                  key: DBPassword
+            - name: DB_HOST
+              valueFrom:
+                secretKeyRef:
+                  name: pgcred
+                  key: DBHost
+            - name: DB_PORT
+              valueFrom:
+                secretKeyRef:
+                  name: pgcred
+                  key: DBPort
+            - name: DB_NAME
+              valueFrom:
+                secretKeyRef:
+                  name: pgcred
+                  key: DBName
+          ports:
+            - name: http
+              containerPort: 80
+---   

chart/ms-validate-user/templates/service.yaml

@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "ms-compitem-crud.name" . }}
+spec:
+  selector:
+    app: {{ include "ms-compitem-crud.name" . }}
+  ports:
+    - protocol: TCP
+      port: 80
+      targetPort: 80
+  type: NodePort
+---

chart/ms-validate-user/values.yaml

@@ -0,0 +1,31 @@
+nameOverride: ""
+fullnameOverride: ""
+
+replicaCount: 1
+
+image:
+  # TODO - update image params when image is pushed to repo.
+  repository: quay.io/ortelius/ms-compitem-crud
+  #digest: 
+  tag: main-v9.0.0.17-g106d15a
+
+service:
+  type: NodePort
+  portName: env2app-port
+  exposedPort: 8080
+  targetPort: 80
+  nodePort: 30080
+
+envVars:
+  DB_HOST: 192.168.10.96
+  DB_PORT: 6543
+  DB_NAME: postgres
+
+
+resources: {}
+  # limits:
+  #   cpu: 100m
+  #   memory: 128Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 128Mi

cloudbuild/cloudbuild.yaml

@@ -1,44 +1,73 @@
 steps:
   # Get ssh key from Google Secret Manager
   - name: gcr.io/cloud-builders/gcloud
-    id: sshkey
+    id: ssh_keys
     entrypoint: 'bash'
-    args: [ '-c', 'gcloud secrets versions access latest --secret=ortelius-github > /root/.ssh/id_rsa;chmod 600 /root/.ssh/id_rsa;ssh-keyscan -t rsa github.com > /root/.ssh/known_hosts' ]
+    args: [ '-c', 'gcloud secrets versions access latest --secret=github > /root/.ssh/id_rsa;chmod 600 /root/.ssh/id_rsa;ssh-keyscan -t rsa github.com > /root/.ssh/known_hosts' ]
     volumes:
     - name: 'ssh'
       path: /root/.ssh
+  
+  # Login to Quay for push.
+  - name: 'gcr.io/cloud-builders/docker'
+    id: login
+    waitFor: ['ssh_keys']
+    entrypoint: 'bash'
+    args: ['-c', 'docker login quay.io --username "$$QUAY_USERID" --password $$QUAY_PASSWORD']
+    secretEnv: ['QUAY_USERID', 'QUAY_PASSWORD']     
+    env:
+      - 'DOCKER_CONFIG=/workspace/docker-config'
 
+  # Setup environment including img tag name for nginx
   - name: gcr.io/cloud-builders/docker
-    id: cloudbuild_sh
+    id: env
+    waitFor: ['login']
     entrypoint: 'bash'
-    args: ['-c', 'ls -A1 | xargs rm -rf;git clone $$COMPONENT_GITURL .;git checkout --track -b $BRANCH_NAME origin/$BRANCH_NAME;env | sed "s/^/export /" >> /workspace/cloudbuild.sh']
+    args: ['-c', 'ls -A1 | grep -v docker-config | xargs rm -rf;git init; git remote add origin $$COMPONENT_GITURL;git fetch;git checkout --track -b $BRANCH_NAME origin/$BRANCH_NAME;env | sed "s/^/export /" >> /workspace/cloudbuild.sh']
     volumes:
     - name: 'ssh'
       path: /root/.ssh
     env: 
+      - 'COMPONENT_APPLICATION=GLOBAL.ortelius.saas.ortelius-devops'
+      - 'COMPONENT_NAME=GLOBAL.ortelius.saas.ms-compitem-crud'
       - 'COMPONENT_GITURL=git@github.com:ortelius/ortelius-ms-compitem-crud.git'
-      - 'COMPONENT_VERSION=9.0.0'
+      - 'COMPONENT_VARIANT=$BRANCH_NAME'
+      - 'COMPONENT_VERSION=10.0.0'
+      - 'COMPONENT_VERSION_COMMIT="v$$COMPONENT_VERSION.$$(git rev-list --count $BRANCH_NAME)-g$SHORT_SHA"'
       - 'COMPONENT_DOCKERREPO=quay.io/ortelius/ms-compitem-crud'
+      - 'COMPONENT_CUSTOMACTION=GLOBAL.HelmChart'
+      - 'COMPONENT_CHARTNAME=chart/ms-compitem-crud'
+      - 'COMPONENT_CHARTNAMESPACE=ortelius'
+      - 'DEPLOY_ENV=GLOBAL.ortelius.saas.aks-cluster'
       - 'BLDDATE=`date`'
       - 'IMAGE_TAG="$BRANCH_NAME-v$$COMPONENT_VERSION.$$(git rev-list --count $BRANCH_NAME)-g$SHORT_SHA"'
+      - 'DOCKER_CONFIG=/workspace/docker-config'
 
-  # Login to Quay for push.
+  # Build and push quay.io/ortelius/ms-compitem-crud
   - name: 'gcr.io/cloud-builders/docker'
-    id: login
+    id: build_push
+    waitFor: ['env']
     entrypoint: 'bash'
-    args: ['-c', '. /workspace/cloudbuild.sh;docker login quay.io --username "$$QUAY_USERID" --password $$QUAY_PASSWORD']
-    secretEnv: ['QUAY_USERID', 'QUAY_PASSWORD']     
+    args: ["-c", '. /workspace/cloudbuild.sh;docker build --tag $$COMPONENT_DOCKERREPO:$$IMAGE_TAG -f /workspace/Dockerfile .;docker push $$COMPONENT_DOCKERREPO:$$IMAGE_TAG']
     env:
       - 'DOCKER_CONFIG=/workspace/docker-config'
 
-  # Build and push deployhub-webadmin.war - quay.io/ortelius/ms-textfile-crud
+  # Get image id
   - name: 'gcr.io/cloud-builders/docker'
-    id: ortelius
-    waitFor: [ 'login' ]
+    id: digest
+    waitFor: ['build_push']
     entrypoint: 'bash'
-    args: ["-c", '. /workspace/cloudbuild.sh;docker build --tag $$COMPONENT_DOCKERREPO:$$IMAGE_TAG -f /workspace/Dockerfile .;docker push $$COMPONENT_DOCKERREPO:$$IMAGE_TAG']
     env:
       - 'DOCKER_CONFIG=/workspace/docker-config'
+    args: ['-c', ". /workspace/cloudbuild.sh;echo export DIGEST=$(docker inspect --format='{{index .RepoDigests 0}}' $$COMPONENT_DOCKERREPO:$$IMAGE_TAG) >> /workspace/cloudbuild.sh" ]
+
+  # Capture new component version in DeployHub
+  - name: 'quay.io/deployhub/compupdate'
+    id: compupdate
+    waitFor: ['digest']
+    entrypoint: 'bash'
+    secretEnv: ['DHUSER', 'DHPASS']
+    args: ['-c', '. /workspace/cloudbuild.sh;dh updatecomp --dhurl https://console.deployhub.com --appname "$$COMPONENT_APPLICATION" --compname "$$COMPONENT_NAME" --compvariant "$$COMPONENT_VARIANT" --compversion "$$COMPONENT_VERSION_COMMIT" --deployenv "$$DEPLOY_ENV" --docker --compattr "GitCommit:$SHORT_SHA" --compattr "GitUrl:$$COMPONENT_GITURL" --compattr "GitRepo:ortelius/$REPO_NAME" --compattr "GitTag:$TAG_NAME" --compattr "GitBranch:$BRANCH_NAME" --compattr "Chart:$$COMPONENT_CHARTNAME" --compattr "DockerSha:$$DIGEST" --compattr "DockerBuildDate:$$BLDDATE" --compattr "DockerRepo:$$COMPONENT_DOCKERREPO" --compattr "BuildId:$BUILD_ID" --compattr "BuildUrl:https://console.cloud.google.com/cloud-build/builds/$BUILD_ID?project=$PROJECT_ID" --compattr "CustomAction:$$COMPONENT_CUSTOMACTION" --compattr "DockerTag:$$IMAGE_TAG" --compattr "ChartNamespace:$$COMPONENT_CHARTNAMESPACE"']
 
 secrets:
 - kmsKeyName: projects/eighth-physics-169321/locations/global/keyRings/cli/cryptoKeys/quay
@@ -47,4 +76,9 @@ secrets:
 - kmsKeyName: projects/eighth-physics-169321/locations/global/keyRings/cli/cryptoKeys/quay-pw
   secretEnv:
     QUAY_PASSWORD: CiQAUULEud9Ej8XtwNAb9gkbDVhSGFZYhUGE30fNwR+7ehAOkH8SMgCz6KYeykjgS16RPxgKlrIQL/1TKDt06v4OXGIisFXOkdWC+jvdda8mTzVNCi8sT5g6 
-  
+- kmsKeyName: projects/eighth-physics-169321/locations/global/keyRings/cli/cryptoKeys/ortelius-id
+  secretEnv:
+    DHUSER: CiQAGgJuQMHWANazqTOeE/SyoX/YNVWnES7eJEVWY8mTP98Er3USMQC43iiopoGYhP/YahsQu/yUURiqJBVZURYiUiu5Z7UBkrDgUAonKCKjtzeSNUP7HoQ=
+- kmsKeyName: projects/eighth-physics-169321/locations/global/keyRings/cli/cryptoKeys/ortelius-pw
+  secretEnv:
+    DHPASS: CiQAZySXz07McN9e6fyr6X4qwkw4iBgeULmpq16RbxIAcqg6gTESMQB98+y30zqMVPx2S/Q/8ld+qlJWWxmocnbjLe9iyepMwyMl3yf+r5e55nf85PlrBBw=