From 9a9bab71113c52af73b0c24517cd34e1077c4d25 Mon Sep 17 00:00:00 2001
From: Michi Mutsuzaki <michi@isovalent.com>
Date: Thu, 30 Apr 2020 15:57:32 -0700
Subject: [PATCH] helm: Update hubble-ui chart

- Use v0.5.0 tag by default instead of latest.
- Rely on requirements.yaml to enable the chart instead of guarding
  individual templates.

Ref: https://github.com/cilium/hubble-ui/releases

Signed-off-by: Michi Mutsuzaki <michi@isovalent.com>
---
 .../cilium/charts/hubble-ui/templates/clusterrole.yaml      | 2 --
 .../charts/hubble-ui/templates/clusterrolebinding.yaml      | 2 --
 .../cilium/charts/hubble-ui/templates/deployment.yaml       | 2 --
 .../cilium/charts/hubble-ui/templates/ingress.yaml          | 2 +-
 .../cilium/charts/hubble-ui/templates/serviceaccount.yaml   | 2 --
 .../kubernetes/cilium/charts/hubble-ui/templates/svc.yaml   | 2 --
 install/kubernetes/cilium/charts/hubble-ui/values.yaml      | 6 ++++--
 7 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/install/kubernetes/cilium/charts/hubble-ui/templates/clusterrole.yaml b/install/kubernetes/cilium/charts/hubble-ui/templates/clusterrole.yaml
index 96ac36a4938a..a7af1570440a 100644
--- a/install/kubernetes/cilium/charts/hubble-ui/templates/clusterrole.yaml
+++ b/install/kubernetes/cilium/charts/hubble-ui/templates/clusterrole.yaml
@@ -1,4 +1,3 @@
-{{- if .Values.global.hubble.ui.enabled }}
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
@@ -41,4 +40,3 @@ rules:
       - get
       - list
       - watch
-{{- end }}
diff --git a/install/kubernetes/cilium/charts/hubble-ui/templates/clusterrolebinding.yaml b/install/kubernetes/cilium/charts/hubble-ui/templates/clusterrolebinding.yaml
index 6d2bd7d21024..830824e0a60a 100644
--- a/install/kubernetes/cilium/charts/hubble-ui/templates/clusterrolebinding.yaml
+++ b/install/kubernetes/cilium/charts/hubble-ui/templates/clusterrolebinding.yaml
@@ -1,4 +1,3 @@
-{{- if .Values.global.hubble.ui.enabled }}
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
@@ -11,4 +10,3 @@ subjects:
   - kind: ServiceAccount
     namespace: {{ .Release.Namespace }}
     name: hubble-ui 
-{{- end }}
diff --git a/install/kubernetes/cilium/charts/hubble-ui/templates/deployment.yaml b/install/kubernetes/cilium/charts/hubble-ui/templates/deployment.yaml
index cb8ff9348149..128da84b8fc6 100644
--- a/install/kubernetes/cilium/charts/hubble-ui/templates/deployment.yaml
+++ b/install/kubernetes/cilium/charts/hubble-ui/templates/deployment.yaml
@@ -1,4 +1,3 @@
-{{- if .Values.global.hubble.ui.enabled }}
 kind: Deployment
 apiVersion: apps/v1
 metadata:
@@ -35,4 +34,3 @@ spec:
               name: http
           resources:
             {{- toYaml .Values.resources | trim | nindent 12 }}
-{{- end }}
diff --git a/install/kubernetes/cilium/charts/hubble-ui/templates/ingress.yaml b/install/kubernetes/cilium/charts/hubble-ui/templates/ingress.yaml
index 095a5f970969..619b6499eb08 100644
--- a/install/kubernetes/cilium/charts/hubble-ui/templates/ingress.yaml
+++ b/install/kubernetes/cilium/charts/hubble-ui/templates/ingress.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.global.hubble.ui.enabled .Values.ingress.enabled -}}
+{{- if .Values.ingress.enabled -}}
 {{- $ingressPath := .Values.ingress.path -}}
 apiVersion: extensions/v1beta1
 kind: Ingress
diff --git a/install/kubernetes/cilium/charts/hubble-ui/templates/serviceaccount.yaml b/install/kubernetes/cilium/charts/hubble-ui/templates/serviceaccount.yaml
index 77d1b9d6cfe1..9a8eb1b5b956 100644
--- a/install/kubernetes/cilium/charts/hubble-ui/templates/serviceaccount.yaml
+++ b/install/kubernetes/cilium/charts/hubble-ui/templates/serviceaccount.yaml
@@ -1,7 +1,5 @@
-{{- if .Values.global.hubble.ui.enabled }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
   namespace: {{ .Release.Namespace }}
   name: hubble-ui 
-{{- end }}
diff --git a/install/kubernetes/cilium/charts/hubble-ui/templates/svc.yaml b/install/kubernetes/cilium/charts/hubble-ui/templates/svc.yaml
index 6fc8343ad034..43ba516badab 100644
--- a/install/kubernetes/cilium/charts/hubble-ui/templates/svc.yaml
+++ b/install/kubernetes/cilium/charts/hubble-ui/templates/svc.yaml
@@ -1,4 +1,3 @@
-{{- if .Values.global.hubble.ui.enabled }}
 kind: Service
 apiVersion: v1
 metadata:
@@ -12,4 +11,3 @@ spec:
       port: 12000
       targetPort: 12000
   type: ClusterIP
-{{- end }}
diff --git a/install/kubernetes/cilium/charts/hubble-ui/values.yaml b/install/kubernetes/cilium/charts/hubble-ui/values.yaml
index 5cdb11f6a1dd..60886573503c 100644
--- a/install/kubernetes/cilium/charts/hubble-ui/values.yaml
+++ b/install/kubernetes/cilium/charts/hubble-ui/values.yaml
@@ -2,8 +2,10 @@
 image:
   # repository of the docker image
   repository: quay.io/cilium/hubble-ui
-  # tag is the container image tag to use
-  tag: latest
+  # tag is the container image tag to use.
+  # Ref: https://github.com/cilium/hubble-ui/releases
+  # Ref: https://quay.io/repository/cilium/hubble-ui?tab=tags
+  tag: v0.5.0
   # pullPolicy is the container image pull policy
   pullPolicy: Always
 clusterDomain: cluster.local