service names updated

.gitlab-ci.yml

 variables:
-  RELEASE_NAME: "SERVICE_NAME"
+  RELEASE_NAME: "project7332"
   SERVICE_PORT: 80
-  REGISTRY_URL: 279716074232.dkr.ecr.us-east-1.amazonaws.com/pgdockrepo
+  REGISTRY_URL: 751503455312.dkr.ecr.us-west-2.amazonaws.com/pgnonprod
 
 stages:
   - Build
@@ -12,15 +12,15 @@ stages:
 Build:
   stage: Build
   script:
-  - $(aws ecr get-login --no-include-email --region us-east-1)
-  - docker build -t 279716074232.dkr.ecr.us-east-1.amazonaws.com/pgdockrepo:$CI_PIPELINE_ID .
-  - docker push 279716074232.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:
@@ -29,11 +29,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
-    allow_failure: false
+    - 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

Dockerfile

@@ -12,5 +12,5 @@ RUN npm run build
 FROM nginx:1.14.1-alpine
 COPY nginx/default.conf /etc/nginx/conf.d/
 RUN rm -rf /usr/share/nginx/html/*
-COPY --from=builder /usr/src/app/build /usr/share/nginx/html/SERVICE_NAME
-CMD ["nginx", "-g", "daemon off;"]
\ No newline at end of file
+COPY --from=builder /usr/src/app/build /usr/share/nginx/html/project7332
+CMD ["nginx", "-g", "daemon off;"]

helm/service/Chart.yaml

 apiVersion: v1
 appVersion: "1.0"
 description: A Helm chart for Kubernetes
-name: SERVICE_NAME
+name: project7332
 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 "project7332.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 "project7332.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "project7332.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 "project7332.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

helm/service/templates/_helpers.tpl

@@ -2,7 +2,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "SERVICE_NAME.name" -}}
+{{- define "project7332.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 "project7332.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 "project7332.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- 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 "project7332.fullname" . }}
   labels:
-    app.kubernetes.io/name: {{ include "SERVICE_NAME.name" . }}
-    helm.sh/chart: {{ include "SERVICE_NAME.chart" . }}
+    app.kubernetes.io/name: {{ include "project7332.name" . }}
+    helm.sh/chart: {{ include "project7332.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 "project7332.name" . }}
       app.kubernetes.io/instance: {{ .Release.Name }}
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: {{ include "SERVICE_NAME.name" . }}
+        app.kubernetes.io/name: {{ include "project7332.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
     spec:
       containers:
         - name: {{ .Chart.Name }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
+          env:
+            - name: "k8s.db.env"
+              value: "db-config-k8s"
           ports:
             - name: http
               containerPort: {{ .Values.service.internalport }}

helm/service/templates/ingress.yaml

 {{- if .Values.ingress.enabled -}}
-{{- $fullName := include "SERVICE_NAME.fullname" . -}}
+{{- $fullName := include "project7332.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 "project7332.name" . }}
+    helm.sh/chart: {{ include "project7332.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
   {{- with .Values.ingress.annotations }}

helm/service/templates/service.yaml

 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "SERVICE_NAME.fullname" . }}
+  name: {{ include "project7332.fullname" . }}
   labels:
-    app.kubernetes.io/name: {{ include "SERVICE_NAME.name" . }}
-    helm.sh/chart: {{ include "SERVICE_NAME.chart" . }}
+    app.kubernetes.io/name: {{ include "project7332.name" . }}
+    helm.sh/chart: {{ include "project7332.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/name: {{ include "project7332.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 "project7332.fullname" . }}-test-connection"
   labels:
-    app.kubernetes.io/name: {{ include "SERVICE_NAME.name" . }}
-    helm.sh/chart: {{ include "SERVICE_NAME.chart" . }}
+    app.kubernetes.io/name: {{ include "project7332.name" . }}
+    helm.sh/chart: {{ include "project7332.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 }}']
+      args:  ['{{ include "project7332.fullname" . }}:{{ .Values.service.port }}']
   restartPolicy: Never
\ No newline at end of file

helm/service/values.yaml

-# Default values for SERVICE_NAME.
+# Default values for project7332.
 # 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
 
@@ -21,16 +21,16 @@ ingress:
   enabled: true
   annotations:
       kubernetes.io/ingress.class: nginx
-      nginx.ingress.kubernetes.io/rewrite-target: /SERVICE_NAME
+      nginx.ingress.kubernetes.io/rewrite-target: /project7332
       #kubernetes.io/tls-acme: "true"
   paths:
-     path: /SERVICE_NAME
+     path: /project7332
   hosts:
-     - pgsandbox.altimetrik.com
+     - pgtest.altimetrik.com
   tls:
      - secretName: custom-tls-cert
        hosts:
-         - pgsandbox.altimetrik.com
+         - pgtest.altimetrik.com
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious

nginx/default.conf

@@ -6,6 +6,7 @@ server {
 
   default_type application/octet-stream;
 
+
   gzip on;
   gzip_http_version 1.1;
   gzip_disable      "MSIE [1-6]\.";
@@ -15,14 +16,14 @@ server {
   gzip_types        text/plain text/css application/json application/javascript application/x-javascript text/xml application/xml application/xml+rss text/javascript;
   gzip_comp_level   9;
 
+
   root /usr/share/nginx/html;
 
-  location /SERVICE_NAME/ {
-    add_header Content-Type: text/plain;
+  location /project7332/ {
+  	add_header Content-Type: text/plain;
     add_header Access-Control-Allow-Origin *;
-	try_files $uri $uri/ /SERVICE_NAME/index.html?$query_string;
-	# index /usr/share/nginx/html/SERVICE_NAME/index.html?$query_string;
-	# try_files $uri $uri/ =404;
-  }
-
+    try_files $uri $uri/ /project7332/index.html?$query_string;
 }
+
+
+}
\ No newline at end of file

package.json

 {
-  "homepage" : "https://pgsandbox.altimetrik.com/SERVICE_NAME/",
+  "homepage" : "https://pgsandbox.altimetrik.com/project7332/",
   "name": "react-template",
   "version": "0.1.0",
   "private": true,
@@ -10,7 +10,7 @@
     "terser": "3.14.1"
   },
   "scripts": {
-    "start": "PORT=3000 react-scripts start",
+    "start": "react-scripts start",
     "build": "react-scripts build",
     "test": "react-scripts test",
     "eject": "react-scripts eject"
@@ -24,4 +24,4 @@
     "not ie <= 11",
     "not op_mini all"
   ]
-}
+}
\ No newline at end of file