ui: updated helm charts for hubble-ui 0.7

Signed-off-by: Dmitry Kharitonov <dmitry@isovalent.com>
cilium · Sep 17, 2020 · e518c51 · e518c51
1 parent db236a0
commit e518c51
Show file tree

Hide file tree

Showing 6 changed files with 231 additions and 48 deletions.
diff --git a/install/kubernetes/cilium/charts/hubble-ui/files/envoy/envoy.yaml b/install/kubernetes/cilium/charts/hubble-ui/files/envoy/envoy.yaml
@@ -0,0 +1,58 @@
+static_resources:
+  listeners:
+    - name: listener_hubble_ui
+      address:
+        socket_address:
+          address: 0.0.0.0
+          port_value: 8081
+      filter_chains:
+        - filters:
+            - name: envoy.filters.network.http_connection_manager
+              config:
+                codec_type: auto
+                stat_prefix: ingress_http
+                route_config:
+                  name: local_route
+                  virtual_hosts:
+                    - name: local_service
+                      domains: ['*']
+                      routes:
+                        - match:
+                            prefix: '/api/'
+                          route:
+                            cluster: backend
+                            max_grpc_timeout: 0s
+                            prefix_rewrite: '/'
+                        - match:
+                            prefix: '/'
+                          route:
+                            cluster: frontend
+                      cors:
+                        allow_origin_string_match:
+                          - prefix: '*'
+                        allow_methods: GET, PUT, DELETE, POST, OPTIONS
+                        allow_headers: keep-alive,user-agent,cache-control,content-type,content-transfer-encoding,x-accept-content-transfer-encoding,x-accept-response-streaming,x-user-agent,x-grpc-web,grpc-timeout
+                        max_age: '1728000'
+                        expose_headers: grpc-status,grpc-message
+                http_filters:
+                  - name: envoy.filters.http.grpc_web
+                  - name: envoy.filters.http.cors
+                  - name: envoy.filters.http.router
+  clusters:
+    - name: frontend
+      connect_timeout: 0.25s
+      type: strict_dns
+      lb_policy: round_robin
+      hosts:
+        - socket_address:
+            address: 127.0.0.1
+            port_value: 8080
+    - name: backend
+      connect_timeout: 0.25s
+      type: logical_dns
+      lb_policy: round_robin
+      http2_protocol_options: {}
+      hosts:
+        - socket_address:
+            address: 127.0.0.1
+            port_value: 8090
diff --git a/install/kubernetes/cilium/charts/hubble-ui/templates/configmap.yaml b/install/kubernetes/cilium/charts/hubble-ui/templates/configmap.yaml
@@ -0,0 +1,8 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: hubble-ui-envoy
+  namespace: {{ .Release.Namespace }}
+data:
+{{ (.Files.Glob "files/envoy/*").AsConfig | indent 2 }}
diff --git a/install/kubernetes/cilium/charts/hubble-ui/templates/deployment.yaml b/install/kubernetes/cilium/charts/hubble-ui/templates/deployment.yaml
@@ -13,29 +13,50 @@ spec:
       labels:
         k8s-app: hubble-ui
     spec:
-      {{- if .Values.securityContext.enabled }}
-      securityContext:
-        runAsUser: 1001
-      {{- end }}
       serviceAccount: hubble-ui
       serviceAccountName: hubble-ui
       containers:
-        - name: hubble-ui
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          env:
-            - name: NODE_ENV
-              value: "production"
-            - name: LOG_LEVEL
-              value: "info"
-            - name: HUBBLE
-              value: "true"
-            - name: HUBBLE_SERVICE
-              value: "hubble-relay"
-            - name: HUBBLE_PORT
-              value: "80"
+        - name: frontend
+          image: "{{ .Values.frontendImage.repository }}:{{ .Values.frontendImage.tag }}"
+          imagePullPolicy: {{ .Values.frontendImage.pullPolicy }}
           ports:
-            - containerPort: 12000
+            - containerPort: 8080
               name: http
           resources:
