Unverified Commit 9f4befcc authored by Kevin Di Lallo's avatar Kevin Di Lallo Committed by GitHub
Browse files

Merge pull request #11 from idcc-dev/kd_na456_webhook 

meep-webhook support + user chart support fixes
parents 6267c34c 50462467

.gitignore

+3 −2
Original line number Diff line number Diff line
@@ -7,10 +7,11 @@ vendor/ 
dist/

bin/meep-ctrl-engine/meep-ctrl-engine

bin/meep-frontend

bin/meep-initializer/meep-initializer

bin/meep-webhook/meep-webhook

bin/meep-mg-manager/meep-mg-manager

bin/meep-mon-engine/meep-mon-engine

bin/meep-tc-engine/meep-tc-engine

bin/meep-tc-sidecar/meep-tc-sidecar

bin/meep-virt-engine/meep-virt-engine

bin/meepctl

examples/demo1/bin

.meepctl-repocfg.yaml

+11 −15
Original line number Diff line number Diff line
@@ -23,14 +23,14 @@ repo: 
      lint: false

      local-deps:

        meep-ctrl-engine-api: js-packages/meep-ctrl-engine-client

    meep-initializer:

      src: go-apps/meep-initializer

      bin: bin/meep-initializer

      chart: charts/meep-initializer

    meep-webhook:

      src: go-apps/meep-webhook

      bin: bin/meep-webhook

      chart: charts/meep-webhook

      build-flags:

        - -mod=vendor

      codecov: false

      lint: false

      lint: true

    meep-mg-manager:

      src: go-apps/meep-mg-manager

      bin: bin/meep-mg-manager
@@ -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

bin/meep-initializer/Dockerfile→bin/meep-webhook/Dockerfile

+3 −3
Original line number Diff line number Diff line
@@ -5,6 +5,6 @@ 
# The information provided herein is the proprietary and confidential

# information of InterDigital Communications, Inc.



FROM debian

ADD meep-initializer /meep-initializer

ENTRYPOINT /meep-initializer
 
FROM debian:9.6-slim

ADD meep-webhook /meep-webhook

ENTRYPOINT /meep-webhook

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