Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
P
Project1
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dpossi
Project1
Commits
aacec6bf
Commit
aacec6bf
authored
Mar 07, 2019
by
Administrator
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
service names updated
parent
57b8c92d
Pipeline
#1753
passed with stages
in 28 seconds
Changes
11
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
48 additions
and
41 deletions
+48
-41
.gitlab-ci.yml
.gitlab-ci.yml
+8
-7
Dockerfile
Dockerfile
+3
-2
Chart.yaml
helm/service/Chart.yaml
+2
-1
NOTES.txt
helm/service/templates/NOTES.txt
+5
-4
_helpers.tpl
helm/service/templates/_helpers.tpl
+4
-3
deployment.yaml
helm/service/templates/deployment.yaml
+5
-5
ingress.yaml
helm/service/templates/ingress.yaml
+3
-3
service.yaml
helm/service/templates/service.yaml
+5
-4
test-connection.yaml
helm/service/templates/tests/test-connection.yaml
+5
-4
values.yaml
helm/service/values.yaml
+6
-6
default.conf
nginx/default.conf
+2
-2
No files found.
.gitlab-ci.yml
View file @
aacec6bf
variables
:
RELEASE_NAME
:
"
project
x
1"
RELEASE_NAME
:
"
project
141
1"
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
:
...
...
@@ -13,15 +13,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-east-
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 && /
s
bin/helm delete --purge $RELEASE_NAME && exit 0
allow_failure
:
true
...
...
@@ -31,4 +31,4 @@ 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
-
cd ./helm && /
s
bin/helm install service --name $RELEASE_NAME
\ No newline at end of file
Dockerfile
View file @
aacec6bf
...
...
@@ -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
/project
x
1/
RUN $(
npm bin
)
/ng build
--prod
--output-path
=
dist
--base-href
/project
141
1/
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/project
x
1
COPY
--from=builder /ng-app/dist /usr/share/nginx/html/project
141
1
CMD
["nginx", "-g", "daemon off;"]
\ No newline at end of file
helm/service/Chart.yaml
View file @
aacec6bf
apiVersion
:
v1
appVersion
:
"
1.0"
description
:
A Helm chart for Kubernetes
name
:
project
x
1
name
:
project
141
1
version
:
0.1.0
\ No newline at end of file
helm/service/templates/NOTES.txt
View file @
aacec6bf
...
...
@@ -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 "project
x
1.fullname" . }})
export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "project
141
1.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 "project
x
1.fullname" . }}'
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "project
x
1.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
You can watch the status of by running 'kubectl get svc -w {{ include "project
141
1.fullname" . }}'
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "project
141
1.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 "project
x
1.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 "project
141
1.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
View file @
aacec6bf
...
...
@@ -2,7 +2,7 @@
{
{
/*
Expand
the
name
of
the
chart
.
*/
}
}
{{- define "project
x
1.name" -}}
{{- define "project
141
1.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 "project
x
1.fullname" -}}
{{- define "project
141
1.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 "project
x
1.chart" -}}
{{- define "project
141
1.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
{{- end -}}
\ No newline at end of file
helm/service/templates/deployment.yaml
View file @
aacec6bf
apiVersion
:
apps/v1
kind
:
Deployment
metadata
:
name
:
{{
include "project
x
1.fullname" .
}}
name
:
{{
include "project
141
1.fullname" .
}}
labels
:
app.kubernetes.io/name
:
{{
include "project
x
1.name" .
}}
helm.sh/chart
:
{{
include "project
x
1.chart" .
}}
app.kubernetes.io/name
:
{{
include "project
141
1.name" .
}}
helm.sh/chart
:
{{
include "project
141
1.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 "project
x
1.name" .
}}
app.kubernetes.io/name
:
{{
include "project
141
1.name" .
}}
app.kubernetes.io/instance
:
{{
.Release.Name
}}
template
:
metadata
:
labels
:
app.kubernetes.io/name
:
{{
include "project
x
1.name" .
}}
app.kubernetes.io/name
:
{{
include "project
141
1.name" .
}}
app.kubernetes.io/instance
:
{{
.Release.Name
}}
spec
:
containers
:
...
...
helm/service/templates/ingress.yaml
View file @
aacec6bf
{{
- if .Values.ingress.enabled -
}}
{{
- $fullName
:
= include "project
x
1.fullname" . -
}}
{{
- $fullName
:
= include "project
141
1.fullname" . -
}}
{{
- $ingressPaths
:
= .Values.ingress.paths -
}}
apiVersion
:
extensions/v1beta1
kind
:
Ingress
metadata
:
name
:
{{
$fullName
}}
labels
:
app.kubernetes.io/name
:
{{
include "project
x
1.name" .
}}
helm.sh/chart
:
{{
include "project
x
1.chart" .
}}
app.kubernetes.io/name
:
{{
include "project
141
1.name" .
}}
helm.sh/chart
:
{{
include "project
141
1.chart" .
}}
app.kubernetes.io/instance
:
{{
.Release.Name
}}
app.kubernetes.io/managed-by
:
{{
.Release.Service
}}
{{
- with .Values.ingress.annotations
}}
...
...
helm/service/templates/service.yaml
View file @
aacec6bf
apiVersion
:
v1
kind
:
Service
metadata
:
name
:
{{
include "project
x
1.fullname" .
}}
name
:
{{
include "project
141
1.fullname" .
}}
labels
:
app.kubernetes.io/name
:
{{
include "project
x
1.name" .
}}
helm.sh/chart
:
{{
include "project
x
1.chart" .
}}
app.kubernetes.io/name
:
{{
include "project
141
1.name" .
}}
helm.sh/chart
:
{{
include "project
141
1.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 "project
x
1.name" .
}}
app.kubernetes.io/name
:
{{
include "project
141
1.name" .
}}
app.kubernetes.io/instance
:
{{
.Release.Name
}}
\ No newline at end of file
helm/service/templates/tests/test-connection.yaml
View file @
aacec6bf
apiVersion
:
v1
kind
:
Pod
metadata
:
name
:
"
{{
include
"project
x
1.fullname" . }}-test-connection"
name
:
"
{{
include
"project
141
1.fullname" . }}-test-connection"
labels
:
app.kubernetes.io/name
:
{{
include "project
x
1.name" .
}}
helm.sh/chart
:
{{
include "project
x
1.chart" .
}}
app.kubernetes.io/name
:
{{
include "project
141
1.name" .
}}
helm.sh/chart
:
{{
include "project
141
1.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
"project
x
1.fullname"
.
}}:{{
.Values.service.port
}}'
]
args
:
[
'
{{
include
"project
141
1.fullname"
.
}}:{{
.Values.service.port
}}'
]
restartPolicy
:
Never
\ No newline at end of file
helm/service/values.yaml
View file @
aacec6bf
# Default values for project
x
1.
# Default values for project
141
1.
# 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
:
/project
x
1
nginx.ingress.kubernetes.io/rewrite-target
:
/project
141
1
#kubernetes.io/tls-acme: "true"
paths
:
path
:
/project
x
1
path
:
/project
141
1
hosts
:
-
pg
sandbox
.altimetrik.com
-
pg
test
.altimetrik.com
tls
:
-
secretName
:
custom-tls-cert
hosts
:
-
pg
sandbox
.altimetrik.com
-
pg
test
.altimetrik.com
resources
:
{}
# We usually recommend not to specify default resources and to leave this as a conscious
...
...
nginx/default.conf
View file @
aacec6bf
...
...
@@ -19,8 +19,8 @@ server {
root
/
usr
/
share
/
nginx
/
html
;
location
/
project
x
1
/ {
try_files
$
uri
$
uri
/ /
project
x
1
/
index
.
html
?$
query_string
;
location
/
project
141
1
/ {
try_files
$
uri
$
uri
/ /
project
141
1
/
index
.
html
?$
query_string
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment