Commit 2bb87903 authored by Yann Garcia's avatar Yann Garcia
Browse files

Bug fixed in meep-acme-mn-cse naming

parent 05c70201

charts/meep-acme-mn-cse/templates/_helpers.tpl

+3 −3
Changes for charts/meep-acme-mn-cse/templates/_helpers.tpl: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
{{/*

Expand the name of the chart.

*/}}

{{- define "meep-meep-acme-mn-cse.name" -}}

{{- define "meep-acme-mn-cse.name" -}}

{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}

{{- end -}}
@@ -11,7 +11,7 @@ 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).

If release name contains chart name it will be used as a full name.

*/}}

{{- define "meep-meep-acme-mn-cse.fullname" -}}

{{- define "meep-acme-mn-cse.fullname" -}}

{{- if .Values.fullnameOverride -}}

{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}

{{- else -}}
@@ -27,6 +27,6 @@ If release name contains chart name it will be used as a full name. 
{{/*

Create chart name and version as used by the chart label.

*/}}

{{- define "meep-meep-acme-mn-cse.chart" -}}

{{- define "meep-acme-mn-cse.chart" -}}

{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}

{{- end -}}

charts/meep-acme-mn-cse/templates/clusterrolebinding.yaml

+2 −2
Changes for charts/meep-acme-mn-cse/templates/clusterrolebinding.yaml: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line 
apiVersion: rbac.authorization.k8s.io/v1

kind: ClusterRoleBinding

metadata:

  name: "{{ .Release.Namespace }}:{{ template "meep-meep-acme-mn-cse.fullname" . }}"

  name: "{{ .Release.Namespace }}:{{ template "meep-acme-mn-cse.fullname" . }}"

roleRef:

  apiGroup: rbac.authorization.k8s.io

  kind: ClusterRole

  name: cluster-admin

subjects:

- kind: ServiceAccount

  name: {{ template "meep-meep-acme-mn-cse.fullname" . }}

  name: {{ template "meep-acme-mn-cse.fullname" . }}

  namespace: {{ .Release.Namespace }}

  
 No newline at end of file

charts/meep-acme-mn-cse/templates/codecov-pv.yaml

+5 −5
Changes for charts/meep-acme-mn-cse/templates/codecov-pv.yaml: 5 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -2,9 +2,9 @@ 
kind: PersistentVolume

apiVersion: v1

metadata:

  name: meep-meep-acme-mn-cse-codecov-pv

  name: meep-acme-mn-cse-codecov-pv

spec:

  storageClassName: meep-meep-acme-mn-cse-codecov-sc

  storageClassName: meep-acme-mn-cse-codecov-sc

  capacity:

    storage: 100Mi

  accessModes:
@@ -17,16 +17,16 @@ spec: 
kind: StorageClass

apiVersion: storage.k8s.io/v1

metadata:

  name: meep-meep-acme-mn-cse-codecov-sc

  name: meep-acme-mn-cse-codecov-sc

provisioner: kubernetes.io/no-provisioner

volumeBindingMode: WaitForFirstConsumer

---

kind: PersistentVolumeClaim

apiVersion: v1

metadata:

  name: meep-meep-acme-mn-cse-codecov-pvc

  name: meep-acme-mn-cse-codecov-pvc

spec:

  storageClassName: meep-meep-acme-mn-cse-codecov-sc

  storageClassName: meep-acme-mn-cse-codecov-sc

  accessModes:

    - ReadWriteOnce

  resources:

charts/meep-acme-mn-cse/templates/deployment.yaml

+7 −7
Changes for charts/meep-acme-mn-cse/templates/deployment.yaml: 7 added lines, 7 removed lines.
Original line number Diff line number Diff line 
apiVersion: apps/v1

kind: Deployment

metadata:

  name: {{ template "meep-meep-acme-mn-cse.fullname" . }}

  name: {{ template "meep-acme-mn-cse.fullname" . }}

  labels:

    app: {{ template "meep-meep-acme-mn-cse.name" . }}

    chart: {{ template "meep-meep-acme-mn-cse.chart" . }}

    app: {{ template "meep-acme-mn-cse.name" . }}

    chart: {{ template "meep-acme-mn-cse.chart" . }}

    release: {{ .Release.Name }}

    heritage: {{ .Release.Service }}

    meepOrigin: {{ .Values.meepOrigin }}
@@ -12,21 +12,21 @@ spec: 
  replicas: {{ .Values.deployment.replicas }}

  selector:

    matchLabels:

      app: {{ template "meep-meep-acme-mn-cse.name" . }}

      app: {{ template "meep-acme-mn-cse.name" . }}

      release: {{ .Release.Name }}

  template:

    metadata:

      labels:

        app: {{ template "meep-meep-acme-mn-cse.name" . }}

        app: {{ template "meep-acme-mn-cse.name" . }}

        release: {{ .Release.Name }}

        meepOrigin: {{ .Values.meepOrigin }}

    spec:

      serviceAccountName: {{ template "meep-meep-acme-mn-cse.fullname" . }}

      serviceAccountName: {{ template "meep-acme-mn-cse.fullname" . }}

      {{- if .Values.codecov.enabled}}

      volumes:

        - name: codecov-storage

          persistentVolumeClaim:

            claimName: meep-meep-acme-mn-cse-codecov-pvc

            claimName: meep-acme-mn-cse-codecov-pvc

      {{- end}}

      containers:

        - name: {{ .Chart.Name }}

charts/meep-acme-mn-cse/templates/ingress.yaml

+1 −1
Changes for charts/meep-acme-mn-cse/templates/ingress.yaml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ kind: Ingress 
metadata:

  name: {{ $serviceName }}

  labels:

    app: {{ template "meep-meep-acme-mn-cse.name" . }}

    app: {{ template "meep-acme-mn-cse.name" . }}

    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}

    release: {{ .Release.Name }}

    heritage: {{ .Release.Service }}