Apply suggestions

This commit is contained in:
Carlos Rodriguez Hernandez
2018-05-31 09:57:58 +00:00
parent 8e3fe16464
commit 25594e0fba
8 changed files with 42 additions and 42 deletions

View File

@@ -1,7 +1,7 @@
dependencies:
- name: mongodb
repository: https://kubernetes-charts.storage.googleapis.com/
version: 2.0.2
version: 2.0.6
- name: bitnami-common
repository: https://charts.bitnami.com/bitnami
version: 0.0.3

View File

@@ -3,20 +3,20 @@
{{- if contains "NodePort" .Values.serviceType }}
export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "node.fullname" . }})
export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "mean.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.serviceType }}
NOTE: It may take a few minutes for the LoadBalancer IP to be available.
Watch the status with: 'kubectl get svc -w {{ template "node.fullname" . }} --namespace {{ .Release.Namespace }}'
Watch the status with: 'kubectl get svc -w {{ template "mean.fullname" . }} --namespace {{ .Release.Namespace }}'
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "node.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "mean.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
echo http://$SERVICE_IP/
{{- else if contains "ClusterIP" .Values.serviceType }}
export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "node.name" . }}" -o jsonpath="{.items[0].metadata.name}")
export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "mean.name" . }}" -o jsonpath="{.items[0].metadata.name}")
kubectl port-forward $POD_NAME 3000:3000
Access to http://127.0.0.1:3000/

View File

@@ -2,7 +2,7 @@
{{/*
Expand the name of the chart.
*/}}
{{- define "node.name" -}}
{{- define "mean.name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
{{- end -}}
@@ -10,7 +10,7 @@ Expand the name of the chart.
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).
*/}}
{{- define "node.fullname" -}}
{{- define "mean.fullname" -}}
{{- $name := default .Chart.Name .Values.nameOverride -}}
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
@@ -19,21 +19,21 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
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).
*/}}
{{- define "node.mongodb.fullname" -}}
{{- define "mean.mongodb.fullname" -}}
{{- printf "%s-%s" .Release.Name "mongodb" | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
Create chart name and version as used by the chart label.
*/}}
{{- define "node.chart" -}}
{{- define "mean.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
Custom template to get proper service name
*/}}
{{- define "node.secretName" -}}
{{- define "mean.secretName" -}}
{{- if .Values.externaldb.secretName }}
{{- printf "%s" .Values.externaldb.secretName }}
{{- else }}

View File

@@ -1,10 +1,10 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: {{ template "node.fullname" . }}
name: {{ template "mean.fullname" . }}
labels:
app: {{ template "node.name" . }}
chart: {{ template "node.chart" . }}
app: {{ template "mean.name" . }}
chart: {{ template "mean.chart" . }}
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
spec:
@@ -12,7 +12,7 @@ spec:
template:
metadata:
labels:
app: {{ template "node.name" . }}
app: {{ template "mean.name" . }}
release: {{ .Release.Name | quote }}
spec:
{{- if .Values.image.pullSecrets }}
@@ -38,13 +38,13 @@ spec:
- name: app
mountPath: /app
containers:
- name: {{ template "node.fullname" . }}
- name: {{ template "mean.fullname" . }}
image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
env:
{{- if .Values.mongodb.install }}
- name: DATABASE_HOST
value: {{ template "node.mongodb.fullname" . }}
value: {{ template "mean.mongodb.fullname" . }}
- name: DATABASE_PORT
value: "27017"
- name: DATABASE_USER
@@ -52,8 +52,8 @@ spec:
- name: DATABASE_PASSWORD
valueFrom:
secretKeyRef:
name: {{ template "node.mongodb.fullname" . }}
key: mongodb-password
name: {{ template "mean.mongodb.fullname" . }}
key: mongodb-password
- name: DATABASE_NAME
value: {{ .Values.mongodb.mongodbDatabase | quote }}
- name: DATABASE_CONNECTION_OPTIONS
@@ -63,13 +63,13 @@ spec:
- name: DATABASE_HOST
valueFrom:
secretKeyRef:
name: {{ template "node.secretName" . }}
key: {{ template "externaldb.host" $type }}
name: {{ template "mean.secretName" . }}
key: {{ template "externaldb.host" $type }}
{{- if not .Values.externaldb.broker.serviceInstanceName }}
- name: DATABASE_NAME
valueFrom:
secretKeyRef:
name: {{ template "node.secretName" . }}
name: {{ template "mean.secretName" . }}
key: database
{{ else }}
- name: DATABASE_NAME
@@ -78,18 +78,18 @@ spec:
- name: DATABASE_PORT
valueFrom:
secretKeyRef:
name: {{ template "node.secretName" . }}
key: {{ template "externaldb.port" $type }}
name: {{ template "mean.secretName" . }}
key: {{ template "externaldb.port" $type }}
- name: DATABASE_USER
valueFrom:
secretKeyRef:
name: {{ template "node.secretName" . }}
key: {{ template "externaldb.username" $type }}
name: {{ template "mean.secretName" . }}
key: {{ template "externaldb.username" $type }}
- name: DATABASE_PASSWORD
valueFrom:
secretKeyRef:
name: {{ template "node.secretName" . }}
key: {{ template "externaldb.password" $type }}
name: {{ template "mean.secretName" . }}
key: {{ template "externaldb.password" $type }}
{{- if .Values.externaldb.ssl }}
- name: DATABASE_CONNECTION_OPTIONS
value: "ssl=true"

View File

@@ -3,11 +3,11 @@ apiVersion: extensions/v1beta1
kind: Ingress
metadata:
labels:
app: {{ template "node.name" . }}
chart: {{ template "node.chart" . }}
app: {{ template "mean.name" . }}
chart: {{ template "mean.chart" . }}
heritage: {{ .Release.Service }}
release: {{ .Release.Name }}
name: {{ template "node.fullname" . }}
name: {{ template "mean.fullname" . }}
annotations:
{{- range $key, $value := .Values.ingress.annotations }}
{{ $key }}: {{ $value | quote }}
@@ -19,7 +19,7 @@ spec:
paths:
- path: {{ .Values.ingress.path }}
backend:
serviceName: {{ include "node.fullname" . }}
serviceName: {{ include "mean.fullname" . }}
servicePort: 80
{{- if .Values.ingress.tls }}
tls:

View File

@@ -2,14 +2,14 @@
apiVersion: servicecatalog.k8s.io/v1beta1
kind: ServiceBinding
metadata:
name: {{ template "node.mongodb.fullname" . }}-binding
name: {{ template "mean.mongodb.fullname" . }}-binding
labels:
app: {{ template "node.name" . }}
chart: {{ template "node.chart" . }}
app: {{ template "mean.name" . }}
chart: {{ template "mean.chart" . }}
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
spec:
instanceRef:
name: {{ .Values.externaldb.broker.serviceInstanceName }}
secretName: {{ template "node.secretName" . }}
secretName: {{ template "mean.secretName" . }}
{{- end }}

View File

@@ -2,10 +2,10 @@
kind: PersistentVolumeClaim
apiVersion: v1
metadata:
name: {{ template "node.fullname" . }}
name: {{ template "mean.fullname" . }}
labels:
app: {{ template "node.name" . }}
chart: {{ template "node.chart" . }}
app: {{ template "mean.name" . }}
chart: {{ template "mean.chart" . }}
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
annotations:

View File

@@ -1,10 +1,10 @@
apiVersion: v1
kind: Service
metadata:
name: {{ template "node.fullname" . }}
name: {{ template "mean.fullname" . }}
labels:
app: {{ template "node.name" . }}
chart: {{ template "node.chart" . }}
app: {{ template "mean.name" . }}
chart: {{ template "mean.chart" . }}
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
spec:
@@ -14,5 +14,5 @@ spec:
port: 80
targetPort: http
selector:
app: {{ template "node.name" . }}
app: {{ template "mean.name" . }}
release: "{{ .Release.Name }}"