github/deprecated-helm-charts
1
0
Fork 0
mirror of https://github.com/helm/charts.git synced 2026-08-23 22:37:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[stable/odoo] #1785 namespace defined templates with chart name (#2170)

Browse Source
This commit is contained in:
Kevin Schumacher
2017-11-08 21:10:25 -08:00
committed by Vic Iglesias
parent d7d20dfa4f
commit 6ff78dce14
7 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stable/odoo/Chart.yaml
+1 -1
View File
@@ -1,5 +1,5 @@
name: odoo
version: 0.5.15
version: 0.6.0
appVersion: 10.0.20171022
description: A suite of web based open source business apps.
keywords:
stable/odoo/templates/NOTES.txt
+6 -6
View File
@@ -5,20 +5,20 @@
{{- if contains "NodePort" .Values.serviceType }}
export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "fullname" . }})
export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "odoo.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 }}
** Please ensure an external IP is associated to the {{ template "fullname" . }} service before proceeding **
** Watch the status using: kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "fullname" . }} **
** Please ensure an external IP is associated to the {{ template "odoo.fullname" . }} service before proceeding **
** Watch the status using: kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "odoo.fullname" . }} **
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "odoo.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 "fullname" . }}" -o jsonpath="{.items[0].metadata.name}")
export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "odoo.fullname" . }}" -o jsonpath="{.items[0].metadata.name}")
echo http://127.0.0.1:8080/
kubectl port-forward $POD_NAME 8080:80
{{- end }}
@@ -26,4 +26,4 @@
2. Login with the following credentials
echo Email : {{ .Values.odooEmail }}
echo Password: $(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.odoo-password}" | base64 --decode)
echo Password: $(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "odoo.fullname" . }} -o jsonpath="{.data.odoo-password}" | base64 --decode)
stable/odoo/templates/_helpers.tpl
+3 -3
View File
@@ -2,7 +2,7 @@
{{/*
Expand the name of the chart.
*/}}
{{- define "name" -}}
{{- define "odoo.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 "fullname" -}}
{{- define "odoo.fullname" -}}
{{- $name := default .Chart.Name .Values.nameOverride -}}
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
@@ -19,6 +19,6 @@ 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 "postgresql.fullname" -}}
{{- define "odoo.postgresql.fullname" -}}
{{- printf "%s-%s" .Release.Name "postgresql" | trunc 63 | trimSuffix "-" -}}
{{- end -}}
stable/odoo/templates/deployment.yaml
+9 -9
View File
@@ -1,9 +1,9 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: {{ template "fullname" . }}
name: {{ template "odoo.fullname" . }}
labels:
app: {{ template "fullname" . }}
app: {{ template "odoo.fullname" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
@@ -11,28 +11,28 @@ spec:
template:
metadata:
labels:
app: {{ template "fullname" . }}
app: {{ template "odoo.fullname" . }}
spec:
containers:
- name: {{ template "fullname" . }}
- name: {{ template "odoo.fullname" . }}
image: "{{ .Values.image }}"
imagePullPolicy: {{ default "" .Values.imagePullPolicy | quote }}
env:
- name: POSTGRESQL_HOST
value: {{ template "postgresql.fullname" . }}
value: {{ template "odoo.postgresql.fullname" . }}
- name: POSTGRESQL_PORT_NUMBER
value: "5432"
- name: POSTGRESQL_PASSWORD
valueFrom:
secretKeyRef:
name: {{ template "postgresql.fullname" . }}
name: {{ template "odoo.postgresql.fullname" . }}
key: postgres-password
- name: ODOO_EMAIL
value: {{ default "" .Values.odooEmail | quote }}
- name: ODOO_PASSWORD
valueFrom:
secretKeyRef:
name: {{ template "fullname" . }}
name: {{ template "odoo.fullname" . }}
key: odoo-password
- name: SMTP_HOST
value: {{ default "" .Values.smtpHost | quote }}
@@ -43,7 +43,7 @@ spec:
- name: SMTP_PASSWORD
valueFrom:
secretKeyRef:
name: {{ template "fullname" . }}
name: {{ template "odoo.fullname" . }}
key: smtp-password
- name: SMTP_PROTOCOL
value: {{ default "" .Values.smtpProtocol | quote }}
@@ -71,7 +71,7 @@ spec:
- name: odoo-data
{{- if .Values.persistence.enabled }}
persistentVolumeClaim:
claimName: {{ template "fullname" . }}
claimName: {{ template "odoo.fullname" . }}
{{- else }}
emptyDir: {}
{{- end }}
stable/odoo/templates/pvc.yaml
+2 -2
View File
@@ -2,9 +2,9 @@
kind: PersistentVolumeClaim
apiVersion: v1
metadata:
name: {{ template "fullname" . }}
name: {{ template "odoo.fullname" . }}
labels:
app: {{ template "fullname" . }}
app: {{ template "odoo.fullname" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
stable/odoo/templates/secrets.yaml
+2 -2
View File
@@ -1,9 +1,9 @@
apiVersion: v1
kind: Secret
metadata:
name: {{ template "fullname" . }}
name: {{ template "odoo.fullname" . }}
labels:
app: {{ template "fullname" . }}
app: {{ template "odoo.fullname" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
stable/odoo/templates/svc.yaml
+3 -3
View File
@@ -1,9 +1,9 @@
apiVersion: v1
kind: Service
metadata:
name: {{ template "fullname" . }}
name: {{ template "odoo.fullname" . }}
labels:
app: {{ template "fullname" . }}
app: {{ template "odoo.fullname" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
@@ -14,4 +14,4 @@ spec:
port: 80
targetPort: http
selector:
app: {{ template "fullname" . }}
app: {{ template "odoo.fullname" . }}