[stable/g2] #1785 namespace defined templates with chart name (#2150)

This commit is contained in:
Kevin Schumacher
2017-10-05 00:07:22 +05:30
committed by Dhilip
parent 170db8f179
commit 350563d862
8 changed files with 20 additions and 20 deletions
+4 -4
View File
@@ -1,12 +1,12 @@
apiVersion: v1
description: G2 by AppsCode - Gearman in Golang
name: g2
version: 0.1.0
version: 0.2.0
appVersion: 0.5.0
home: https://github.com/appscode/g2
icon: https://cdn.appscode.com/images/icon/g2.png
sources:
- https://github.com/appscode/g2
- https://github.com/appscode/g2
maintainers:
- name: appscode
email: support@appscode.com
- name: appscode
email: support@appscode.com
+1 -1
View File
@@ -1,3 +1,3 @@
To verify that G2 has started, run:
kubectl --namespace={{ .Release.Namespace }} get deployments -l "release={{ .Release.Name }}, app={{ template "name" . }}"
kubectl --namespace={{ .Release.Namespace }} get deployments -l "release={{ .Release.Name }}, app={{ template "g2.name" . }}"
+2 -2
View File
@@ -2,7 +2,7 @@
{{/*
Expand the name of the chart.
*/}}
{{- define "name" -}}
{{- define "g2.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 "g2.fullname" -}}
{{- $name := default .Chart.Name .Values.nameOverride -}}
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
@@ -1,12 +1,12 @@
{{ if .Values.rbac.install }}
{{- $serviceName := include "fullname" . -}}
{{- $serviceName := include "g2.fullname" . -}}
apiVersion: rbac.authorization.k8s.io/{{ required "A valid .Values.rbac.apiVersion entry required!" .Values.rbac.apiVersion }}
kind: ClusterRoleBinding
metadata:
name: {{ $serviceName }}
labels:
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
app: "{{ template "fullname" . }}"
app: "{{ template "g2.fullname" . }}"
heritage: "{{ .Release.Service }}"
release: "{{ .Release.Name }}"
subjects:
+2 -2
View File
@@ -1,12 +1,12 @@
{{ if .Values.rbac.install }}
{{- $serviceName := include "fullname" . -}}
{{- $serviceName := include "g2.fullname" . -}}
apiVersion: rbac.authorization.k8s.io/{{ required "A valid .Values.rbac.apiVersion entry required!" .Values.rbac.apiVersion }}
kind: ClusterRole
metadata:
name: {{ $serviceName }}
labels:
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
app: "{{ template "fullname" . }}"
app: "{{ template "g2.fullname" . }}"
heritage: "{{ .Release.Service }}"
release: "{{ .Release.Name }}"
rules:
+4 -4
View File
@@ -1,10 +1,10 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: {{ template "fullname" . }}
name: {{ template "g2.fullname" . }}
labels:
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
app: "{{ template "name" . }}"
app: "{{ template "g2.name" . }}"
heritage: "{{ .Release.Service }}"
release: "{{ .Release.Name }}"
spec:
@@ -12,11 +12,11 @@ spec:
template:
metadata:
labels:
app: "{{ template "name" . }}"
app: "{{ template "g2.name" . }}"
release: "{{ .Release.Name }}"
spec:
{{- if .Values.rbac.install }}
serviceAccountName: {{ template "fullname" . }}
serviceAccountName: {{ template "g2.fullname" . }}
{{- end }}
containers:
- args:
+2 -2
View File
@@ -2,10 +2,10 @@
apiVersion: v1
kind: ServiceAccount
metadata:
name: {{ template "fullname" . }}
name: {{ template "g2.fullname" . }}
labels:
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
app: "{{ template "fullname" . }}"
app: "{{ template "g2.fullname" . }}"
heritage: "{{ .Release.Service }}"
release: "{{ .Release.Name }}"
{{ end }}
+3 -3
View File
@@ -1,9 +1,9 @@
apiVersion: v1
kind: Service
metadata:
name: {{ template "fullname" . }}
name: {{ template "g2.fullname" . }}
labels:
app: "{{ template "name" . }}"
app: "{{ template "g2.name" . }}"
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
@@ -18,6 +18,6 @@ spec:
protocol: TCP
targetPort: restapi
selector:
app: "{{ template "name" . }}"
app: "{{ template "g2.name" . }}"
release: "{{ .Release.Name }}"
type: '{{ .Values.g2.serviceType }}'