Commit fd2a59a7 authored by Simon Pastor's avatar Simon Pastor
Browse files

influxdb chart addressing PR comments

parent 0dcf62d8

charts/influxdb/templates/persistentvolumeclaim.yaml

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

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

apiVersion: "v1"

kind: "PersistentVolumeClaim"

metadata:

{{- if .Values.persistence.annotations }}

  annotations:

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

{{- end }}

  labels:

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

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

    release: {{ .Release.Name }}

    heritage: {{ .Release.Service }}

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

spec:

  accessModes:

    - {{ .Values.persistence.accessMode | quote}}

{{- if .Values.persistence.storageClass }}

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

  storageClassName: ""

{{- else }}

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

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

{{- else }}

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

{{- end }}

{{- end }}

{{- end }}

  resources:

    requests:

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

{{- end -}}

{{- end -}}

charts/influxdb/templates/service-nodeport.yaml

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
apiVersion: v1

kind: Service

metadata:

{{- if .Values.service.annotations }}

  annotations:

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

{{- end }}

  name: {{ template "influxdb.fullname" . }}-nodeport

  labels:

    app: {{ template "influxdb.fullname" . }}-nodeport

    chart: "{{ template "influxdb.chart" . }}"

    release: "{{ .Release.Name }}"

    heritage: "{{ .Release.Service }}"

spec:

  type: {{ .Values.serviceNodePort.type }}

  ports:

  {{- if .Values.config.http.enabled }}

  - name: api

    port: {{ .Values.config.http.bind_address }}

    targetPort: {{ .Values.config.http.bind_address }}

    nodePort: {{ .Values.serviceNodePort.nodeport }}

  {{- end }}

  selector:

    app: {{ template "influxdb.fullname" . }}

charts/influxdb/templates/service.yaml

+6 −0
Original line number Diff line number Diff line
@@ -32,6 +32,9 @@ spec: 
  - name: api

    port: {{ .Values.config.http.bind_address }}

    targetPort: {{ .Values.config.http.bind_address }}

    {{- if .Values.service.apiNodePort }}

    nodePort: {{ .Values.service.apiNodePort }}

    {{- end }}

  {{- end }}

  {{- if .Values.config.admin.enabled }}

  - name: admin
@@ -62,6 +65,9 @@ spec: 
  - name: rpc

    port: {{ .Values.config.rpc.bind_address }}

    targetPort: {{ .Values.config.rpc.bind_address }}

    {{- if .Values.service.rpcNodePort }}

    nodePort: {{ .Values.service.rpcNodePort }}

    {{- end }}

  {{- end }}

  selector:

    app: {{ template "influxdb.fullname" . }}

charts/influxdb/templates/statefulset.yaml

+5 −22
Original line number Diff line number Diff line
@@ -103,7 +103,12 @@ spec: 
      {{- if (not .Values.persistence.enabled ) }}

      - name: {{ template "influxdb.fullname" . }}-data

        emptyDir: {}

      {{- else }}

      - name: {{ template "influxdb.fullname" . }}-data

        persistentVolumeClaim:

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

      {{- end }}



    {{- if .Values.schedulerName }}

      schedulerName: "{{ .Values.schedulerName }}"

    {{- end }}
@@ -119,25 +124,3 @@ spec: 
      tolerations:

{{ toYaml .Values.tolerations | indent 8 }}

      {{- end }}
 
{{- if .Values.persistence.enabled }}

  volumeClaimTemplates:

    - metadata:

        name: {{ template "influxdb.fullname" . }}-data

        annotations:

        {{- range $key, $value := .Values.persistence.annotations }}

          {{ $key }}: "{{ $value }}"

        {{- end }}

      spec:

        accessModes:

          - {{ .Values.persistence.accessMode | quote}}

        resources:

          requests:

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

      {{- if .Values.persistence.storageClass }}

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

        storageClassName: ""

      {{- else }}

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

      {{- end }}

      {{- end }}

{{- end }}

charts/influxdb/values.yaml

+5 −7
Original line number Diff line number Diff line
@@ -30,7 +30,10 @@ startupProbe: 
service:

  ## Add annotations to service

  # annotations: {}

  type: ClusterIP

  # type: ClusterIP

  type: NodePort

  apiNodePort: 30086

  rpcNodePort: 30088

  ## Add IP Cluster

  # clusterIP: ""

  ## Add external IPs that route to one or more cluster nodes
@@ -40,11 +43,6 @@ service: 
  ## Allow source IPs to access on service (if empty, any access allow)

  # loadBalancerSourceRanges: []



serviceNodePort:

  name: influxdb-nodeport

  type: NodePort

  nodeport: 31333



## Persist data to a persistent volume

##

persistence:
@@ -56,7 +54,7 @@ persistence: 
  ##   set, choosing the default provisioner.  (gp2 on AWS, standard on

  ##   GKE, AWS & OpenStack)

  ##

  storageClass: "meep-influxdb"

  storageClass: "fullname"

  annotations:

  accessMode: ReadWriteOnce

  size: 8Gi