-            {{- toYaml .Values.resources | trim | nindent 12 }}
+            {{- toYaml .Values.frontendResources | trim | nindent 12 }}
+        - name: backend
+          image: "{{ .Values.backendImage.repository }}:{{ .Values.backendImage.tag }}"
+          imagePullPolicy: {{ .Values.backendImage.pullPolicy }}
+          env:
+            - name: EVENTS_SERVER_PORT
+              value: "8090"
+            - name: FLOWS_API_ADDR
+              value: "hubble-relay:80"
+          ports:
+            - containerPort: 8090
+              name: grpc
+          resources:
+            {{- toYaml .Values.backendResources  | trim | nindent 12 }}
+        - name: proxy
+          image: "{{ .Values.proxyImage.repository }}:{{ .Values.proxyImage.tag }}"
+          imagePullPolicy: {{ .Values.proxyImage.pullPolicy }}
+          ports:
+            - containerPort: 8081
+              name: http
+          resources: {{- toYaml .Values.proxyResources | trim | nindent 12 }}
+          command: ["envoy"]
+          args:
+            [
+              "-c",
+              "/etc/envoy.yaml",
+              "-l",
+              "info"
+            ]
+          volumeMounts:
+            - name: hubble-ui-envoy-yaml
+              mountPath: /etc/envoy.yaml
+              subPath: envoy.yaml
+      volumes:
+        - name: hubble-ui-envoy-yaml
+          configMap:
+            name: hubble-ui-envoy
diff --git a/install/kubernetes/cilium/charts/hubble-ui/templates/svc.yaml b/install/kubernetes/cilium/charts/hubble-ui/templates/svc.yaml
@@ -9,5 +9,5 @@ spec:
   ports:
     - name: http
       port: 80
-      targetPort: 12000
+      targetPort: 8081
   type: ClusterIP
diff --git a/install/kubernetes/cilium/charts/hubble-ui/values.yaml b/install/kubernetes/cilium/charts/hubble-ui/values.yaml
@@ -1,12 +1,20 @@
 # Configuration for hubble ui
-image:
-  # repository of the docker image
+frontendImage:
   repository: quay.io/cilium/hubble-ui
-  # 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.6.1
-  # pullPolicy is the container image pull policy
+  tag: v0.7.1
+  pullPolicy: IfNotPresent
+backendImage:
+  repository: quay.io/cilium/hubble-ui-backend
+  # tag is the container image tag to use.
+  # Ref: https://github.com/cilium/hubble-ui/releases
+  # Ref: https://quay.io/repository/cilium/hubble-ui-backend?tab=tags
+  tag: v0.7.1
+  pullPolicy: IfNotPresent
+proxyImage:
+  repository: docker.io/envoyproxy/envoy
+  tag: v1.14.1
   pullPolicy: IfNotPresent
 replicas: 1
 # Resource requests and limits for the 'hubble-ui' container of the 'hubble-ui' deployment, such as
@@ -18,11 +26,9 @@ replicas: 1
 #       requests:
 #         cpu: 100m
 #         memory: 64Mi
-resources: {}
-
-securityContext:
-  # Incompatible with image version <= v0.5.0
-  enabled: true
+frontendResources: {}
+backendResources: {}
+proxyResources: {}
 
 serviceAccount:
   annotations: {}
@@ -39,4 +45,3 @@ ingress:
   #  - secretName: chart-example-tls
   #    hosts:
   #      - chart-example.local
-
diff --git a/install/kubernetes/experimental-install.yaml b/install/kubernetes/experimental-install.yaml
@@ -177,6 +177,73 @@ data:
     disable-client-tls: true
     disable-server-tls: true
 ---
