Commit 1b6b6c91 authored by Kevin Di Lallo's avatar Kevin Di Lallo
Browse files

added pv & pvc in couchdb; fixed virt-engine support for user charts; updated... 

added pv & pvc in couchdb; fixed virt-engine support for user charts; updated demo2 charts; renamed dep charts to include meep
parent aee4dab3

.meepctl-repocfg.yaml

+6 −10
Original line number Diff line number Diff line
@@ -66,30 +66,26 @@ repo: 
  dep:

    elastic:

      es:

        version: 1.9.1

        values: charts/elasticsearch/elastic-values.yaml

        chart: incubator/elasticsearch

        version: "1.9.1"

        values: charts/elasticsearch/elastic-values.yaml

        pv: charts/elasticsearch/meep-pv-es.yaml

      es-curator:

        chart: charts/elasticsearch-curator

      kibana:

        chart: charts/kibana

        pv: charts/kibana/meep-pv-kibana.yaml

      filebeat:

        version: 1.0.2

        values: charts/filebeat/filebeat-values.yaml

        chart: stable/filebeat

        version: "1.0.2"

        values: charts/filebeat/values.yaml

      metricbeat:

        template: charts/metricbeat/values-template.yaml

        values: charts/metricbeat/values.yaml

        chart: charts/metricbeat

    couchdb:

      chart: charts/couchdb

      pv: charts/couchdb/meep-pv-couchdb.yaml

    redis:

      version: 4.0.1

      values: charts/redis/redis-values.yaml

      chart: stable/redis

      version: "4.0.1"

      values: charts/redis/values.yaml

    k8s:

      kube-state-metrics:

        chart: charts/kube-state-metrics

charts/couchdb/templates/_helpers.tpl

+9 −1
Original line number Diff line number Diff line
@@ -11,18 +11,26 @@ 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 "couchdb.fullname" -}}

{{- if .Values.fullnameOverride -}}

{{- printf "%s-%s" .Values.fullnameOverride .Chart.Name | trunc 63 | trimSuffix "-" -}}

{{- else -}}

{{- $name := default .Chart.Name .Values.nameOverride -}}

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

{{- end -}}

{{- end -}}



{{/*

In the event that we create both a headless service and a traditional one,

ensure that the latter gets a unique name.

*/}}

{{- define "couchdb.svcname" -}}

{{- if .Values.fullnameOverride -}}

{{- printf "%s-svc-%s" .Values.fullnameOverride .Chart.Name | trunc 63 | trimSuffix "-" -}}

{{- else -}}

{{- $name := default .Chart.Name .Values.nameOverride -}}

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

{{- end -}}

{{- end -}}



{{/*

Create a random string if the supplied key does not exist

charts/couchdb/templates/persistentvolume.yaml

0 → 100755
+22 −0
Original line number Diff line number Diff line 
{{- if .Values.persistentVolume.enabled}}

kind: PersistentVolume

apiVersion: v1

metadata:

  name: {{ template "couchdb.fullname" . }}

  labels:

    app: {{ template "couchdb.name" . }}

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

    release: {{ .Release.Name }}

    heritage: {{ .Release.Service }}

spec:

  capacity:

    storage: {{ .Values.persistentVolume.size }}

  accessModes:

  {{- range .Values.persistentVolume.accessModes }}

    - {{ . | quote }}

  {{- end }}

  persistentVolumeReclaimPolicy: {{ .Values.persistentVolume.reclaimPolicy }}

  hostPath:

    path: "{{.Values.persistentVolume.location}}"

  storageClassName: {{ template "couchdb.fullname" . }}

{{- end }}
 
 No newline at end of file

charts/couchdb/templates/persistentvolumeclaim.yaml

0 → 100755
+34 −0
Original line number Diff line number Diff line 
{{- if .Values.persistentVolumeClaim.enabled -}}

{{- if not .Values.persistentVolumeClaim.existingClaim -}}

apiVersion: "v1"

kind: "PersistentVolumeClaim"

metadata:

{{- if .Values.persistentVolumeClaim.annotations }}

  annotations:

{{ toYaml .Values.persistentVolumeClaim.annotations | indent 4 }}

{{- end }}

  labels:

    app: {{ template "couchdb.name" . }}

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

    release: {{ .Release.Name }}

    heritage: {{ .Release.Service }}

  name: {{ template "couchdb.fullname" . }}

spec:

  accessModes:

{{ toYaml .Values.persistentVolumeClaim.accessModes | indent 4 }}

{{- if .Values.persistentVolumeClaim.storageClass }}

{{- if (eq "-" .Values.persistentVolumeClaim.storageClass) }}

  storageClassName: ""

{{- else }}

{{- if (eq "fullname" .Values.persistentVolumeClaim.storageClass) }}

  storageClassName: "{{ template "couchdb.fullname" . }}"

{{- else }}

  storageClassName: "{{ .Values.persistentVolumeClaim.storageClass }}"

{{- end }}

{{- end }}

{{- end }}

  resources:

    requests:

      storage: "{{ .Values.persistentVolumeClaim.size }}"

{{- end -}}

{{- end -}}

charts/couchdb/templates/statefulset.yaml

+3 −23
Original line number Diff line number Diff line
@@ -117,27 +117,7 @@ spec: 
        - name: database-storage

          emptyDir: {}

{{- else }}

  volumeClaimTemplates:

    - metadata:

        name: database-storage

        labels:

          app: {{ template "couchdb.name" . }}

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

          release: {{ .Release.Name }}

          heritage: {{ .Release.Service }}

      spec:

        accessModes:

        {{- range .Values.persistentVolume.accessModes }}

          - {{ . | quote }}

        {{- end }}

        resources:

          requests:

            storage: {{ .Values.persistentVolume.size | quote }}

      {{- if .Values.persistentVolume.storageClass }}

      {{- if (eq "-" .Values.persistentVolume.storageClass) }}

        storageClassName: ""

      {{- else }}

        storageClassName: "{{ .Values.persistentVolume.storageClass }}"

      {{- end }}

      {{- end }}

        - name: database-storage

          persistentVolumeClaim:

            claimName: {{ template "couchdb.fullname" . }}

{{- end }}