Commit 16f9c6d4 authored by Administrator's avatar Administrator

service names updated

parent 0433a267
Pipeline #2267 failed with stages
in 1 minute and 56 seconds
variables:
RELEASE_NAME: "SERVICE_NAME"
RELEASE_NAME: "project1147"
SERVICE_PORT: 80
REGISTRY_URL: 279716074232.dkr.ecr.us-east-1.amazonaws.com/pgdockrepo
REGISTRY_URL: 751503455312.dkr.ecr.us-east-1.amazonaws.com/pgdockrepo
stages:
- Build
......@@ -13,8 +13,8 @@ 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
- 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
ReleaseCleanup:
stage: ReleaseCleanup
......@@ -30,10 +30,11 @@ ReleaseDeploy:
- 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
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
......@@ -3,9 +3,9 @@ COPY package.json package-lock.json ./
RUN npm i && mkdir /ng-app && mv ./node_modules ./ng-app
WORKDIR /ng-app
COPY . .
RUN $(npm bin)/ng build --prod --output-path=dist --base-href /projectx1/
RUN $(npm bin)/ng build --prod --output-path=dist --base-href /project1147/
FROM nginx:1.14.1-alpine
COPY nginx/default.conf /etc/nginx/conf.d/
RUN rm -rf /usr/share/nginx/html/*
COPY --from=builder /ng-app/dist /usr/share/nginx/html/projectx1
COPY --from=builder /ng-app/dist /usr/share/nginx/html/project1147
CMD ["nginx", "-g", "daemon off;"]
\ No newline at end of file
apiVersion: v1
appVersion: "1.0"
description: A Helm chart for Kubernetes
name: projectx1
name: project1147
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 "projectx1.fullname" . }})
export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "project1147.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 "projectx1.fullname" . }}'
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "projectx1.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
You can watch the status of by running 'kubectl get svc -w {{ include "project1147.fullname" . }}'
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "project1147.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 "projectx1.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 "project1147.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 "projectx1.name" -}}
{{- define "project1147.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 "projectx1.fullname" -}}
{{- define "project1147.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 "projectx1.chart" -}}
{{- define "project1147.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 "projectx1.fullname" . }}
name: {{ include "project1147.fullname" . }}
labels:
app.kubernetes.io/name: {{ include "projectx1.name" . }}
helm.sh/chart: {{ include "projectx1.chart" . }}
app.kubernetes.io/name: {{ include "project1147.name" . }}
helm.sh/chart: {{ include "project1147.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 "projectx1.name" . }}
app.kubernetes.io/name: {{ include "project1147.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
template:
metadata:
labels:
app.kubernetes.io/name: {{ include "projectx1.name" . }}
app.kubernetes.io/name: {{ include "project1147.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 }}
......
{{- if .Values.ingress.enabled -}}
{{- $fullName := include "projectx1.fullname" . -}}
{{- $fullName := include "project1147.fullname" . -}}
{{- $ingressPaths := .Values.ingress.paths -}}
apiVersion: extensions/v1beta1
kind: Ingress
metadata:
name: {{ $fullName }}
labels:
app.kubernetes.io/name: {{ include "projectx1.name" . }}
helm.sh/chart: {{ include "projectx1.chart" . }}
app.kubernetes.io/name: {{ include "project1147.name" . }}
helm.sh/chart: {{ include "project1147.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 "projectx1.fullname" . }}
name: {{ include "project1147.fullname" . }}
labels:
app.kubernetes.io/name: {{ include "projectx1.name" . }}
helm.sh/chart: {{ include "projectx1.chart" . }}
app.kubernetes.io/name: {{ include "project1147.name" . }}
helm.sh/chart: {{ include "project1147.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 "projectx1.name" . }}
app.kubernetes.io/name: {{ include "project1147.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
\ No newline at end of file
apiVersion: v1
kind: Pod
metadata:
name: "{{ include "projectx1.fullname" . }}-test-connection"
name: "{{ include "project1147.fullname" . }}-test-connection"
labels:
app.kubernetes.io/name: {{ include "projectx1.name" . }}
helm.sh/chart: {{ include "projectx1.chart" . }}
app.kubernetes.io/name: {{ include "project1147.name" . }}
helm.sh/chart: {{ include "project1147.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 "projectx1.fullname" . }}:{{ .Values.service.port }}']
args: ['{{ include "project1147.fullname" . }}:{{ .Values.service.port }}']
restartPolicy: Never
\ No newline at end of file
# Default values for projectx1.
# Default values for project1147.
# 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-east-1.amazonaws.com/pgdockrepo
tag: #BUILD_ID#
pullPolicy: IfNotPresent
......@@ -13,7 +13,7 @@ nameOverride: ""
fullnameOverride: ""
service:
type: LoadBalancer
type: NodePort
port: 80
internalport: #SERVICE_PORT#
......@@ -21,10 +21,10 @@ ingress:
enabled: true
annotations:
kubernetes.io/ingress.class: nginx
nginx.ingress.kubernetes.io/rewrite-target: /projectx1
nginx.ingress.kubernetes.io/rewrite-target: /project1147
#kubernetes.io/tls-acme: "true"
paths:
path: /projectx1
path: /project1147
hosts:
- pgsandbox.altimetrik.com
tls:
......
......@@ -6,6 +6,7 @@ server {
default_type application/octet-stream;
gzip on;
gzip_http_version 1.1;
gzip_disable "MSIE [1-6]\.";
......@@ -15,12 +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/ {
location /project1147/ {
add_header Content-Type: text/plain;
add_header Access-Control-Allow-Origin *;
try_files $uri $uri/ /SERVICE_NAME/index.html?$query_string;
}
try_files $uri $uri/ /project1147/index.html?$query_string;
}
}
\ 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