diff options
author | Romulus Tsai 蔡仲明 <urakagi@gmail.com> | 2020-05-08 10:13:11 +0800 |
---|---|---|
committer | Romulus Tsai 蔡仲明 <urakagi@gmail.com> | 2020-05-08 10:13:11 +0800 |
commit | c3458855bdb52c976ee6689ad5a0d4e92e96f2e3 (patch) | |
tree | d9dbbcc3087b5bfc520710b5f5624a3f4e2b78e6 /helm | |
parent | 444848876759173ad80203129250d2f0311f30fc (diff) | |
parent | cfcc73724fcd394150d1b815d0a7a4c466e216b5 (diff) | |
download | wekan-c3458855bdb52c976ee6689ad5a0d4e92e96f2e3.tar.gz wekan-c3458855bdb52c976ee6689ad5a0d4e92e96f2e3.tar.bz2 wekan-c3458855bdb52c976ee6689ad5a0d4e92e96f2e3.zip |
Merge branch 'master' into lib-change
Diffstat (limited to 'helm')
-rw-r--r-- | helm/wekan/README.md | 7 | ||||
-rw-r--r-- | helm/wekan/templates/deployment.yaml | 6 | ||||
-rw-r--r-- | helm/wekan/templates/route.yaml | 23 | ||||
-rw-r--r-- | helm/wekan/templates/serviceaccount.yaml | 4 | ||||
-rw-r--r-- | helm/wekan/values.yaml | 10 |
5 files changed, 48 insertions, 2 deletions
diff --git a/helm/wekan/README.md b/helm/wekan/README.md index d3af930c..38cb5fed 100644 --- a/helm/wekan/README.md +++ b/helm/wekan/README.md @@ -56,3 +56,10 @@ mongodb-replicaset: This section controls the scale of the MongoDB redundant Replica Set. **replicas:** This is the number of MongoDB instances to include in the set. You can set this to 1 for a single server - this will still allow you to scale-up later with a helm upgrade. + +### Install OCP route +If you use this chart to deploy Wekan on an OCP cluster, you can create route instead of ingress with following command: + +``` bash +$ helm template --set route.enabled=true,ingress.enabled=false values.yaml . | oc apply -f- +``` diff --git a/helm/wekan/templates/deployment.yaml b/helm/wekan/templates/deployment.yaml index e5bf2018..68dbf75c 100644 --- a/helm/wekan/templates/deployment.yaml +++ b/helm/wekan/templates/deployment.yaml @@ -37,6 +37,12 @@ spec: value: {{ .Values.root_url | default "https://wekan.local" | quote }} - name: MONGO_URL value: "{{ template "mongodb-replicaset.url" . }}" + {{- range $key := .Values.env }} + {{- if .value }} + - name: {{ .name }} + value: {{ .value | quote }} + {{- end }} + {{- end }} livenessProbe: httpGet: path: / diff --git a/helm/wekan/templates/route.yaml b/helm/wekan/templates/route.yaml new file mode 100644 index 00000000..9a55591d --- /dev/null +++ b/helm/wekan/templates/route.yaml @@ -0,0 +1,23 @@ +{{- if .Values.route.enabled -}} +{{- $fullName := include "wekan.fullname" . -}} +apiVersion: route.openshift.io/v1 +kind: Route +metadata: + annotations: + haproxy.router.openshift.io/timeout: 4m + openshift.io/host.generated: "true" + labels: + app: {{ template "wekan.name" . }} + service: {{ template "wekan.name" . }} + name: {{ template "wekan.name" . }} +spec: + port: + targetPort: http + tls: + termination: edge + to: + kind: Service + name: {{ template "wekan.name" . }} + weight: 100 + wildcardPolicy: None + {{- end }}
\ No newline at end of file diff --git a/helm/wekan/templates/serviceaccount.yaml b/helm/wekan/templates/serviceaccount.yaml index 58696cb6..543e58d4 100644 --- a/helm/wekan/templates/serviceaccount.yaml +++ b/helm/wekan/templates/serviceaccount.yaml @@ -2,6 +2,10 @@ apiVersion: v1 kind: ServiceAccount metadata: +{{- if .Values.serviceAccounts.annotations }} + annotations: +{{ .Values.serviceAccounts.annotations | indent 4}} +{{- end }} labels: app: {{ template "wekan.name" . }} chart: {{ template "wekan.chart" . }} diff --git a/helm/wekan/values.yaml b/helm/wekan/values.yaml index adc2c855..78136af3 100644 --- a/helm/wekan/values.yaml +++ b/helm/wekan/values.yaml @@ -8,6 +8,7 @@ serviceAccounts: create: true name: "" + annotations: "" ## Wekan image configuration ## @@ -29,7 +30,9 @@ credentials: ## Specify additional environmental variables for the Deployment ## -env: {} +env: + - name: "" + value: "" service: type: NodePort @@ -59,7 +62,10 @@ ingress: # hosts: # - wekan-example.local -resources: +route: + enabled: false + +resources: requests: memory: 128Mi cpu: 300m |