diff --git a/stable/g2/Chart.yaml b/stable/g2/Chart.yaml index 91d5650f634a..2de90f4a10df 100755 --- a/stable/g2/Chart.yaml +++ b/stable/g2/Chart.yaml @@ -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 diff --git a/stable/g2/templates/NOTES.txt b/stable/g2/templates/NOTES.txt index 14ba91612be4..01e7c577ff7d 100644 --- a/stable/g2/templates/NOTES.txt +++ b/stable/g2/templates/NOTES.txt @@ -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" . }}" diff --git a/stable/g2/templates/_helpers.tpl b/stable/g2/templates/_helpers.tpl index f0d83d2edba6..a7c147212bee 100644 --- a/stable/g2/templates/_helpers.tpl +++ b/stable/g2/templates/_helpers.tpl @@ -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 -}} diff --git a/stable/g2/templates/cluster-role-binding.yaml b/stable/g2/templates/cluster-role-binding.yaml index 0ef44d37c418..d6d22592618a 100644 --- a/stable/g2/templates/cluster-role-binding.yaml +++ b/stable/g2/templates/cluster-role-binding.yaml @@ -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: diff --git a/stable/g2/templates/cluster-role.yaml b/stable/g2/templates/cluster-role.yaml index cd16b1f459a0..66b6592efda8 100644 --- a/stable/g2/templates/cluster-role.yaml +++ b/stable/g2/templates/cluster-role.yaml @@ -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: diff --git a/stable/g2/templates/deployment.yaml b/stable/g2/templates/deployment.yaml index 794244523bb5..c440396d8d5b 100644 --- a/stable/g2/templates/deployment.yaml +++ b/stable/g2/templates/deployment.yaml @@ -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: diff --git a/stable/g2/templates/service-account.yaml b/stable/g2/templates/service-account.yaml index 8ff9087648f2..39d4d5b4e81e 100644 --- a/stable/g2/templates/service-account.yaml +++ b/stable/g2/templates/service-account.yaml @@ -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 }} diff --git a/stable/g2/templates/service.yaml b/stable/g2/templates/service.yaml index 30792873949d..001f5821927c 100644 --- a/stable/g2/templates/service.yaml +++ b/stable/g2/templates/service.yaml @@ -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 }}'