diff --git a/datahub-kubernetes/datahub/Chart.yaml b/datahub-kubernetes/datahub/Chart.yaml index fc80879182..7afac46ee7 100644 --- a/datahub-kubernetes/datahub/Chart.yaml +++ b/datahub-kubernetes/datahub/Chart.yaml @@ -4,13 +4,13 @@ description: A Helm chart for LinkedIn DataHub type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 0.2.3 +version: 0.2.4 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. appVersion: 0.8.5 #0.3.1 dependencies: - name: datahub-gms - version: 0.2.1 + version: 0.2.2 repository: file://./charts/datahub-gms condition: datahub-gms.enabled - name: datahub-frontend diff --git a/datahub-kubernetes/datahub/charts/datahub-gms/Chart.yaml b/datahub-kubernetes/datahub/charts/datahub-gms/Chart.yaml index a6cabb2d57..640adb09f8 100644 --- a/datahub-kubernetes/datahub/charts/datahub-gms/Chart.yaml +++ b/datahub-kubernetes/datahub/charts/datahub-gms/Chart.yaml @@ -14,7 +14,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 0.2.1 +version: 0.2.2 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. diff --git a/datahub-kubernetes/datahub/charts/datahub-gms/templates/ingress.yaml b/datahub-kubernetes/datahub/charts/datahub-gms/templates/ingress.yaml new file mode 100644 index 0000000000..b7547f09ff --- /dev/null +++ b/datahub-kubernetes/datahub/charts/datahub-gms/templates/ingress.yaml @@ -0,0 +1,47 @@ +{{- if .Values.ingress.enabled -}} +{{- $fullName := printf "%s-%s" .Release.Name "datahub-gms"}} +{{- $svcPort := .Values.global.datahub.gms.port -}} +{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1beta1 +{{- else -}} +apiVersion: extensions/v1beta1 +{{- end }} +kind: Ingress +metadata: + name: {{ $fullName}} + labels: + {{- include "datahub-gms.labels" . | nindent 4 }} + {{- with .Values.ingress.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +spec: +{{- if .Values.ingress.tls }} + tls: + {{- range .Values.ingress.tls }} + - hosts: + {{- range .hosts }} + - {{ . | quote }} + {{- end }} + secretName: {{ .secretName }} + {{- end }} +{{- end }} + rules: + {{- range .Values.ingress.hosts }} + - host: {{ .host | quote }} + http: + paths: + {{- range .redirectPaths }} + - path: {{ .path }} + backend: + serviceName: {{ .name }} + servicePort: {{ .port }} + {{- end }} + {{- range .paths }} + - path: {{ . }} + backend: + serviceName: {{ $fullName }} + servicePort: {{ $svcPort }} + {{- end }} + {{- end }} +{{- end }} diff --git a/datahub-kubernetes/datahub/charts/datahub-gms/values.yaml b/datahub-kubernetes/datahub/charts/datahub-gms/values.yaml index 06ba6ece6d..d7ed10ce76 100644 --- a/datahub-kubernetes/datahub/charts/datahub-gms/values.yaml +++ b/datahub-kubernetes/datahub/charts/datahub-gms/values.yaml @@ -51,6 +51,7 @@ ingress: hosts: - host: chart-example.local paths: [] + redirectPaths: [] tls: [] # - secretName: chart-example-tls # hosts: