ui: updated helm charts for hubble-ui 0.7 #13170

geakstr · 2020-09-14T18:30:44Z

Signed-off-by: Dmitry Kharitonov dmitry@isovalent.com

joestringer · 2020-09-14T18:37:41Z

I think you need to run make -C install/kubernetes to generate the quick install / experimental install YAMLs based on the changes.

christarazi

LGTM, please squash the two commit together, and it should be good to go.

install/kubernetes/cilium/charts/hubble-ui/templates/svc.yaml

sayboras

Few minor points

install/kubernetes/cilium/charts/hubble-ui/values.yaml

sayboras · 2020-09-14T23:24:56Z

install/kubernetes/cilium/charts/hubble-ui/templates/configmap.yaml

@@ -0,0 +1,66 @@
+---
+apiVersion: v1


dumb question, if this configmap changes, will envoy pick it up (e.g. similar to coredns) ?

sayboras · 2020-09-15T07:50:35Z

install/kubernetes/cilium/charts/hubble-ui/templates/svc.yaml

  ports:
    - name: http
      port: 80
-      targetPort: 12000
+      targetPort: 8081


we need to update few docs for this port changes as well ? For example, https://github.com/cilium/cilium/blob/master/Documentation/gettingstarted/hubble-enable.rst

no, port-forward command will continue to work

maintainer-s-little-helper · 2020-09-15T12:56:20Z

Commit 8dbebd8cdb25097be1af8e75fca23921b35d8b72 does not contain "Signed-off-by".

Please follow instructions provided in https://docs.cilium.io/en/stable/contributing/development/contributing_guide/#developer-s-certificate-of-origin

maintainer-s-little-helper · 2020-09-15T12:58:12Z

Commit 8dbebd8cdb25097be1af8e75fca23921b35d8b72 does not contain "Signed-off-by".

Please follow instructions provided in https://docs.cilium.io/en/stable/contributing/development/contributing_guide/#developer-s-certificate-of-origin

maintainer-s-little-helper · 2020-09-15T12:59:09Z

Commit 8dbebd8cdb25097be1af8e75fca23921b35d8b72 does not contain "Signed-off-by".

Please follow instructions provided in https://docs.cilium.io/en/stable/contributing/development/contributing_guide/#developer-s-certificate-of-origin

install/kubernetes/experimental-install.yaml

fristonio

Mostly looks good 🚀 Just some minor nits around formatting.

install/kubernetes/cilium/charts/hubble-ui/templates/deployment.yaml

aanm

We can also have a dedicated file for the envoy configuration and import it in the configmap.

diff --git a/install/kubernetes/cilium/charts/hubble-ui/files/envoy/envoy.yaml b/install/kubernetes/cilium/charts/hubble-ui/files/envoy/envoy.yaml
new file mode 100644
index 000000000..31c778b61
--- /dev/null
+++ 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
index bc43ee70c..e69517e6b 100644
--- a/install/kubernetes/cilium/charts/hubble-ui/templates/configmap.yaml
+++ b/install/kubernetes/cilium/charts/hubble-ui/templates/configmap.yaml
@@ -5,62 +5,4 @@ metadata:
   name: hubble-ui-envoy
   namespace: {{ .Release.Namespace }}
 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
+{{ (.Files.Glob "files/envoy/*").AsConfig | indent 2 }}
\ No newline at end of file
diff --git a/install/kubernetes/experimental-install.yaml b/install/kubernetes/experimental-install.yaml
index ce90557df..af1701c93 100644
--- a/install/kubernetes/experimental-install.yaml
+++ b/install/kubernetes/experimental-install.yaml
@@ -184,7 +184,7 @@ metadata:
   name: hubble-ui-envoy
   namespace: kube-system
 data:
-  envoy.yaml: >
+  envoy.yaml: |
     static_resources:
       listeners:
         - name: listener_hubble_ui

install/kubernetes/cilium/charts/hubble-ui/values.yaml

Signed-off-by: Dmitry Kharitonov <dmitry@isovalent.com>

geakstr · 2020-09-16T09:48:51Z

Cool, thanks

aanm · 2020-09-16T16:00:03Z

test-me-please

fristonio

LGTM

aanm · 2020-09-17T08:00:38Z

hit #13198

geakstr requested review from genbit and michi-covalent September 14, 2020 18:30

geakstr requested review from a team as code owners September 14, 2020 18:30

geakstr requested review from a team September 14, 2020 18:30

geakstr self-assigned this Sep 14, 2020

maintainer-s-little-helper bot added the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Sep 14, 2020

joestringer added the release-note/misc This PR makes changes that have no direct user impact. label Sep 14, 2020

maintainer-s-little-helper bot removed the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Sep 14, 2020

christarazi reviewed Sep 14, 2020

View reviewed changes

genbit requested changes Sep 15, 2020

View reviewed changes

install/kubernetes/cilium/charts/hubble-ui/templates/svc.yaml Outdated Show resolved Hide resolved

sayboras reviewed Sep 15, 2020

View reviewed changes

maintainer-s-little-helper bot added the dont-merge/needs-sign-off The author needs to add signoff to their commits before merge. label Sep 15, 2020

geakstr force-pushed the pr/dima/helm-charts-for-hubble-ui-0.7 branch from eba5742 to 7def310 Compare September 15, 2020 12:58

geakstr force-pushed the pr/dima/helm-charts-for-hubble-ui-0.7 branch from 7def310 to 5e2b658 Compare September 15, 2020 12:59

genbit requested changes Sep 15, 2020

View reviewed changes

install/kubernetes/experimental-install.yaml Outdated Show resolved Hide resolved

geakstr force-pushed the pr/dima/helm-charts-for-hubble-ui-0.7 branch from 5e2b658 to e1e8adb Compare September 15, 2020 15:08

maintainer-s-little-helper bot removed the dont-merge/needs-sign-off The author needs to add signoff to their commits before merge. label Sep 15, 2020

fristonio requested changes Sep 15, 2020

View reviewed changes

geakstr force-pushed the pr/dima/helm-charts-for-hubble-ui-0.7 branch 2 times, most recently from d9bc0ec to 68b52fc Compare September 16, 2020 06:33

aanm requested changes Sep 16, 2020

View reviewed changes

install/kubernetes/cilium/charts/hubble-ui/values.yaml Outdated Show resolved Hide resolved

ui: updated helm charts for hubble-ui 0.7

75db096

Signed-off-by: Dmitry Kharitonov <dmitry@isovalent.com>

geakstr force-pushed the pr/dima/helm-charts-for-hubble-ui-0.7 branch from 68b52fc to 75db096 Compare September 16, 2020 09:47

aanm approved these changes Sep 16, 2020

View reviewed changes

joestringer requested review from genbit and fristonio September 16, 2020 23:23

fristonio approved these changes Sep 17, 2020

View reviewed changes

aanm merged commit e518c51 into master Sep 17, 2020

aanm deleted the pr/dima/helm-charts-for-hubble-ui-0.7 branch September 17, 2020 08:00

joestringer mentioned this pull request Oct 12, 2020

Prepare for release v1.9.0-rc1 #13518

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ui: updated helm charts for hubble-ui 0.7 #13170

ui: updated helm charts for hubble-ui 0.7 #13170

geakstr commented Sep 14, 2020

joestringer commented Sep 14, 2020

christarazi left a comment

sayboras left a comment

sayboras Sep 14, 2020

sayboras Sep 15, 2020

genbit Sep 15, 2020

maintainer-s-little-helper bot commented Sep 15, 2020

maintainer-s-little-helper bot commented Sep 15, 2020

maintainer-s-little-helper bot commented Sep 15, 2020

fristonio left a comment

aanm left a comment

geakstr commented Sep 16, 2020

aanm commented Sep 16, 2020

fristonio left a comment

aanm commented Sep 17, 2020

ui: updated helm charts for hubble-ui 0.7 #13170

ui: updated helm charts for hubble-ui 0.7 #13170

Conversation

geakstr commented Sep 14, 2020

joestringer commented Sep 14, 2020

christarazi left a comment

Choose a reason for hiding this comment

sayboras left a comment

Choose a reason for hiding this comment

sayboras Sep 14, 2020

Choose a reason for hiding this comment

sayboras Sep 15, 2020

Choose a reason for hiding this comment

genbit Sep 15, 2020

Choose a reason for hiding this comment

maintainer-s-little-helper bot commented Sep 15, 2020

maintainer-s-little-helper bot commented Sep 15, 2020

maintainer-s-little-helper bot commented Sep 15, 2020

fristonio left a comment

Choose a reason for hiding this comment

aanm left a comment

Choose a reason for hiding this comment

geakstr commented Sep 16, 2020

aanm commented Sep 16, 2020

fristonio left a comment

Choose a reason for hiding this comment

aanm commented Sep 17, 2020