Commit 11d08c83 authored by Kevin Di Lallo's avatar Kevin Di Lallo
Browse files

Merge branch 'release-1.4.0'

parents 068ed0f7 379f51b6

.meepctl-repocfg.yaml

+105 −51
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
# See the License for the specific language governing permissions and

# limitations under the License.



version: 1.3.0

version: 1.4.0

repo:

  name: AdvantEDGE

  core:
@@ -21,17 +21,8 @@ repo: 
      cluster-role-binding: charts/meep-user/meep-user-clusterrolebinding.yaml

      codecov: false

      lint: false

    meep-ctrl-engine:

      src: go-apps/meep-ctrl-engine

      bin: bin/meep-ctrl-engine

      chart: charts/meep-ctrl-engine

      codecov: true

      lint: true

      nodeport: 30000

      api: go-apps/meep-ctrl-engine/api/swagger.yaml

      docker-data:

        api: bin/meep-swagger-ui

        static: bin/meep-frontend



    # CORE APPS (JS)

    meep-frontend:

      src: js-apps/meep-frontend

      bin: bin/meep-frontend
@@ -47,34 +38,24 @@ repo: 
      api-bundle:

        - meep-ctrl-engine

        - meep-metrics-engine

        - meep-metrics-engine-notification-client

        - meep-mg-manager

        - meep-mg-app-notification

        - meep-mg-app-client

        - meep-loc-serv

        - meep-loc-serv-notification

    meep-webhook:

      src: go-apps/meep-webhook

      bin: bin/meep-webhook

      chart: charts/meep-webhook

      build-flags:

        - -mod=vendor

      codecov: false

      lint: true

    meep-mg-manager:

      src: go-apps/meep-mg-manager

      bin: bin/meep-mg-manager

      chart: charts/meep-mg-manager

      codecov: true

      lint: true

      nodeport: 30005

      api: go-apps/meep-mg-manager/api/swagger.yaml

    meep-mon-engine:

      src: go-apps/meep-mon-engine

      bin: bin/meep-mon-engine

      chart: charts/meep-mon-engine

      build-flags:

        - -mod=vendor

        - meep-loc-serv-notification-client



    # CORE APPS (GO)

    meep-ctrl-engine:

      src: go-apps/meep-ctrl-engine

      bin: bin/meep-ctrl-engine

      chart: charts/meep-ctrl-engine

      codecov: true

      lint: true

      nodeport: 30000

      api: go-apps/meep-ctrl-engine/api/swagger.yaml

      docker-data:

        api: bin/meep-swagger-ui

        static: bin/meep-frontend

    meep-loc-serv:

      src: go-apps/meep-loc-serv

      bin: bin/meep-loc-serv
@@ -94,7 +75,23 @@ repo: 
      codecov: true

      lint: true

      nodeport: 30008

      api: go-apps/meep-metrics-engine/api/swagger.yaml

      api: go-apps/meep-metrics-engine/api/v2/swagger.yaml

    meep-mg-manager:

      src: go-apps/meep-mg-manager

      bin: bin/meep-mg-manager

      chart: charts/meep-mg-manager

      codecov: true

      lint: true

      nodeport: 30005

      api: go-apps/meep-mg-manager/api/swagger.yaml

    meep-mon-engine:

      src: go-apps/meep-mon-engine

      bin: bin/meep-mon-engine

      chart: charts/meep-mon-engine

      build-flags:

        - -mod=vendor

      codecov: true

      lint: true

    meep-tc-engine:

      src: go-apps/meep-tc-engine

      bin: bin/meep-tc-engine
@@ -113,29 +110,86 @@ repo: 
      template: charts/meep-virt-engine/virt-templates

      codecov: true

      lint: true

    meep-loc-serv-notification:

    meep-webhook:

      src: go-apps/meep-webhook

      bin: bin/meep-webhook

      chart: charts/meep-webhook

      build-flags:

        - -mod=vendor

      codecov: false

      lint: true



    # # CORE PACKAGES (JS)

    # meep-ctrl-engine-client:

    #   src: js-packages/meep-ctrl-engine-client

    #   lint: false

    # meep-metrics-engine-client:

    #   src: js-packages/meep-metrics-engine-client

    #   lint: false



    # CORE PACKAGES (GO)

    meep-couch:

      src: go-packages/meep-couch

      lint: true

    meep-ctrl-engine-client:

      src: go-packages/meep-ctrl-engine-client

      lint: false

    meep-ctrl-engine-model:

      src: go-packages/meep-ctrl-engine-model

      lint: true

    meep-loc-serv-client:

      src: go-packages/meep-loc-serv-client

      lint: false

    meep-loc-serv-notification-client:

      src: go-packages/meep-loc-serv-notification-client

      lint: false

      api: go-packages/meep-loc-serv-notification-client/api/swagger.yaml

    meep-mg-app-notification:

    meep-logger:

      src: go-packages/meep-logger

      lint: true

    meep-metric-store:

      src: go-packages/meep-metric-store

      lint: true

    meep-metrics-engine-notification-client:

      src: go-packages/meep-metrics-engine-notification-client

      lint: false

      api: go-packages/meep-metrics-engine-notification-client/api/swagger.yaml

    meep-mg-app-client:

      src: go-packages/meep-mg-app-client

      lint: false

      api: go-packages/meep-mg-app-client/api/swagger.yaml

    meep-mg-manager-client:

      src: go-packages/meep-mg-manager-client

      lint: false

    meep-mg-manager-model:

      src: go-packages/meep-mg-manager-model

      lint: true

    meep-model:

      src: go-packages/meep-model

      lint: true

    meep-net-char-mgr:

      src: go-packages/meep-net-char-mgr

      lint: true

    meep-redis:

      src: go-packages/meep-redis

      lint: true

    meep-replay-manager:

      src: go-packages/meep-replay-manager

      lint: true

    meep-watchdog:

      src: go-packages/meep-watchdog

      lint: true

  dep:

    docker-registry:

      chart: charts/docker-registry

    elastic:

      es:

        chart: charts/elasticsearch

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

      es-curator:

        chart: charts/elasticsearch-curator

      kibana:

        chart: charts/kibana

      filebeat:

        chart: charts/filebeat

      metricbeat:

        chart: charts/metricbeat

    couchdb:

      chart: charts/couchdb

    influxdb:

      chart: charts/influxdb

    redis:

      chart: charts/redis

    k8s:

      kube-state-metrics:

        chart: charts/kube-state-metrics

    grafana:

      chart: charts/grafana

