service names updated by Admin

.gitlab-ci.yml

 variables:
-  RELEASE_NAME: "project1392"
+  RELEASE_NAME: "project7448"
   SERVICE_PORT: 8080
-  REGISTRY_URL: 751503455312.dkr.ecr.us-east-1.amazonaws.com/pgdockrepo
+  REGISTRY_URL: 751503455312.dkr.ecr.us-west-2.amazonaws.com/pgnonprod
   SONAR_URL: "http://pg-sonar-altimetrik-com-82028342.us-west-2.elb.amazonaws.com"
   SONAR_LOGIN: "cc3fc35cad01a325d1b3904bcf3aa38b153fa7f1"
   
 stages:
   - Build
+  - Test
   - ReleaseCleanup
   - ReleaseDeploy
   - Validation
@@ -15,15 +16,15 @@ Build:
   stage: Build
   script:
   - mvn  clean install -Dk8s.db.env=db-config-k8s
-  - $(aws ecr get-login --no-include-email --region us-east-1)
-  - docker build -t 751503455312.dkr.ecr.us-east-1.amazonaws.com/pgdockrepo:$CI_PIPELINE_ID .
-  - docker push 751503455312.dkr.ecr.us-east-1.amazonaws.com/pgdockrepo:$CI_PIPELINE_ID
+  - $(aws ecr get-login --no-include-email --region us-west-2)
+  - docker build -t 751503455312.dkr.ecr.us-west-2.amazonaws.com/pgnonprod:$CI_PIPELINE_ID .
+  - docker push 751503455312.dkr.ecr.us-west-2.amazonaws.com/pgnonprod:$CI_PIPELINE_ID
 
 ReleaseCleanup:
    stage: ReleaseCleanup
    script: 
    -  echo `pwd`
-   -  cd ./helm && /usr/local/bin/helm delete --purge $RELEASE_NAME && exit 0
+   -  cd ./helm && /sbin/helm delete --purge $RELEASE_NAME && exit 0
    allow_failure: true
 
 ReleaseDeploy:
@@ -32,11 +33,12 @@ ReleaseDeploy:
    - echo `pwd`
    - sed -i s/#BUILD_ID#/$CI_PIPELINE_ID/g ./helm/service/values.yaml 
    - sed -i s/#SERVICE_PORT#/$SERVICE_PORT/g ./helm/service/values.yaml
-   - cd ./helm && /usr/local/bin/helm install service --name $RELEASE_NAME
+   - kubectl config use-context arn:aws:eks:us-west-2:751503455312:cluster/pg-eks
+   - cd ./helm && /sbin/helm install service --name $RELEASE_NAME
 
 Validation:
     stage: Validation
     script:
     - sleep 45
-    - if [ `curl -s -o /dev/null -I -w "%{http_code}" https://pgsandbox.altimetrik.com/$RELEASE_NAME` = "200" ]; then exit 0; else exit 1; fi
+    - if [ `curl -s -o /dev/null -I -w "%{http_code}" https://pgtest.altimetrik.com/$RELEASE_NAME` = "200" ]; then exit 0; else exit 1; fi
     allow_failure: false
\ No newline at end of file

helm/service/Chart.yaml

 apiVersion: v1
 appVersion: "1.0"
 description: A Helm chart for Kubernetes
-name: SERVICE_NAME
-version: 0.1.0
+name: project7448
+version: 0.1.0
\ No newline at end of file

helm/service/templates/NOTES.txt

@@ -6,16 +6,16 @@
   {{- end }}
 {{- end }}
 {{- else if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "SERVICE_NAME.fullname" . }})
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "project7448.fullname" . }})
   export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
   echo http://$NODE_IP:$NODE_PORT
 {{- else if contains "LoadBalancer" .Values.service.type }}
      NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get svc -w {{ include "SERVICE_NAME.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "SERVICE_NAME.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+           You can watch the status of by running 'kubectl get svc -w {{ include "project7448.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "project7448.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
   echo http://$SERVICE_IP:{{ .Values.service.port }}
 {{- else if contains "ClusterIP" .Values.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "SERVICE_NAME.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "project7448.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
   echo "Visit http://127.0.0.1:8080 to use your application"
   kubectl port-forward $POD_NAME 8080:80
-{{- end }}
+{{- end }}
\ No newline at end of file

helm/service/templates/_helpers.tpl

@@ -2,7 +2,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "SERVICE_NAME.name" -}}
+{{- define "project7448.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
@@ -11,7 +11,7 @@ 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 "SERVICE_NAME.fullname" -}}
+{{- define "project7448.fullname" -}}
 {{- if .Values.fullnameOverride -}}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
 {{- else -}}
@@ -27,6 +27,6 @@ If release name contains chart name it will be used as a full name.
 {{/*
 Create chart name and version as used by the chart label.
 */}}
-{{- define "SERVICE_NAME.chart" -}}
+{{- define "project7448.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
+{{- end -}}
\ No newline at end of file

helm/service/templates/deployment.yaml

 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "SERVICE_NAME.fullname" . }}
+  name: {{ include "project7448.fullname" . }}
   labels:
-    app.kubernetes.io/name: {{ include "SERVICE_NAME.name" . }}
-    helm.sh/chart: {{ include "SERVICE_NAME.chart" . }}
+    app.kubernetes.io/name: {{ include "project7448.name" . }}
+    helm.sh/chart: {{ include "project7448.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{ include "SERVICE_NAME.name" . }}
+      app.kubernetes.io/name: {{ include "project7448.name" . }}
       app.kubernetes.io/instance: {{ .Release.Name }}
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: {{ include "SERVICE_NAME.name" . }}
+        app.kubernetes.io/name: {{ include "project7448.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
     spec:
       containers:
         - name: {{ .Chart.Name }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
+          volumeMounts:
+          - name: efs-pvc
+            mountPath: ./src/main/resources
+          env:
+            - name: "k8s.db.env"
+              value: "db-config-k8s"
           ports:
             - name: http
               containerPort: {{ .Values.service.internalport }}
@@ -30,6 +36,10 @@ spec:
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}
+      volumes:
+      - name: efs-pvc
+        persistentVolumeClaim:
+         claimName: efs
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
@@ -40,4 +50,4 @@ spec:
     {{- with .Values.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
-    {{- end }}
+    {{- end }}
\ No newline at end of file

helm/service/templates/ingress.yaml

 {{- if .Values.ingress.enabled -}}
-{{- $fullName := include "SERVICE_NAME.fullname" . -}}
+{{- $fullName := include "project7448.fullname" . -}}
 {{- $ingressPaths := .Values.ingress.paths -}}
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: {{ $fullName }}
   labels:
-    app.kubernetes.io/name: {{ include "SERVICE_NAME.name" . }}
-    helm.sh/chart: {{ include "SERVICE_NAME.chart" . }}
+    app.kubernetes.io/name: {{ include "project7448.name" . }}
+    helm.sh/chart: {{ include "project7448.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
-  {{- with .Values.ingress.annotations }}
   annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
+    alb.ingress.kubernetes.io/scheme: internet-facing
+    alb.ingress.kubernetes.io/subnets: {{ .Values.ingress.subnets }}
+    kubernetes.io/ingress.class: alb
+    alb.ingress.kubernetes.io/target-type: instance
+    alb.ingress.kubernetes.io/listen-ports: '[{"HTTP": 80}, {"HTTPS":443}]'
+    alb.ingress.kubernetes.io/ssl-redirect: '443'
+    alb.ingress.kubernetes.io/certificate-arn: {{ .Values.ingress.certificatearn }}
+    alb.ingress.kubernetes.io/healthcheck-protocol: HTTP
+    alb.ingress.kubernetes.io/healthcheck-port: traffic-port
+    alb.ingress.kubernetes.io/healthcheck-path: /
+    alb.ingress.kubernetes.io/healthcheck-interval-seconds: '15'
+    alb.ingress.kubernetes.io/healthcheck-timeout-seconds: '5'
+    alb.ingress.kubernetes.io/success-codes: '200,302'
+    alb.ingress.kubernetes.io/healthy-threshold-count: '2'
+    alb.ingress.kubernetes.io/unhealthy-threshold-count: '2'
+    alb.ingress.kubernetes.io/load-balancer-name: {{ .Values.ingress.loadbalancername }}
+
 spec:
 {{- if .Values.ingress.tls }}
   tls:
@@ -27,14 +41,12 @@ spec:
 {{- end }}
   rules:
   {{- range .Values.ingress.hosts }}
-    - host: {{ . | quote }}
+    - host: {{ .host }}
       http:
         paths:
-	{{- range $ingressPaths }}
-          - path: {{ . }}
+          - path: /*
             backend:
-              serviceName: {{ $fullName }}
-              servicePort: http
-	{{- end }}
+              serviceName: {{ .serviceName }}
+              servicePort: {{ .servicePort }}
   {{- end }}
-{{- end }}
+{{- end }}
\ No newline at end of file

helm/service/templates/service.yaml

 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "SERVICE_NAME.fullname" . }}
+  name: {{ include "project7448.fullname" . }}
   labels:
-    app.kubernetes.io/name: {{ include "SERVICE_NAME.name" . }}
-    helm.sh/chart: {{ include "SERVICE_NAME.chart" . }}
+    app.kubernetes.io/name: {{ include "project7448.name" . }}
+    helm.sh/chart: {{ include "project7448.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 spec:
@@ -15,5 +15,5 @@ spec:
       protocol: TCP
       name: http
   selector:
-    app.kubernetes.io/name: {{ include "SERVICE_NAME.name" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/name: {{ include "project7448.name" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
\ No newline at end of file

helm/service/templates/tests/test-connection.yaml

 apiVersion: v1
 kind: Pod
 metadata:
-  name: "{{ include "SERVICE_NAME.fullname" . }}-test-connection"
+  name: "{{ include "project7448.fullname" . }}-test-connection"
   labels:
-    app.kubernetes.io/name: {{ include "SERVICE_NAME.name" . }}
-    helm.sh/chart: {{ include "SERVICE_NAME.chart" . }}
+    app.kubernetes.io/name: {{ include "project7448.name" . }}
+    helm.sh/chart: {{ include "project7448.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
   annotations:
@@ -14,5 +14,5 @@ spec:
     - name: wget
       image: busybox
       command: ['wget']
-      args:  ['{{ include "SERVICE_NAME.fullname" . }}:{{ .Values.service.port }}']
-  restartPolicy: Never
+      args:  ['{{ include "project7448.fullname" . }}:{{ .Values.service.port }}']
+  restartPolicy: Never
\ No newline at end of file

helm/service/values.yaml

-# Default values for SERVICE_NAME.
+# Default values for project7448.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
 replicaCount: 1
 
 image:
-  repository: 279716074232.dkr.ecr.us-east-1.amazonaws.com/pgdockrepo
+  repository: 751503455312.dkr.ecr.us-west-2.amazonaws.com/pgnonprod
   tag: #BUILD_ID#
   pullPolicy: IfNotPresent
 
@@ -13,22 +13,26 @@ nameOverride: ""
 fullnameOverride: ""
 
 service:
-  type: LoadBalancer
+  type: NodePort
   port: 80
   internalport: #SERVICE_PORT#
 
 ingress:
-  enabled: false
-  annotations: {}
-    # kubernetes.io/ingress.class: nginx
-    # kubernetes.io/tls-acme: "true"
-  paths: []
+  enabled: true
+  annotations:
+      kubernetes.io/ingress.class: nginx
+      nginx.ingress.kubernetes.io/rewrite-target: /
+      #kubernetes.io/tls-acme: "true"
+  paths:
+     path: /project7448
   hosts:
-    - chart-example.local
-  tls: []
-  #  - secretName: chart-example-tls
-  #    hosts:
-  #      - chart-example.local
+   #  - afe6ec7ed3f3711e9b98006759708723-313212737.us-west-2.elb.amazonaws.com
+      - pgtest.altimetrik.com
+  
+  tls:
+     - secretName: custom-tls-cert
+       hosts:
+        - pgtest.altimetrik.com
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
@@ -42,8 +46,8 @@ resources: {}
   #  cpu: 100m
   #  memory: 128Mi
 
-nodeSelector: {}
+nodeSelector: {dbvol: h2dbstore}
 
 tolerations: []
 
-affinity: {}
+affinity: {}
\ No newline at end of file

src/main/java/com/altimetrik/playground/candidate/assessment/controller/AdminDbConsoleController.java

 package com.altimetrik.playground.candidate.assessment.controller;
 
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping(value = "/")
+@CrossOrigin
 public class AdminDbConsoleController {
 
-}
+    @Value("${k8s.db.env}")
+    private String deploymentEnv;
+
+    @GetMapping(value = "/", produces = { "text/html" }, consumes = MediaType.ALL_VALUE)
+    public ResponseEntity<String> getUserDetailByGitlabEmailId() {
+        String data = "Welcome to Playground Engineering Environment";
+        if (deploymentEnv != null && !deploymentEnv.isEmpty()) {
+            data = "<!DOCTYPE html>\n" + "<html>\n" + "<head>\n" + "<title>Playground Engineering Environment</title>\n"
+                    + "<style>\n" + "body {\n" + "  background-color: white;\n" + "  text-align: center;\n"
+                    + "  color: black;\n" + "}\n" + "table {\n" + "  align: center;\n"
+                    + "  border-collapse: collapse;\n" + "  width: 65%;\n" + "}\n" + "td, th {\n"
+                    + "  border: 1px solid #dddddd;\n" + "  padding: 8px;\n" + "}\n" + "tr:nth-child(even) {\n"
+                    + "  background-color: #dddddd;\n" + "}\n" + "</style>\n" + "</head>\n" + "<body>\n"
+                    + "<img src='https://playground.altimetrik.com/assets/img/playground-logo2.svg' alt='Avatar' style='width:200px'>\n"
+                    + "<h2>Welcome to Playground Engineering Environment</h2>\n" + "<h3>Database access details</h3>\n"
+                    + "<table align=center>\n" + "  <tr>\n" + "    <th>DB Admin Console</th>\n" + "    <th>JDBC URL</th>\n"
+                    + "    <th>User Name</th>\n" + "    <th>Password</th>\n" + "  </tr>\n" + "  <tr>\n"
+                    + "    <td><a target='_blank' href='https://project7448.pg-sandbox.altimetrik.com/h2-console'>Database Admin Console</a></td>\n"
+                    + "    <td>jdbc:h2:file:./src/main/resources/test</td>\n" + "    <td>*********</td>\n"
+                    + "    <td>**********</td>\n" + "  </tr>\n" + "</table>\n<p>Please Cantact TA/Coach for Database details</p>" + "</body>\n" + "</html>\n";
+        }
+        return new ResponseEntity<>(data, HttpStatus.OK);
+    }
+
+}
\ No newline at end of file

src/main/resources/application.properties

+spring.h2.console.enabled=true
+spring.h2.console.settings.web-allow-others=true
+spring.datasource.driverClassName=org.h2.Driver
+spring.datasource.username=playground
+spring.datasource.password=password
+spring.jpa.database-platform=org.hibernate.dialect.H2Dialect
+# temporary data storage
+spring.datasource.url = jdbc:h2:file:./src/main/resources/test
+k8s.db.env=db-config-k8s
+server.servlet.contextPath=/
+server.port=1099
\ No newline at end of file

src/main/resources/application.yml

+# Spring properties
+spring:
+  application:
+     name: PlaygroundAssessmentDemo
+  freemarker:
+    enabled: false
+
+# HTTP Server
+server:
+  port: 1099  # HTTP (Tomcat) port
+  servlet.contextPath: /
+  undertow:
+    accesslog:
+      enabled: true
+
+# Logging configurations
+logging:
+  level:
+    root: INFO
+    com.memorynotfound: DEBUG
+    org.springframework.web: INFO
+    org.springframework.security: INFO
+    org.hibernate.SQL: WARN
+
+jasypt:
+  encryptor:
+    password: playground