service names updated by Admin

67c35a39 · pg-ta · 3b810008 · 67c35a39 · 67c35a39 · 67c35a39
Commit 67c35a39 authored Mar 02, 2023 by pg-ta
12 changed files
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
 variables:
-  RELEASE_NAME: "project1392"
-  SERVICE_PORT: 8080
+  RELEASE_NAME: "project1486"
+  SERVICE_PORT: 1099
  REGISTRY_URL: 751503455312.dkr.ecr.us-east-1.amazonaws.com/pgdockrepo
  SONAR_URL: "http://pg-sonar-altimetrik-com-82028342.us-west-2.elb.amazonaws.com"
  SONAR_LOGIN: "cc3fc35cad01a325d1b3904bcf3aa38b153fa7f1"
-  
+  HOSTED_ZONE_ID: "Z101819827003V6KENPSK"
+  CERTIFICATE_ARN: "arn:aws:acm:us-east-1:751503455312:certificate/f255834c-9b98-49fa-9bec-6fde19a56640"
+  SUBNETS: "subnet-0e44bfbd8f2be1f91, subnet-023bf6d67dcdec2d7"
+  HEALTHCHECKPATH: "/"
+
 stages:
  - Build
  - ReleaseCleanup
  - ReleaseDeploy
  - Validation
+  - DeleteProject

 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
+    - mvn  clean install -Dk8s.db.env=db-config-k8s
+    - aws ecr get-login-password --region us-east-1 | docker login --username AWS --password-stdin 751503455312.dkr.ecr.us-east-1.amazonaws.com
+    #- $(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
+  only:
+    variables:
+      - $CI_PIPELINE_SOURCE == "web"

 ReleaseCleanup:
-   stage: ReleaseCleanup
-   script: 
-   -  echo `pwd`
-   -  cd ./helm && /usr/local/bin/helm delete --purge $RELEASE_NAME && exit 0
-   allow_failure: true
+  stage: ReleaseCleanup
+  script:
+    - echo `pwd`
+    - DNS_VALUE=`kubectl get ingress $RELEASE_NAME -o jsonpath="{.status.loadBalancer.ingress[0].hostname}"`
+    - sed -i s/DNS_NAME/${RELEASE_NAME}.pg-sandbox.altimetrik.com/g ./DeleteRecord.json
+    - sed -i s/DNS_VALUE/${DNS_VALUE}/g ./DeleteRecord.json
+    - cd ./helm && /usr/local/bin/helm uninstall $RELEASE_NAME
+    - kubectl patch ingress ${RELEASE_NAME} -p '{"metadata":{"finalizers":[]}}' --type=merge
+    - cd ../
+    - aws route53 change-resource-record-sets --hosted-zone-id $HOSTED_ZONE_ID --change-batch file://DeleteRecord.json
+  allow_failure: true
+  only:
+    variables:
+      - $CI_PIPELINE_SOURCE == "web"
+

 ReleaseDeploy:
-   stage: ReleaseDeploy
-   script:
-   - 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
+  stage: ReleaseDeploy
+  script:
+    - 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
+    - sed -i s/PROJECT_NAME/$RELEASE_NAME/g ./helm/service/values.yaml
+    - sed -i s/PROJECT_NAME/$RELEASE_NAME/g ./helm/service/Chart.yaml
+    - sed -i s#CERTIFICATE_ARN#${CERTIFICATE_ARN}#g ./helm/service/values.yaml
+    - sed -i s/SUBNETS/"$SUBNETS"/g ./helm/service/values.yaml
+    - sed -i s#HEALTHCHECKPATH#$HEALTHCHECKPATH#g ./helm/service/values.yaml
+    - cd ./helm && /usr/local/bin/helm install $RELEASE_NAME service
+    - cd ../
+    - sleep 125
+    - DNS_VALUE=`kubectl get ingress ${RELEASE_NAME} -o jsonpath="{.status.loadBalancer.ingress[0].hostname}"`
+    - sed -i s/DNS_NAME/${RELEASE_NAME}.pg-sandbox.altimetrik.com/g ./CreateRecord.json
+    - sed -i s/DNS_VALUE/${DNS_VALUE}/g ./CreateRecord.json
+    - aws route53 change-resource-record-sets --hosted-zone-id $HOSTED_ZONE_ID --change-batch file://CreateRecord.json
+    - sleep 80
+  only:
+    variables:
+      - $CI_PIPELINE_SOURCE == "web"

 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
