Merge pull request #1 from clementFrancon/redis-fix

fixed redis dependencies
clementFrancon · Feb 21, 2019 · de0d4ba · de0d4ba
2 parents 3725a84 + 6ebd482
commit de0d4ba
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 /mulder
+/charts/mulder/charts/
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -25,6 +25,9 @@ pipeline {
             sh "export VERSION=$PREVIEW_VERSION && skaffold build -f skaffold.yaml"
             sh "jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:$PREVIEW_VERSION"
           }
+          dir('/home/jenkins/go/src/github.com/clementfrancon/mulder/charts/mulder') {
+            sh "jx step helm build"
+          }
           dir('/home/jenkins/go/src/github.com/clementfrancon/mulder/charts/preview') {
             sh "make preview"
             sh "jx preview --app $APP_NAME --dir ../.."

diff --git a/charts/mulder/requirements.yaml b/charts/mulder/requirements.yaml
@@ -0,0 +1,4 @@
+dependencies:
+- name: redis
+  repository: https://kubernetes-charts.storage.googleapis.com
+  version: 6.0.1
diff --git a/charts/mulder/templates/deployment.yaml b/charts/mulder/templates/deployment.yaml
@@ -21,6 +21,9 @@ spec:
       - name: {{ .Chart.Name }}
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
+        args:
+        - -redis-addr
+        - {{ .Release.Name }}-redis-master:6379
         ports:
         - containerPort: {{ .Values.service.internalPort }}
         livenessProbe:
@@ -40,4 +43,4 @@ spec:
           timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
         resources:
 {{ toYaml .Values.resources | indent 12 }}
-      terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
+      terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
diff --git a/charts/mulder/values.yaml b/charts/mulder/values.yaml
@@ -32,3 +32,5 @@ readinessProbe:
   successThreshold: 1
   timeoutSeconds: 1
 terminationGracePeriodSeconds: 10
+redis:
+  usePassword: false