Commit 99ff8bb8 authored by Prout, Ryan's avatar Prout, Ryan
Browse files

make name a variable

parent 2be98bd8

charts/minio-standalone/templates/_helpers.tpl

+3 −3
Original line number Diff line number Diff line 
{{/*

Expand the name of the chart.

*/}}

{{- define "minio-standalone.name" -}}

{{- define "{{ .Values.minio.name }}.name" -}}

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

{{- end -}}
@@ -9,8 +9,8 @@ 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 "minio-standalone.fullname" -}}

{{- $name := default "minio-standalone" .Values.nameOverride -}}

{{- define "{{ .Values.minio.name }}.fullname" -}}

{{- $name := default "{{ .Values.minio.name }}" .Values.nameOverride -}}

{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}

{{- end -}}

charts/minio-standalone/templates/minio-standalone-deployment.yaml

+6 −4
Original line number Diff line number Diff line
@@ -2,20 +2,22 @@ apiVersion: apps/v1 
kind: Deployment

metadata:

  # This name uniquely identifies the Deployment

  name: minio-standalone

  name: {{ .Values.minio.name }}

spec:

  selector:

    matchLabels:

      app: minio-standalone # has to match .spec.template.metadata.labels

      app: {{ .Values.minio.name }} # has to match .spec.template.metadata.labels

  strategy:

    # Specifies the strategy used to replace old Pods by new ones

    # Refer: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy

    type: Recreate

  template:

    metadata:

      #annotations:

      #  ccs.ornl.gov/fs: olcf

      labels:

        # This label is used as a selector in Service definition

        app: minio-standalone

        app: {{ .Values.minio.name }}

    spec:

      # Volumes used by this deployment

      volumes:
@@ -23,7 +25,7 @@ spec: 
        # This volume is based on PVC

        persistentVolumeClaim:

          # Name of the PVC created earlier

          claimName: minio-standalone-pv-claim

          claimName: {{ .Values.minio.name }}-pv-claim

      containers:

      - name: minio

        # Volume mounts for this container

charts/minio-standalone/templates/minio-standalone-pvc.yaml

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ apiVersion: v1 
kind: PersistentVolumeClaim

metadata:

  # This name uniquely identifies the PVC. This is used in deployment.

  name: minio-standalone-pv-claim

  name: {{ .Values.minio.name }}-pv-claim

spec:

  # Read more about access modes here: http://kubernetes.io/docs/user-guide/persistent-volumes/#access-modes

  accessModes:

charts/minio-standalone/templates/minio-standalone-service.yaml

+3 −3
Original line number Diff line number Diff line
@@ -2,9 +2,9 @@ apiVersion: v1 
kind: Service

metadata:

  # This name uniquely identifies the service

  name: minio-standalone-service

  name: {{ .Values.minio.name }}-service

  labels:

    app: minio-standalone

    app: {{ .Values.minio.name }}

spec:

  type: ClusterIP

  ports:
@@ -14,4 +14,4 @@ spec: 
      protocol: TCP

  selector:

    # Looks for labels `app:minio-standalone` in the namespace and applies the spec

    app: minio-standalone
 
    app: {{ .Values.minio.name }}

charts/minio-standalone/templates/network-policy.yaml

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ spec: 
  podSelector:

    matchLabels:

      # how we match our application

      app: minio-standalone

      app: {{ .Values.minio.name }}

  ingress:

    # allow all

    - {}