-    allow_failure: false
\ No newline at end of file
+  stage: Validation
+  script:
+    - if [ `curl -s -o /dev/null -I -w "%{http_code}" "https://${RELEASE_NAME}.pg-sandbox.altimetrik.com"` = "200" ]; then echo "Project URL - https://${RELEASE_NAME}.pg-sandbox.altimetrik.com";exit 0; else exit 1; fi
+  allow_failure: false
+  only:
+    variables:
+      - $CI_PIPELINE_SOURCE == "web"
+
+
+DeleteProject:
+  stage: DeleteProject
+  script:
+    - echo `pwd`
+    - DNS_VALUE=`kubectl get ingress $RELEASE_NAME -o jsonpath="{.status.loadBalancer.ingress[0].hostname}"`
+    - sed -i s/DNS_NAME/${RELEASE_NAME}.pg-sandbox.altimetrik.com/g ./DeleteRecord.json
+    - sed -i s/DNS_VALUE/${DNS_VALUE}/g ./DeleteRecord.json
+    - cd ./helm && /usr/local/bin/helm uninstall $RELEASE_NAME
+    - kubectl patch ingress ${RELEASE_NAME} -p '{"metadata":{"finalizers":[]}}' --type=merge
+    - cd ../
+    - aws route53 change-resource-record-sets --hosted-zone-id $HOSTED_ZONE_ID --change-batch file://DeleteRecord.json
+  when: manual
+  only:
+    variables:
+      - $CI_PIPELINE_SOURCE == "web"
\ No newline at end of file
--- a/helm/service/Chart.yaml
+++ b/helm/service/Chart.yaml
 apiVersion: v1
 appVersion: "1.0"
 description: A Helm chart for Kubernetes
-name: project1392
+name: project1486
 version: 0.1.0