charts/couchdb/templates/statefulset.yaml

+0 −14
Original line number Diff line number Diff line
@@ -63,20 +63,6 @@ spec: 
{{- end }}

            - name: ERL_FLAGS

              value: "{{ range $k, $v := .Values.erlangFlags }} -{{ $k }} {{ $v }} {{ end }}"

          livenessProbe:

            httpGet:

              path: /

              port: 5984

            initialDelaySeconds: 10

            timeoutSeconds: 5

            failureThreshold: 10

          readinessProbe:

            httpGet:

              path: /_up

              port: 5984

            initialDelaySeconds: 10

            timeoutSeconds: 5

            failureThreshold: 10

          resources:

{{ toYaml .Values.resources | indent 12 }}

          volumeMounts:

charts/elasticsearch-curator/Chart.yaml

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

appVersion: "5.5.4"

description: A Helm chart for Elasticsearch Curator

name: elasticsearch-curator

version: 1.0.1

home: https://github.com/elastic/curator

keywords:

- curator

- elasticsearch

- elasticsearch-curator

sources:

- https://github.com/kubernetes/charts/elasticsearch-curator

- https://github.com/pires/docker-elasticsearch-curator

maintainers:

  - name: tmestdagh

    email: mestdagh.tom@gmail.com

  - name: gianrubio

    email: gianrubio@gmail.com

charts/elasticsearch-curator/OWNERS

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
approvers:

  - tmestdagh

  - gianrubio

reviewers:

  - tmestdagh

  - gianrubio

charts/elasticsearch-curator/README.md

deleted100644 → 0
+0 −52
Original line number Diff line number Diff line 
# Elasticsearch Curator Helm Chart



This directory contains a Kubernetes chart to deploy the [Elasticsearch Curator](https://github.com/elastic/curator).



## Prerequisites Details



* Elasticsearch



* The `elasticsearch-curator` cron job requires [K8s CronJob](https://kubernetes.io/docs/concepts/workloads/controllers/cron-jobs/) support:

    > You need a working Kubernetes cluster at version >= 1.8 (for CronJob). For previous versions of cluster (< 1.8) you need to explicitly enable `batch/v2alpha1` API by passing `--runtime-config=batch/v2alpha1=true` to the API server ([see Turn on or off an API version for your cluster for more](https://kubernetes.io/docs/admin/cluster-management/#turn-on-or-off-an-api-version-for-your-cluster)).



## Chart Details



This chart will do the following:



* Create a CronJob which runs the Curator



## Installing the Chart



To install the chart, use the following:



```console

$ helm install stable/elasticsearch-curator

```



## Configuration



The following table lists the configurable parameters of the docker-registry chart and

their default values.



|          Parameter                   |                      Description                      |                   Default                    |

| :----------------------------------- | :---------------------------------------------------- | :------------------------------------------- |

| `image.pullPolicy`                   | Container pull policy                                 | `IfNotPresent`                               |

| `image.repository`                   | Container image to use                                | `quay.io/pires/docker-elasticsearch-curator` |

| `image.tag`                          | Container image tag to deploy                         | `5.5.4`                                      |

| `cronjob.schedule`                   | Schedule for the CronJob                              | `0 1 * * *`                                  |

| `cronjob.annotations`                | Annotations to add to the cronjob                     | {}                                           |

| `cronjob.concurrencyPolicy`          | `Allow|Forbid|Replace` concurrent jobs                | `nil`                                        |

| `cronjob.failedJobsHistoryLimit`     | Specify the number of failed Jobs to keep             | `nil`                                        |

| `cronjob.successfulJobsHistoryLimit` | Specify the number of completed Jobs to keep          | `nil`                                        |

| `pod.annotations`                    | Annotations to add to the pod                         | {}                                           |

| `config.elasticsearch.hosts`         | Array of Elasticsearch hosts to curate                | - CHANGEME.host                              |

| `config.elasticsearch.port`          | Elasticsearch port to connect too                     | 9200                                         |

| `configMaps.action_file_yml`         | Contents of the Curator action_file.yml               | See values.yaml                              |

| `configMaps.config_yml`              | Contents of the Curator config.yml (overrides config) | See values.yaml                              |

| `resources`                          | Resource requests and limits                          | {}                                           |

| `priorityClassName`                  | priorityClassName                                     | `nil`                                        |

| `extraVolumeMounts`                  | Mount extra volume(s),                                |                                              |

| `extraVolumes`                       | Extra volumes                                         |                                              |



Specify each parameter using the `--set key=value[,key=value]` argument to

`helm install`.