Commit 582c5455 authored by pg-ta's avatar pg-ta

service names updated by Admin

parent ef48d2d8
Pipeline #2853 failed with stages
in 14 seconds
variables:
RELEASE_NAME: "project1392"
RELEASE_NAME: "project1443"
SERVICE_PORT: 8080
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"
......
apiVersion: v1
appVersion: "1.0"
description: A Helm chart for Kubernetes
name: project1392
name: project1443
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 "project1392.fullname" . }})
export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "project1443.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 "project1443.fullname" . }}'
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "project1443.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 "project1443.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 "project1392.name" -}}
{{- define "project1443.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 "project1443.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 "project1443.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 "project1392.fullname" . }}
name: {{ include "project1443.fullname" . }}
labels:
app.kubernetes.io/name: {{ include "project1392.name" . }}
helm.sh/chart: {{ include "project1392.chart" . }}
app.kubernetes.io/name: {{ include "project1443.name" . }}
helm.sh/chart: {{ include "project1443.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 "project1443.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
template:
metadata:
labels:
app.kubernetes.io/name: {{ include "project1392.name" . }}
app.kubernetes.io/name: {{ include "project1443.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 }}
......
{{- if .Values.ingress.enabled -}}
{{- $fullName := include "project1392.fullname" . -}}
{{- $fullName := include "project1443.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 "project1443.name" . }}
helm.sh/chart: {{ include "project1443.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 "project1392.fullname" . }}
name: {{ include "project1443.fullname" . }}
labels:
app.kubernetes.io/name: {{ include "project1392.name" . }}
helm.sh/chart: {{ include "project1392.chart" . }}
app.kubernetes.io/name: {{ include "project1443.name" . }}
helm.sh/chart: {{ include "project1443.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 "project1443.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
\ No newline at end of file
apiVersion: v1
kind: Pod
metadata:
name: "{{ include "project1392.fullname" . }}-test-connection"
name: "{{ include "project1443.fullname" . }}-test-connection"
labels:
app.kubernetes.io/name: {{ include "project1392.name" . }}
helm.sh/chart: {{ include "project1392.chart" . }}
app.kubernetes.io/name: {{ include "project1443.name" . }}
helm.sh/chart: {{ include "project1443.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 "project1443.fullname" . }}:{{ .Values.service.port }}']
restartPolicy: Never
\ No newline at end of file
# Default values for project1392.
# Default values for project1443.
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.
......@@ -24,7 +24,7 @@ ingress:
nginx.ingress.kubernetes.io/rewrite-target: /
#kubernetes.io/tls-acme: "true"
paths:
path: /project1392
path: /project1443
hosts:
- pgsandbox.altimetrik.com
tls:
......
package com.altimetrik.ee.demo.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 Default {
}
@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://pgsandbox.altimetrik.com/project1443/project1443/'>https://pgsandbox.altimetrik.com/project1443/project1443/</a></td>\n"
+ " <td>jdbc:h2:file:./src/main/resources/project1443</td>\n" + " <td>playground</td>\n"
+ " <td>password</td>\n" + " </tr>\n" + "</table>\n" + "</body>\n" + "</html>\n";
}
return new ResponseEntity<>(data, HttpStatus.OK);
}
}
\ No newline at end of file
# Enabling H2 Console
spring.h2.console.enabled=true
# Custom H2 Console URL
spring.h2.console.path=/project1443
# Enable Web Access
spring.h2.console.settings.web-allow-others=true
# Disable h2 details in default controller
k8s.db.env=
spring.application.name=article
spring.freemarker.enabled=false
server.port=1099
server.servlet.contextPath=/project1443
server.undertow.accesslog.enabled=true
logging.level.root=INFO
logging.level.com.memorynotfound=DEBUG
logging.level.org.springframework.web=INFO
logging.level.org.springframework.security=INFO
logging.level.org.hibernate.SQL=WARN
article.fileName=validator.json
\ No newline at end of file
# Please use the the url 'https://{pgtest/pgsandbox/citi-pg-project}.altimetrik.com/project1392/project1392/'
# Please use the the url 'https://{pgtest/pgsandbox/citi-pg-project}.altimetrik.com/project1443/project1443/'
# 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/project1392
\ No newline at end of file
spring.datasource.url = jdbc:h2:file:./src/main/resources/project1443
\ 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