\ No newline at end of file
--- a/helm/service/templates/NOTES.txt
+++ b/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 "project1392.fullname" . }})
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "project1486.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 "project1392.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "project1392.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+           You can watch the status of by running 'kubectl get svc -w {{ include "project1486.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "project1486.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 "project1392.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 "project1486.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 }}
\ No newline at end of file
--- a/helm/service/templates/_helpers.tpl
+++ b/helm/service/templates/_helpers.tpl
@@ -2,7 +2,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "project1392.name" -}}
+{{- define "project1486.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 "project1392.fullname" -}}
+{{- define "project1486.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 "project1392.chart" -}}
+{{- define "project1486.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
\ No newline at end of file
--- a/helm/service/templates/deployment.yaml
+++ b/helm/service/templates/deployment.yaml
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "project1392.fullname" . }}
+  name: {{ include "project1486.fullname" . }}
  labels:
-    app.kubernetes.io/name: {{ include "project1392.name" . }}
-    helm.sh/chart: {{ include "project1392.chart" . }}
+    app.kubernetes.io/name: {{ include "project1486.name" . }}
+    helm.sh/chart: {{ include "project1486.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 "project1392.name" . }}
+      app.kubernetes.io/name: {{ include "project1486.name" . }}
      app.kubernetes.io/instance: {{ .Release.Name }}
  template:
    metadata:
      labels:
-        app.kubernetes.io/name: {{ include "project1392.name" . }}
+        app.kubernetes.io/name: {{ include "project1486.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"
@@ -36,10 +33,6 @@ spec:
          resources:
            {{- toYaml .Values.resources | nindent 12 }}
      {{- with .Values.nodeSelector }}
-      volumes:
-      - name: efs-pvc
-        persistentVolumeClaim:
-         claimName: efs
      nodeSelector:
        {{- toYaml . | nindent 8 }}
      {{- end }}

--- a/helm/service/templates/ingress.yaml
+++ b/helm/service/templates/ingress.yaml
 {{- if .Values.ingress.enabled -}}
-{{- $fullName := include "project1392.fullname" . -}}
+{{- $fullName := include "project1486.fullname" . -}}
 {{- $ingressPaths := .Values.ingress.paths -}}
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
  name: {{ $fullName }}
  labels:
-    app.kubernetes.io/name: {{ include "project1392.name" . }}
-    helm.sh/chart: {{ include "project1392.chart" . }}
+    app.kubernetes.io/name: {{ include "project1486.name" . }}
+    helm.sh/chart: {{ include "project1486.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 }}
\ No newline at end of file
--- a/helm/service/templates/service.yaml
+++ b/helm/service/templates/service.yaml
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "project1392.fullname" . }}
+  name: {{ include "project1486.fullname" . }}
  labels:
-    app.kubernetes.io/name: {{ include "project1392.name" . }}
-    helm.sh/chart: {{ include "project1392.chart" . }}
+    app.kubernetes.io/name: {{ include "project1486.name" . }}
+    helm.sh/chart: {{ include "project1486.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 "project1392.name" . }}
+    app.kubernetes.io/name: {{ include "project1486.name" . }}
    app.kubernetes.io/instance: {{ .Release.Name }}
\ No newline at end of file
--- a/helm/service/templates/tests/test-connection.yaml
+++ b/helm/service/templates/tests/test-connection.yaml
 apiVersion: v1
 kind: Pod
 metadata:
-  name: "{{ include "project1392.fullname" . }}-test-connection"
+  name: "{{ include "project1486.fullname" . }}-test-connection"
  labels:
-    app.kubernetes.io/name: {{ include "project1392.name" . }}
-    helm.sh/chart: {{ include "project1392.chart" . }}
+    app.kubernetes.io/name: {{ include "project1486.name" . }}
+    helm.sh/chart: {{ include "project1486.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 "project1392.fullname" . }}:{{ .Values.service.port }}']
+      args:  ['{{ include "project1486.fullname" . }}:{{ .Values.service.port }}']
  restartPolicy: Never
\ No newline at end of file
--- a/helm/service/values.yaml
+++ b/helm/service/values.yaml
-# Default values for project1392.
+# Default values for PROJECT_NAME.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.

@@ -14,23 +14,35 @@ fullnameOverride: ""

 service:
  type: NodePort
-  port: 80
-  internalport: #SERVICE_PORT#
+  port: 1099
+  internalport: 1099
+
+

 ingress:
  enabled: true
-  annotations:
-      kubernetes.io/ingress.class: nginx
-      nginx.ingress.kubernetes.io/rewrite-target: /
-      #kubernetes.io/tls-acme: "true"
  paths:
-     path: /project1392
+    - /
+
+  subnets: SUBNETS
+  certificatearn: CERTIFICATE_ARN
+  healthcheckpath: /
+  healthcheckintervalseconds: 15
+  healthchecktimeoutseconds: 5
+  successcodes: 200,302
+  healthythresholdcount: 2
+  unhealthythresholdcount: 2
+  loadbalancername: "PROJECT_NAME-alb-ingress"
+
  hosts:
-     - pgsandbox.altimetrik.com
+    - host: PROJECT_NAME.pg-sandbox.altimetrik.com
+      serviceName: PROJECT_NAME
+      servicePort: SERVICE_PORT
+
  tls:
-     - secretName: custom-tls-cert
-       hosts:
-         - pgsandbox.altimetrik.com
+    - secretName: custom-tls-cert
+      hosts:
+        - PROJECT_NAME.pg-sandbox.altimetrik.com

 resources: {}
  # We usually recommend not to specify default resources and to leave this as a conscious
@@ -42,7 +54,7 @@ resources: {}
  #  memory: 128Mi
  # requests:
  #  cpu: 100m
-  #  memory: 128Mi
+#  memory: 128Mi

 nodeSelector: {env: common}


--- a/src/main/java/com/altimetrik/playground/candidate/assessment/controller/AdminDbConsoleController.java
+++ b/src/main/java/com/altimetrik/playground/candidate/assessment/controller/AdminDbConsoleController.java
 package com.altimetrik.playground.candidate.assessment.controller;

+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;
+import org.springframework.beans.factory.annotation.Value;
+
+@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://project1474.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
--- a/src/main/resources/application.properties
+++ b/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
--- a/src/main/resources/application.yml
+++ b/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