+# Source: cilium/charts/hubble-ui/templates/configmap.yaml
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: hubble-ui-envoy
+  namespace: kube-system
+data:
+  envoy.yaml: |
+    static_resources:
+      listeners:
+        - name: listener_hubble_ui
+          address:
+            socket_address:
+              address: 0.0.0.0
+              port_value: 8081
+          filter_chains:
+            - filters:
+                - name: envoy.filters.network.http_connection_manager
+                  config:
+                    codec_type: auto
+                    stat_prefix: ingress_http
+                    route_config:
+                      name: local_route
+                      virtual_hosts:
+                        - name: local_service
+                          domains: ['*']
+                          routes:
+                            - match:
+                                prefix: '/api/'
+                              route:
+                                cluster: backend
+                                max_grpc_timeout: 0s
+                                prefix_rewrite: '/'
+                            - match:
+                                prefix: '/'
+                              route:
+                                cluster: frontend
+                          cors:
+                            allow_origin_string_match:
+                              - prefix: '*'
+                            allow_methods: GET, PUT, DELETE, POST, OPTIONS
+                            allow_headers: keep-alive,user-agent,cache-control,content-type,content-transfer-encoding,x-accept-content-transfer-encoding,x-accept-response-streaming,x-user-agent,x-grpc-web,grpc-timeout
+                            max_age: '1728000'
+                            expose_headers: grpc-status,grpc-message
+                    http_filters:
+                      - name: envoy.filters.http.grpc_web
+                      - name: envoy.filters.http.cors
+                      - name: envoy.filters.http.router
+      clusters:
+        - name: frontend
+          connect_timeout: 0.25s
+          type: strict_dns
+          lb_policy: round_robin
+          hosts:
+            - socket_address:
+                address: 127.0.0.1
+                port_value: 8080
+        - name: backend
+          connect_timeout: 0.25s
+          type: logical_dns
+          lb_policy: round_robin
+          http2_protocol_options: {}
+          hosts:
+            - socket_address:
+                address: 127.0.0.1
+                port_value: 8090
+---
 # Source: cilium/charts/agent/templates/clusterrole.yaml
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
@@ -467,7 +534,7 @@ spec:
   ports:
     - name: http
       port: 80
-      targetPort: 12000
+      targetPort: 8081
   type: ClusterIP
 ---
 # Source: cilium/charts/agent/templates/daemonset.yaml
@@ -800,30 +867,54 @@ spec:
       labels:
         k8s-app: hubble-ui
     spec:
-      securityContext:
-        runAsUser: 1001
       serviceAccount: hubble-ui
       serviceAccountName: hubble-ui
       containers:
-        - name: hubble-ui
-          image: "quay.io/cilium/hubble-ui:v0.6.1"
+        - name: frontend
+          image: "quay.io/cilium/hubble-ui:v0.7.1"
+          imagePullPolicy: IfNotPresent
+          ports:
+            - containerPort: 8080
+              name: http
+          resources:
+            {}
+        - name: backend
+          image: "quay.io/cilium/hubble-ui-backend:v0.7.1"
           imagePullPolicy: IfNotPresent
           env:
-            - name: NODE_ENV
-              value: "production"
-            - name: LOG_LEVEL
-              value: "info"
-            - name: HUBBLE
-              value: "true"
-            - name: HUBBLE_SERVICE
-              value: "hubble-relay"
-            - name: HUBBLE_PORT
-              value: "80"
+            - name: EVENTS_SERVER_PORT
+              value: "8090"
+            - name: FLOWS_API_ADDR
+              value: "hubble-relay:80"
           ports:
-            - containerPort: 12000
+            - containerPort: 8090
+              name: grpc
+          resources:
+            {}
+        - name: proxy
+          image: "docker.io/envoyproxy/envoy:v1.14.1"
+          imagePullPolicy: IfNotPresent
+          ports:
+            - containerPort: 8081
               name: http
           resources:
             {}
+          command: ["envoy"]
+          args:
+            [
+              "-c",
+              "/etc/envoy.yaml",
+              "-l",
+              "info"
+            ]
+          volumeMounts:
+            - name: hubble-ui-envoy-yaml
+              mountPath: /etc/envoy.yaml
+              subPath: envoy.yaml
+      volumes:
+        - name: hubble-ui-envoy-yaml
+          configMap:
+            name: hubble-ui-envoy
 ---
 # Source: cilium/charts/operator/templates/deployment.yaml
 apiVersion: apps/v1