[stable/drone]Add drone rpc host (#14939)

* var DRONE_RPC_HOST

Signed-off-by: nicolas kowenski <zakkg3@gmail.com>

* chart ver 2.0.4

Signed-off-by: nicolas kowenski <zakkg3@gmail.com>

* add ingress.path documentation

Signed-off-by: nicolas kowenski <zakkg3@gmail.com>

* added istio to default path mapping, added ingress.path to override

Signed-off-by: nicolas kowenski <zakkg3@gmail.com>
This commit is contained in:
Nicolas Kowenski
2019-06-21 03:28:36 -07:00
committed by Kubernetes Prow Robot
parent 65a71f9ef9
commit 0790da783e
4 changed files with 10 additions and 5 deletions
+1 -1
View File
@@ -2,7 +2,7 @@ apiVersion: v1
name: drone
home: https://drone.io/
icon: https://drone.io/apple-touch-icon.png
version: 2.0.3
version: 2.0.4
appVersion: 1.1.0
description: Drone is a Continuous Delivery system built on container technology
keywords:
+1
View File
@@ -71,6 +71,7 @@ The following table lists the configurable parameters of the drone charts and th
| `ingress.annotations` | Ingress annotations | `{}` |
| `ingress.hosts` | Ingress accepted hostnames | `nil` |
| `ingress.tls` | Ingress TLS configuration | `[]` |
| `ingress.path` | Ingress path mapping | `` |
| `sourceControl.provider` | name of source control provider [github,gitlab,gitea,gogs,bitbucketCloud,bitbucketServer] | `` |
| `sourceControl.secret` | name of secret containing source control keys and passwords | `` |
| `sourceControl.github` | values to configure github | see values.yaml |
@@ -67,6 +67,8 @@ spec:
{{- else }}
value: "{{ template "drone.fullname" . }}"
{{- end }}
- name: DRONE_RPC_HOST
value: {{ template "drone.fullname" . }}.{{ .Release.Namespace }}
- name: DRONE_SERVER_PROTO
value: {{ .Values.server.protocol }}
{{- if .Values.server.adminUser }}
+6 -4
View File
@@ -20,13 +20,15 @@ spec:
- host: {{ . }}
http:
paths:
{{- if index $.Values.ingress "annotations" }}
{{- if eq (index $.Values.ingress.annotations "kubernetes.io/ingress.class" | default "") "gce" "alb" }}
{{- if $.Values.ingress.path }}
- path: {{ $.Values.ingress.path }}
{{- else if index $.Values.ingress "annotations" }}
{{- if eq (index $.Values.ingress.annotations "kubernetes.io/ingress.class" | default "") "gce" "alb" "istio" }}
- path: /*
{{- else }}{{/* Has annotations but ingress class is not "gce" nor "alb" */}}
{{- else }}{{/* Has annotations but ingress class is not "gce" nor "alb" nor "istio" */}}
- path: /
{{- end }}
{{- else}}{{/* Has no annotations */}}
{{- else }}{{/* Has no annotations */}}
- path: /
{{- end }}
backend: