Commit 8cf9e030 authored by Simon Pastor's avatar Simon Pastor
Browse files

Merge branch 'develop' into frontend-dev

parents b7d47915 89f066c2

.meepctl-repocfg.yaml

+3 −7
Original line number Diff line number Diff line 
#AdvantEDGE

version: 1.1.0

version: 1.1.1

repo:

  name: AdvantEDGE

  core:
@@ -91,17 +91,13 @@ repo: 
      kibana:

        chart: charts/kibana

      filebeat:

        chart: stable/filebeat

        version: "1.0.2"

        values: charts/filebeat/values.yaml

        chart: charts/filebeat

      metricbeat:

        chart: charts/metricbeat

    couchdb:

      chart: charts/couchdb

    redis:

      chart: stable/redis

      version: "4.0.1"

      values: charts/redis/values.yaml

      chart: charts/redis

    k8s:

      kube-state-metrics:

        chart: charts/kube-state-metrics

charts/couchdb/templates/statefulset.yaml

+0 −16
Original line number Diff line number Diff line
@@ -84,22 +84,6 @@ spec: 
            mountPath: /opt/couchdb/etc/default.d

          - name: database-storage

            mountPath: /opt/couchdb/data

        - name: couchdb-statefulset-assembler

          image: "{{ .Values.helperImage.repository }}:{{ .Values.helperImage.tag }}"

          imagePullPolicy: {{ .Values.helperImage.pullPolicy }}

{{- if not .Values.allowAdminParty }}

          env:

            - name: COUCHDB_USER

              valueFrom:

                secretKeyRef:

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

                  key: adminUsername

            - name: COUCHDB_PASSWORD

              valueFrom:

                secretKeyRef:

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

                  key: adminPassword

{{- end }}

      terminationGracePeriodSeconds: 5

{{- if .Values.nodeSelector }}

      nodeSelector:

charts/elasticsearch-curator/values.yaml

+7 −0
Original line number Diff line number Diff line
@@ -99,3 +99,10 @@ priorityClassName: "" 


meepOrigin: core



affinity:

  nodeAffinity:

    requiredDuringSchedulingIgnoredDuringExecution:

      nodeSelectorTerms:

      - matchExpressions:

        - key: node-role.kubernetes.io/master

          operator: Exists
 
 No newline at end of file

charts/elasticsearch/values.yaml

+6 −1
Original line number Diff line number Diff line
@@ -42,7 +42,12 @@ client: 
#    example: client-svc-foo

  heapSize: "512m"

  antiAffinity: "soft"

  nodeAffinity: {}

  nodeAffinity:

    requiredDuringSchedulingIgnoredDuringExecution:

      nodeSelectorTerms:

        - matchExpressions:

          - key: node-role.kubernetes.io/master

            operator: Exists

  nodeSelector: {}

  tolerations: []

  resources:

charts/filebeat/.helmignore

0 → 100755
+21 −0
Original line number Diff line number Diff line 
# Patterns to ignore when building packages.

# This supports shell glob matching, relative path matching, and

# negation (prefixed with !). Only one pattern per line.

.DS_Store

# Common VCS dirs

.git/

.gitignore

.bzr/

.bzrignore

.hg/

.hgignore

.svn/

# Common backup files

*.swp

*.bak

*.tmp

*~

# Various IDEs

.project

.idea/

*.tmproj