Unverified Commit 1a739212 authored by Kevin Di Lallo's avatar Kevin Di Lallo Committed by GitHub
Browse files

Merge pull request #100 from roymx/user-config 

User specific configuration
parents 1511cb1f 419e677f

.meepctl-repocfg.yaml

+43 −0
Original line number Diff line number Diff line
@@ -46,6 +46,8 @@ repo: 
        bin: bin/meep-mon-engine

        # location of deployment chart

        chart: charts/meep-mon-engine

        # user supplied value file located @ .meep/user/values (use below file name)

        chart-user-values: meep-mon-engine.yaml

        # extra build flags

        build-flags:

          - -mod=vendor
@@ -94,6 +96,8 @@ repo: 
        bin: bin/meep-platform-ctrl

        # location of deployment chart

        chart: charts/meep-platform-ctrl

        # user supplied value file located @ .meep/user/values (use below file name)

        chart-user-values: meep-platform-ctrl.yaml

        # enable meepctl build

        build: true

        # enable meepctl dockerize
@@ -119,6 +123,8 @@ repo: 
        bin: bin/meep-virt-engine

        # location of deployment chart

        chart: charts/meep-virt-engine

        # user supplied value file located @ .meep/user/values (use below file name)

        chart-user-values: meep-virt-engine.yaml

        # enable meepctl build

        build: true

        # enable meepctl dockerize
@@ -158,6 +164,8 @@ repo: 
        bin: bin/meep-webhook

        # location of deployment chart

        chart: charts/meep-webhook

        # user supplied value file located @ .meep/user/values (use below file name)

        chart-user-values: meep-webhook.yaml

        # extra build flags

        build-flags:

          - -mod=vendor
@@ -252,6 +260,8 @@ repo: 
        bin: bin/meep-gis-engine

        # location of deployment chart

        chart: charts/meep-gis-engine

        # user supplied value file located @ .meep/user/values (use below file name)

        chart-user-values: meep-gis-engine.yaml

        # enable meepctl build

        build: true

        # enable meepctl dockerize
@@ -271,6 +281,8 @@ repo: 
        bin: bin/meep-loc-serv

        # location of deployment chart

        chart: charts/meep-loc-serv

        # user supplied value file located @ .meep/user/values (use below file name)

        chart-user-values: meep-loc-serv.yaml

        # extra build flags

        build-flags:

          - -mod=vendor
@@ -293,6 +305,8 @@ repo: 
        bin: bin/meep-metrics-engine

        # location of deployment chart

        chart: charts/meep-metrics-engine

        # user supplied value file located @ .meep/user/values (use below file name)

        chart-user-values: meep-metrics-engine.yaml

        # extra build flags

        build-flags:

          - -mod=vendor
@@ -315,6 +329,8 @@ repo: 
        bin: bin/meep-mg-manager

        # location of deployment chart

        chart: charts/meep-mg-manager

        # user supplied value file located @ .meep/user/values (use below file name)

        chart-user-values: meep-mg-manager.yaml

        # enable meepctl build

        build: true

        # enable meepctl dockerize
@@ -334,6 +350,8 @@ repo: 
        bin: bin/meep-rnis

        # location of deployment chart

        chart: charts/meep-rnis

        # user supplied value file located @ .meep/user/values (use below file name)

        chart-user-values: meep-rnis.yaml

        # extra build flags

        build-flags:

          - -mod=vendor
@@ -356,6 +374,8 @@ repo: 
        bin: bin/meep-sandbox-ctrl

        # location of deployment chart

        chart: charts/meep-sandbox-ctrl

        # user supplied value file located @ .meep/user/values (use below file name)

        chart-user-values: meep-sandbox-ctrl.yaml

        # enable meepctl build

        build: true

        # enable meepctl dockerize
@@ -378,6 +398,8 @@ repo: 
        bin: bin/meep-tc-engine

        # location of deployment chart

        chart: charts/meep-tc-engine

        # user supplied value file located @ .meep/user/values (use below file name)

        chart-user-values: meep-tc-engine.yaml

        # enable meepctl build

        build: true

        # enable meepctl dockerize
@@ -417,6 +439,8 @@ repo: 
      deploy: true

      # location of deployment chart

      chart: charts/couchdb

      # user supplied value file located @ .meep/user/values (use below file name)

      chart-user-values: meep-couchdb.yaml

    meep-docker-registry:

      # enable meepctl build -> deps are never built

      build: false
@@ -426,6 +450,8 @@ repo: 
      deploy: true

      # location of deployment chart

      chart: charts/docker-registry

      # user supplied value file located @ .meep/user/values (use below file name)

      chart-user-values: meep-docker-registry.yaml

    meep-grafana:

      # enable meepctl build -> deps are never built

      build: false
@@ -435,6 +461,8 @@ repo: 
      deploy: true

      # location of deployment chart

      chart: charts/grafana

      # user supplied value file located @ .meep/user/values (use below file name)

      chart-user-values: meep-grafana.yaml

    meep-influxdb:

      # enable meepctl build -> deps are never built

      build: false
@@ -444,6 +472,8 @@ repo: 
      deploy: true

      # location of deployment chart

      chart: charts/influxdb

      # user supplied value file located @ .meep/user/values (use below file name)

      chart-user-values: meep-influxdb.yaml

    meep-kube-state-metrics:

      # enable meepctl build -> deps are never built

      build: false
@@ -453,6 +483,8 @@ repo: 
      deploy: true

      # location of deployment chart

      chart: charts/kube-state-metrics

      # user supplied value file located @ .meep/user/values (use below file name)

      chart-user-values: meep-kube-state-metrics.yaml

    meep-ingress:

      # enable meepctl build -> deps are never built

      build: false
@@ -462,6 +494,8 @@ repo: 
      deploy: true

      # location of deployment chart

      chart: charts/nginx-ingress

      # user supplied value file located @ .meep/user/values (use below file name)

      chart-user-values: meep-ingress.yaml

    meep-alt-ingress:

      # enable meepctl build -> deps are never built

      build: false
@@ -471,7 +505,10 @@ repo: 
      deploy: true

      # location of deployment chart

      chart: charts/nginx-ingress

      # uses different default values

      values: charts/nginx-ingress/alt-values.yaml

      # user supplied value file located @ .meep/user/values (use below file name)

      chart-user-values: meep-alt-ingress.yaml

    meep-redis:

      # enable meepctl build -> deps are never built

      build: false
@@ -481,6 +518,8 @@ repo: 
      deploy: true

      # location of deployment chart

      chart: charts/redis

      # user supplied value file located @ .meep/user/values (use below file name)

      chart-user-values: meep-redis.yaml

    meep-open-map-tiles:

      # enable meepctl build -> deps are never built

      build: false
@@ -490,6 +529,8 @@ repo: 
      deploy: true

      # location of deployment chart

      chart: charts/open-map-tiles

      # user supplied value file located @ .meep/user/values (use below file name)

      chart-user-values: meep-open-map-tiles.yaml

    meep-postgis:

      # enable meepctl build -> deps are never built

      build: false
@@ -499,6 +540,8 @@ repo: 
      deploy: true

      # location of deployment chart

      chart: charts/postgis

      # user supplied value file located @ .meep/user/values (use below file name)

      chart-user-values: meep-postgis.yaml



  #------------------------------

  #  Packages

charts/couchdb/values.yaml

+4 −3
Original line number Diff line number Diff line
@@ -81,9 +81,10 @@ podManagementPolicy: Parallel 
## to a second Service that governs how clients connect to the CouchDB cluster.

service:

  enabled: true

  type: NodePort

  type: ClusterIP

  #type: NodePort

  externalPort: 5984

  nodePort: 30984

  #nodePort: 30984



## An Ingress resource can provide name-based virtual hosting and TLS

## termination among other things for CouchDB deployments which are accessed

charts/meep-platform-ctrl/templates/service.yaml

+1 −1
Original line number Diff line number Diff line
@@ -17,6 +17,6 @@ spec: 
  ports:

    - port: {{ .Values.service.port }}

      targetPort: {{ .Values.deployment.port }}

      {{- if .Values.nodePort }}

      {{- if .Values.service.nodePort }}

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

      {{- end }}

charts/meep-virt-engine/templates/deployment.yaml

+10 −3
Original line number Diff line number Diff line
@@ -23,13 +23,16 @@ spec: 
    spec:

      serviceAccountName: {{ .Values.serviceAccount }}

      volumes:

        - name: data

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

        - name: data

          persistentVolumeClaim:

            claimName: {{ if .Values.persistence.existingClaim }}{{ .Values.persistence.existingClaim }}{{- else }}{{ template "meep-virt-engine.fullname" . }}{{- end }}

        {{- else }}

          emptyDir: {}

        {{- end -}}

        {{- if .Values.user.values.enabled}}

        - name: user-values-storage

          persistentVolumeClaim:

            claimName: meep-virt-engine-user-values-pvc

        {{- end}}

        {{- if .Values.codecov.enabled}}

        - name: codecov-storage

          persistentVolumeClaim:
@@ -54,6 +57,10 @@ spec: 
          volumeMounts:

            - name: data

              mountPath: /data/

            {{- if .Values.user.values.enabled}}

            - name: user-values-storage

              mountPath: {{ .Values.user.values.mountpath }}

            {{- end}}

            {{- if .Values.codecov.enabled}}

            - name: codecov-storage

              mountPath: /codecov

charts/meep-virt-engine/templates/user-values-pv.yaml

0 → 100644
+34 −0
Original line number Diff line number Diff line 
{{- if .Values.user.values.enabled}}

kind: PersistentVolume

apiVersion: v1

metadata:

  name: meep-virt-engine-user-values-pv

spec:

  storageClassName: meep-virt-engine-user-values-sc

  capacity:

    storage: 100Mi

  accessModes:

    - ReadWriteOnce

  persistentVolumeReclaimPolicy: Retain

  hostPath:

    path: {{ .Values.user.values.location }}

---

kind: StorageClass

apiVersion: storage.k8s.io/v1

metadata:

  name: meep-virt-engine-user-values-sc

provisioner: kubernetes.io/no-provisioner

volumeBindingMode: WaitForFirstConsumer

---

kind: PersistentVolumeClaim

apiVersion: v1

metadata:

  name: meep-virt-engine-user-values-pvc

spec:

  storageClassName: meep-virt-engine-user-values-sc

  accessModes:

    - ReadWriteOnce

  resources:

    requests:

      storage: 100Mi

{{- end}}