diff --git a/stable/kube-lego/Chart.yaml b/stable/kube-lego/Chart.yaml index 148a656b52e0..afd57071e2af 100644 --- a/stable/kube-lego/Chart.yaml +++ b/stable/kube-lego/Chart.yaml @@ -1,12 +1,12 @@ apiVersion: v1 description: Automatically requests certificates from Let's Encrypt name: kube-lego -version: 0.2.2 +version: 0.3.0 keywords: - - kube-lego - - letsencrypt +- kube-lego +- letsencrypt sources: - - https://github.com/jetstack/kube-lego/tree/master/examples/nginx +- https://github.com/jetstack/kube-lego/tree/master/examples/nginx maintainers: - name: jackzampolin email: jack.zampolin@gmail.com diff --git a/stable/kube-lego/templates/_helpers.tpl b/stable/kube-lego/templates/_helpers.tpl index f0d83d2edba6..ed72c6c49350 100644 --- a/stable/kube-lego/templates/_helpers.tpl +++ b/stable/kube-lego/templates/_helpers.tpl @@ -2,7 +2,7 @@ {{/* Expand the name of the chart. */}} -{{- define "name" -}} +{{- define "kube-lego.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 "kube-lego.fullname" -}} {{- $name := default .Chart.Name .Values.nameOverride -}} {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} {{- end -}} diff --git a/stable/kube-lego/templates/deployment.yaml b/stable/kube-lego/templates/deployment.yaml index 846a519a6f0a..c4dd49bd1a02 100644 --- a/stable/kube-lego/templates/deployment.yaml +++ b/stable/kube-lego/templates/deployment.yaml @@ -2,11 +2,11 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: labels: - app: {{ template "name" . }} + app: {{ template "kube-lego.name" . }} chart: {{ .Chart.Name }}-{{ .Chart.Version }} heritage: {{ .Release.Service }} release: {{ .Release.Name }} - name: {{ template "fullname" . }} + name: {{ template "kube-lego.fullname" . }} spec: replicas: {{ .Values.replicaCount }} template: @@ -16,12 +16,12 @@ spec: {{ toYaml .Values.podAnnotations | indent 8 }} {{- end }} labels: - app: {{ template "name" . }} + app: {{ template "kube-lego.name" . }} release: {{ .Release.Name }} spec: - serviceAccountName: {{ if .Values.rbac.create }}{{ template "fullname" . }}{{ else }}"{{ .Values.rbac.serviceAccountName }}"{{ end }} + serviceAccountName: {{ if .Values.rbac.create }}{{ template "kube-lego.fullname" . }}{{ else }}"{{ .Values.rbac.serviceAccountName }}"{{ end }} containers: - - name: {{ template "name" . }} + - name: {{ template "kube-lego.name" . }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" imagePullPolicy: "{{ .Values.image.pullPolicy }}" env: diff --git a/stable/kube-lego/templates/role.yaml b/stable/kube-lego/templates/role.yaml index 9d80d477d798..d1e3cc0e375b 100644 --- a/stable/kube-lego/templates/role.yaml +++ b/stable/kube-lego/templates/role.yaml @@ -3,11 +3,11 @@ apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRole metadata: labels: - app: {{ template "name" . }} + app: {{ template "kube-lego.name" . }} chart: {{ .Chart.Name }}-{{ .Chart.Version }} heritage: {{ .Release.Service }} release: {{ .Release.Name }} - name: {{ template "fullname" . }} + name: {{ template "kube-lego.fullname" . }} rules: - apiGroups: - "" diff --git a/stable/kube-lego/templates/rolebinding.yaml b/stable/kube-lego/templates/rolebinding.yaml index 5a48ca212f18..fa14f6fa6179 100644 --- a/stable/kube-lego/templates/rolebinding.yaml +++ b/stable/kube-lego/templates/rolebinding.yaml @@ -3,17 +3,17 @@ apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRoleBinding metadata: labels: - app: {{ template "name" . }} + app: {{ template "kube-lego.name" . }} chart: {{ .Chart.Name }}-{{ .Chart.Version }} heritage: {{ .Release.Service }} release: {{ .Release.Name }} - name: {{ template "fullname" . }} + name: {{ template "kube-lego.fullname" . }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: {{ template "fullname" . }} + name: {{ template "kube-lego.fullname" . }} subjects: - kind: ServiceAccount - name: {{ template "fullname" . }} + name: {{ template "kube-lego.fullname" . }} namespace: {{ .Release.Namespace }} {{- end -}} diff --git a/stable/kube-lego/templates/serviceaccount.yaml b/stable/kube-lego/templates/serviceaccount.yaml index 8967eb1a75d8..f0d08748c758 100644 --- a/stable/kube-lego/templates/serviceaccount.yaml +++ b/stable/kube-lego/templates/serviceaccount.yaml @@ -3,9 +3,9 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - app: {{ template "name" . }} + app: {{ template "kube-lego.name" . }} chart: {{ .Chart.Name }}-{{ .Chart.Version }} heritage: {{ .Release.Service }} release: {{ .Release.Name }} - name: {{ template "fullname" . }} + name: {{ template "kube-lego.fullname" . }} {{- end -}}