Improve helm chart and docker delivery (AmadeusITGroup#75)

Author: clamoriniere1A

.travis.yml

@@ -26,10 +26,19 @@ before_install:
 script:
 - ./hack/run-test-ci.sh
 stages:
+- name: docker-push
+  if: type NOT IN (pull_request)
 - name: release
   if: tag IS present
 jobs:
   include:
+  - stage: docker-push
+    name: docker-build
+    deploy:
+    - provider: script
+      script: echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin && cd $TRAVIS_BUILD_DIR && make TAG=$TRAVIS_BRANCH push
+      on:
+        branch: master
   - stage: release
     script:
       - docker login -u "$DOCKER_USERNAME" p "$DOCKER_PASSWORD"

Makefile

@@ -19,7 +19,6 @@ PLUGIN_PATH=./kubectl-plugin
 
 # 0.0 shouldn't clobber any released builds
 TAG= latest
-#PREFIX = gcr.io/google_containers/${ARTIFACT}
 PREFIX =  workflowcontroller/${ARTIFACT}
 
 SOURCES := $(shell find $(SOURCEDIR) ! -name "*_test.go" -name '*.go')

charts/workflow-controller/templates/deployment.yaml

@@ -25,18 +25,18 @@ spec:
           args: ["--v={{ .Values.logLevel }}"]
           resources:
 {{ toYaml .Values.resources | indent 12 }}
-    {{- if .Values.nodeSelector }}
-      livenessProbe:
-        httpGet:
-          path: /live
-          port: 8086
-        initialDelaySeconds: 5
-        periodSeconds: 5
-      readinessProbe:
-        httpGet:
-          path: /ready
-          port: 8086
-        periodSeconds: 5
+          livenessProbe:
+            httpGet:
+              path: /live
+              port: 8086
+            initialDelaySeconds: 5
+            periodSeconds: 5
+          readinessProbe:
+            httpGet:
+              path: /ready
+              port: 8086
+            periodSeconds: 5
+{{- if .Values.nodeSelector }}
       nodeSelector:
 {{ toYaml .Values.nodeSelector | indent 8 }}
-    {{- end }}
+{{- end }}

charts/workflow-controller/values.yaml

@@ -6,10 +6,9 @@ logLevel: 2
 apiGroupName: workflow.k8s.io
 image:
   registry: ""
-  pullPolicy: Always
+  pullPolicy: IfNotPresent
   account: "workflowcontroller"
-  name: ""
-  tag: ""
+  tag: master
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
   # choice for the user. This also increases chances charts run on environments with little

deployment/k8s/workflow-controller-dpl.yml

@@ -18,3 +18,14 @@ spec:
         image: amadeusitgroup/workflow-controller:latest
         imagePullPolicy: Always
         args: ["--v=2"]
+        livenessProbe:
+          httpGet:
+            path: /live
+            port: 8086
+          initialDelaySeconds: 5
+          periodSeconds: 5
+        readinessProbe:
+          httpGet:
+            path: /ready
+            port: 8086
+          periodSeconds: 5

deployment/k8s/workflow-controller-rbac.yml

@@ -8,9 +8,11 @@ rules:
   resources:
   - customresourcedefinitions
   verbs: ["*"]
-- apiGroups: ["dag.example.com"]
+- apiGroups: ["workflow.k8s.io"]
   resources:
   - workflows
+  - cronworkflows
+  - daemonsetjobs
   verbs: ["*"]
 - apiGroups: ["batch"]
   resources:

docs/README.md

@@ -27,15 +27,13 @@ $ kubectl create -f .../examples/hello_workflow/workflow.yaml
 
 At this point the workflow-controller will start to handle the jobs.
 
-
-### in a kubernetes pod
-
+### Simple deployment
 
 To run `workflow-controller` in a Kubernetes pod you should run this command
 
 ```shell
-$ kubectl create -f .../deployment/k8s/workflow-controller-rbac.yaml
-$ kubectl create -f .../deployment/k8s/workflow-controller-dpl.yaml
+$ kubectl create -f .../deployment/k8s/workflow-controller-rbac.yaml -n kube-system
+$ kubectl create -f .../deployment/k8s/workflow-controller-dpl.yaml -n kube-system
 ```
 
 Then you may want to test a workflow example like this:
@@ -44,8 +42,22 @@ Then you may want to test a workflow example like this:
 $ kubectl create -f  .../examples/hello_workflow/workflow.yaml
 ```
 
-### in an openshift cluster
-TODO
+## Helm deployment
+
+You can found in the `charts` folder the `workflow-controller` the helm chart for deploying the Kubernetes `workflow-controller` controller.
+
+```shell
+$ helm install --name wf charts/workflow-controller
+NAME:   wf
+LAST DEPLOYED: Tue Jan  9 23:41:13 2018
+NAMESPACE: default
+STATUS: DEPLOYED
+
+RESOURCES:
+==> v1beta1/Deployment
+NAME                    DESIRED  CURRENT  UP-TO-DATE  AVAILABLE  AGE
+wf-workflow-controller  1        1        1           0          0s
+```
 
 
 ### Developper
@@ -56,7 +68,7 @@ This project is using [goreleaser](https://goreleaser.com/) and an additional sc
 
 For starting the delivery, you need to clone this repository, then:
 
-```bash
+```shell
 zsh hack/release.sh <version> <remove-git>
 ```
 

hack/helm-release.sh

@@ -1,12 +1,19 @@
 #!/bin/bash
 
 if [ -z "$1" ]; then
-    echo "please provide the version as parameter: ./helm-release.sh <version>\n"
+    echo "please provide the version as parameter: ./helm-release.sh <version> <chart-name>\n"
+    exit 1
+fi
+
+if [ -z "$2" ]; then
+    echo "please provide the chart name as parameter: ./helm-release.sh <version> <chart-name>\n"
     exit 1
 fi
 
 cd $(git rev-parse --show-toplevel)
-helm package --version "$1" charts/workflow-controller
-mv "helm-test-$1.tgz" docs/
+sed "s/tag: master/tag: $1/" chart/$2/values.yaml > charts/$2/values.tmp.yaml; mv charts/$2/values.tmp.yaml charts/$2/values.yaml
+helm package --version "$1" charts/$2
+mv "$2-$1.tgz" "docs/helm-$2-$1.tgz"
+git checkout -- charts/$2/values.yaml
 helm repo index docs --url https://amadeusitgroup.github.io/workflow-controller/ --merge docs/index.yaml
-git add --all docs/
+git add --all docs/

hack/release.sh

@@ -11,11 +11,10 @@ if [ -n "$2" ]; then
     GIT_REMOTE=$2
 fi
 
-zsh $GIT_ROOT/hack/helm-release.sh $1
+zsh $GIT_ROOT/hack/helm-release.sh $1 workflow-controller
 
 # Update CHANGELOG.md file
 ssed -i.bak "5i## Release $1\n" CHANGELOG.md
 
 git commit -am "release $1"
 git tag -f $1
-git push -f --tags $GIT_REMOTE master