From 014f725551ab6bedbe0a9ef6477b4744603ecd69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Fran=C3=A7on?= Date: Thu, 21 Feb 2019 14:42:22 +0100 Subject: [PATCH 1/5] fixed redis dependencies --- .gitignore | 1 + Jenkinsfile | 3 +++ charts/mulder/requirements.yaml | 4 ++++ 3 files changed, 8 insertions(+) create mode 100644 charts/mulder/requirements.yaml diff --git a/.gitignore b/.gitignore index 7ae039e..2ab4426 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /mulder +/charts/mulder/charts/ \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile index 045ea00..e4dd774 100644 --- 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/XXX/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 new file mode 100644 index 0000000..ed67a46 --- /dev/null +++ b/charts/mulder/requirements.yaml @@ -0,0 +1,4 @@ +dependencies: +- name: redis + repository: https://kubernetes-charts.storage.googleapis.com + version: 6.0.1 \ No newline at end of file From 2663610e128031f00160d240aafa6846aba8718c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Fran=C3=A7on?= Date: Thu, 21 Feb 2019 14:50:41 +0100 Subject: [PATCH 2/5] hotfix Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index e4dd774..63a8738 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -25,7 +25,7 @@ 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/XXX/mulder/charts/mulder') { + 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') { From 38c3929da07fff45f60507161f82fd7792b8aa0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Fran=C3=A7on?= Date: Thu, 21 Feb 2019 15:08:59 +0100 Subject: [PATCH 3/5] hotfix Jenkinsfile --- charts/mulder/templates/deployment.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/charts/mulder/templates/deployment.yaml b/charts/mulder/templates/deployment.yaml index a9b19a9..0a2c25a 100644 --- 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. {{ .Release.Name }} ports: - containerPort: {{ .Values.service.internalPort }} livenessProbe: From 1385534dc7db37a63b215b623a659614befa031f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Fran=C3=A7on?= Date: Thu, 21 Feb 2019 15:23:00 +0100 Subject: [PATCH 4/5] hotfix deployment --- charts/mulder/templates/deployment.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/mulder/templates/deployment.yaml b/charts/mulder/templates/deployment.yaml index 0a2c25a..f95f430 100644 --- a/charts/mulder/templates/deployment.yaml +++ b/charts/mulder/templates/deployment.yaml @@ -22,8 +22,8 @@ spec: image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }} args: - - -redis-addr - - {{ .Release.Name }}-redis-master:6379. {{ .Release.Name }} + - -redis-addr + - {{ .Release.Name }}-redis-master:6379 ports: - containerPort: {{ .Values.service.internalPort }} livenessProbe: @@ -43,4 +43,4 @@ spec: timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }} resources: {{ toYaml .Values.resources | indent 12 }} - terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }} + terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }} \ No newline at end of file From 6ebd48265ccf2f2097d6a4cddc6f9f0611f832f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Fran=C3=A7on?= Date: Thu, 21 Feb 2019 15:27:32 +0100 Subject: [PATCH 5/5] disabled pw --- charts/mulder/values.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/charts/mulder/values.yaml b/charts/mulder/values.yaml index 54a744c..fd629cb 100644 --- a/charts/mulder/values.yaml +++ b/charts/mulder/values.yaml @@ -32,3 +32,5 @@ readinessProbe: successThreshold: 1 timeoutSeconds: 1 terminationGracePeriodSeconds: 10 +redis: + usePassword: false \ No newline at end of file