Commit 2628aa35 authored by Administrator's avatar Administrator

service names updated

parent c1836cce
Pipeline #6962 failed with stages
in 19 seconds
variables:
RELEASE_NAME: "SERVICE_NAME"
RELEASE_NAME: "project7320"
SERVICE_PORT: 8080
REGISTRY_URL: 279716074232.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
......@@ -13,16 +15,16 @@ stages:
Build:
stage: Build
script:
- mvn clean install
- mvn clean install -Dk8s.db.env=db-config-k8s
- $(aws ecr get-login --no-include-email --region us-west-2)
- 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
- 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:
......@@ -31,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
apiVersion: v1
appVersion: "1.0"
description: A Helm chart for Kubernetes
name: SERVICE_NAME
name: project7320
version: 0.1.0
\ No newline at end of file
......@@ -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 "project7320.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 "project7320.fullname" . }}'
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "project7320.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 "project7320.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
......@@ -2,7 +2,7 @@
{{/*
Expand the name of the chart.
*/}}
{{- define "SERVICE_NAME.name" -}}
{{- define "project7320.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 "project7320.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 "project7320.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
{{- end -}}
\ No newline at end of file
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include "SERVICE_NAME.fullname" . }}
name: {{ include "project7320.fullname" . }}
labels:
app.kubernetes.io/name: {{ include "SERVICE_NAME.name" . }}
helm.sh/chart: {{ include "SERVICE_NAME.chart" . }}
app.kubernetes.io/name: {{ include "project7320.name" . }}
helm.sh/chart: {{ include "project7320.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 "project7320.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
template:
metadata:
labels:
app.kubernetes.io/name: {{ include "SERVICE_NAME.name" . }}
app.kubernetes.io/name: {{ include "project7320.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
spec:
containers:
......
{{- if .Values.ingress.enabled -}}
{{- $fullName := include "SERVICE_NAME.fullname" . -}}
{{- $fullName := include "project7320.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 "project7320.name" . }}
helm.sh/chart: {{ include "project7320.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- with .Values.ingress.annotations }}
......
apiVersion: v1
kind: Service
metadata:
name: {{ include "SERVICE_NAME.fullname" . }}
name: {{ include "project7320.fullname" . }}
labels:
app.kubernetes.io/name: {{ include "SERVICE_NAME.name" . }}
helm.sh/chart: {{ include "SERVICE_NAME.chart" . }}
app.kubernetes.io/name: {{ include "project7320.name" . }}
helm.sh/chart: {{ include "project7320.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 "project7320.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
\ No newline at end of file
apiVersion: v1
kind: Pod
metadata:
name: "{{ include "SERVICE_NAME.fullname" . }}-test-connection"
name: "{{ include "project7320.fullname" . }}-test-connection"
labels:
app.kubernetes.io/name: {{ include "SERVICE_NAME.name" . }}
helm.sh/chart: {{ include "SERVICE_NAME.chart" . }}
app.kubernetes.io/name: {{ include "project7320.name" . }}
helm.sh/chart: {{ include "project7320.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 "project7320.fullname" . }}:{{ .Values.service.port }}']
restartPolicy: Never
\ No newline at end of file
# Default values for SERVICE_NAME.
# Default values for project7320.
# 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,18 +21,18 @@ ingress:
enabled: true
annotations:
kubernetes.io/ingress.class: nginx
nginx.ingress.kubernetes.io/rewrite-target: /$2
nginx.ingress.kubernetes.io/rewrite-target: /
#kubernetes.io/tls-acme: "true"
paths:
path: /SERVICE_NAME(/|$)(.*)
path: /project7320
hosts:
# - afe6ec7ed3f3711e9b98006759708723-313212737.us-west-2.elb.amazonaws.com
- 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
......
......@@ -31,8 +31,8 @@ public class Default {
+ "<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://pgtest.altimetrik.com/SERVICE_NAME/SERVICE_NAME/'>https://pgtest.altimetrik.com/SERVICE_NAME/SERVICE_NAME/</a></td>\n"
+ " <td>jdbc:h2:file:./src/main/resources/SERVICE_NAME</td>\n" + " <td>playground</td>\n"
+ " <td><a target='_blank' href='https://pgtest.altimetrik.com/project7320/project7320/'>https://pgtest.altimetrik.com/project7320/project7320/</a></td>\n"
+ " <td>jdbc:h2:file:./src/main/resources/project7320</td>\n" + " <td>playground</td>\n"
+ " <td>password</td>\n" + " </tr>\n" + "</table>\n" + "</body>\n" + "</html>\n";
}
return new ResponseEntity<>(data, HttpStatus.OK);
......
......@@ -2,7 +2,7 @@
spring.h2.console.enabled=true
# Custom H2 Console URL
spring.h2.console.path=/SERVICE_NAME
spring.h2.console.path=/project7320
# Enable Web Access
spring.h2.console.settings.web-allow-others=true
......
# Please use the the url 'https://pgtest.altimetrik.com/SERVICE_NAME/SERVICE_NAME/'
# Please use the the url 'https://{pgtest/pgsandbox/citi-pg-project}.altimetrik.com/project7320/project7320/'
# to connect to the database wih the properties mentioned below.
spring.datasource.driverClassName=org.h2.Driver
spring.datasource.username=playground
......@@ -6,4 +6,4 @@ spring.datasource.password=password
spring.jpa.database-platform=org.hibernate.dialect.H2Dialect
# temporary data storage
spring.datasource.url = jdbc:h2:file:./src/main/resources/SERVICE_NAME
\ No newline at end of file
spring.datasource.url = jdbc:h2:file:./src/main/resources/project7320
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment