dev: prepare helm charts

swingletree-oss · Nov 16, 2019 · 7f52bb8 · 7f52bb8
1 parent 94efde1
commit 7f52bb8
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 8 deletions.
diff --git a/helm/swingletree/templates/deployment-deck.yaml b/helm/swingletree/templates/deployment-deck.yaml
@@ -34,6 +34,9 @@ spec:
         - name: {{ .Chart.Name }}
           image: "{{ .Values.registry }}{{ .Values.images.deck }}"
           imagePullPolicy: {{ .Values.pullPolicy }}
+          env:
+            - name: LOG_LEVEL
+              value: {{ .Values.log.level }}
           volumeMounts:
             - name: config
               mountPath: /opt/deck/swingletree.conf.yaml

diff --git a/helm/swingletree/templates/deployment-gate.yaml b/helm/swingletree/templates/deployment-gate.yaml
@@ -35,8 +35,10 @@ spec:
           image: "{{ .Values.registry }}{{ .Values.images.gate }}"
           imagePullPolicy: {{ .Values.pullPolicy }}
           env:
-            - name: SCOTTY_URL
+            - name: SCOTTY_URL # cjeck gate scotty client
               value: "http://scotty.{{ .Release.Namespace }}:{{ .Values.swingletree.scotty.port }}"
+            - name: LOG_LEVEL
+              value: {{ .Values.log.level }}
           volumeMounts:
             - name: config
               mountPath: /opt/gate/swingletree.conf.yaml

diff --git a/helm/swingletree/templates/deployment-plugin-nebula.yaml b/helm/swingletree/templates/deployment-plugin-nebula.yaml
@@ -35,8 +35,12 @@ spec:
           image: "{{ .Values.registry }}{{ .Values.images.plugin.nebula }}"
           imagePullPolicy: {{ .Values.pullPolicy }}
           env:
+            - name: NEBULA_URLS_SCOTTY
+              value: "http://swing-scotty.{{ .Release.Namespace }}:{{ .Values.swingletree.scotty.port }}"
             - name: SCOTTY_CLIENT_URL
               value: "http://swing-scotty.{{ .Release.Namespace }}:{{ .Values.swingletree.scotty.port }}"
+            - name: LOG_LEVEL
+              value: {{ .Values.log.level }}
           volumeMounts:
             - name: config
               mountPath: /opt/plugin-nebula/swingletree.conf.yaml

diff --git a/helm/swingletree/templates/deployment-plugin-sonar.yaml b/helm/swingletree/templates/deployment-plugin-sonar.yaml
@@ -37,6 +37,10 @@ spec:
           env:
             - name: SCOTTY_CLIENT_URL
               value: "http://swing-scotty.{{ .Release.Namespace }}:{{ .Values.swingletree.scotty.port }}"
+            - name: SONAR_URLS_SCOTTY
+              value: "http://swing-scotty.{{ .Release.Namespace }}:{{ .Values.swingletree.scotty.port }}"
+            - name: LOG_LEVEL
+              value: {{ .Values.log.level }}
           volumeMounts:
             - name: config
               mountPath: /opt/plugin-sonarqube/swingletree.conf.yaml

diff --git a/helm/swingletree/templates/deployment-plugin-twistlock.yaml b/helm/swingletree/templates/deployment-plugin-twistlock.yaml
@@ -38,7 +38,7 @@ spec:
             - name: SCOTTY_CLIENT_URL
               value: "http://swing-scotty.{{ .Release.Namespace }}:{{ .Values.swingletree.scotty.port }}"
             - name: LOG_LEVEL
-              value: debug
+              value: {{ .Values.log.level }}
             - name: TWISTLOCK_URLS_SCOTTY
               value: "http://swing-scotty.{{ .Release.Namespace }}:{{ .Values.swingletree.scotty.port }}"
           volumeMounts:

diff --git a/helm/swingletree/templates/deployment-plugin-zap.yaml b/helm/swingletree/templates/deployment-plugin-zap.yaml
@@ -35,8 +35,12 @@ spec:
           image: "{{ .Values.registry }}{{ .Values.images.plugin.zap }}"
           imagePullPolicy: {{ .Values.pullPolicy }}
           env:
+            - name: ZAP_URLS_SCOTTY
+              value: "http://swing-scotty.{{ .Release.Namespace }}:{{ .Values.swingletree.scotty.port }}"
             - name: SCOTTY_CLIENT_URL
               value: "http://swing-scotty.{{ .Release.Namespace }}:{{ .Values.swingletree.scotty.port }}"
+            - name: LOG_LEVEL
+              value: {{ .Values.log.level }}
           volumeMounts:
             - name: config
               mountPath: /opt/plugin-zap/swingletree.conf.yaml

diff --git a/helm/swingletree/templates/deployment-scotty.yaml b/helm/swingletree/templates/deployment-scotty.yaml
@@ -37,7 +37,7 @@ spec:
           env:
             {{ if .Values.redis.enabled }}
             - name: SCOTTY_STORAGE_HOST
-              value: "swingletree-cache.{{ .Release.Namespace }}"
+              value: "{{ .Values.redis.fullnameOverride }}-master.{{ .Release.Namespace }}"
             {{ end }}
             {{ if .Values.redis.password }}
             - name: SCOTTY_STORAGE_PASSWORD
@@ -46,6 +46,8 @@ spec:
                   name: {{ .Release.Name }}-config
                   key: redis-credential
             {{ end }}
+            - name: LOG_LEVEL
+              value: {{ .Values.log.level }}
           volumeMounts:
             - name: config
               mountPath: /opt/scotty/swingletree.conf.yaml

diff --git a/helm/swingletree/values.yaml b/helm/swingletree/values.yaml
@@ -5,14 +5,14 @@
 replicaCount: 1
 
 images:
-  deck: deck/deck:1.0.3
+  deck: deck/deck:1.1.0
   gate: gate/gate:1.0.2
-  scotty: scotty/scotty:1.0.0
+  scotty: scotty/scotty:1.0.2
   plugin:
-    nebula: plugin-nebula/plugin-nebula:1.0.2
+    nebula: plugin-nebula/plugin-nebula:1.0.3
     sonar: plugin-sonarqube/plugin-sonarqube:1.0.2
     twistlock: plugin-twistlock/plugin-twistlock:1.0.2
-    zap: plugin-zap/plugin-zap:1.0.2
+    zap: plugin-zap/plugin-zap:1.0.3
 pullPolicy: IfNotPresent
 registry: docker.pkg.github.com/swingletree-oss/
 imagePullSecret: regcred
@@ -24,10 +24,14 @@ service:
 # github app key file content
 github_app_key: # set using `--set-file github_app_key=/path/to/file` when running helm
 
+log:
+  level: debug
+
 swingletree: # swingletree configuration
 
   deck: # deck configuration
     port: 3000
+    path: "/deck"
     elastic:
       enabled: false
       node: http://localhost:9200
@@ -101,8 +105,10 @@ swingletree: # swingletree configuration
 
 redis: # stable/redis
   enabled: true
+  cluster:
+    enabled: false
   fullnameOverride: swingletree-cache
-  password: # set your database password with this value
+  password: sjsfgkaseciubjh2 # set your database password with this value
 
 ingress:
   enabled: true