Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: update Cilium to 1.15.0-rc.0 #6688

Merged
merged 3 commits into from Jan 4, 2024
Merged

feat: update Cilium to 1.15.0-rc.0 #6688

merged 3 commits into from Jan 4, 2024

Conversation

onedr0p
Copy link
Owner

@onedr0p onedr0p commented Jan 4, 2024

Maybe?

@bot-ross bot-ross bot added area/kubernetes Changes made in the kubernetes directory cluster/main labels Jan 4, 2024
@bot-ross
Copy link
Contributor

bot-ross bot commented Jan 4, 2024

--- kubernetes/main/apps/kube-system/cilium/app Kustomization: flux-system/cilium HelmRelease: kube-system/cilium

+++ kubernetes/main/apps/kube-system/cilium/app Kustomization: flux-system/cilium HelmRelease: kube-system/cilium

@@ -13,13 +13,13 @@

     spec:
       chart: cilium
       sourceRef:
         kind: HelmRepository
         name: cilium
         namespace: flux-system
-      version: 1.14.5
+      version: 1.15.0-rc.0
   install:
     remediation:
       retries: 3
   interval: 30m
   uninstall:
     keepHistory: false
@@ -111,10 +111,10 @@

     prometheus:
       enabled: true
       serviceMonitor:
         enabled: true
         trustCRDsExist: true
     rollOutCiliumPods: true
+    routingMode: native
     securityContext:
       privileged: true
-    tunnel: disabled
 

@bot-ross
Copy link
Contributor

bot-ross bot commented Jan 4, 2024

--- HelmRelease: kube-system/cilium ConfigMap: kube-system/cilium-dashboard

+++ HelmRelease: kube-system/cilium ConfigMap: kube-system/cilium-dashboard

@@ -39,13 +39,16 @@

             "error": "#890f02",
             "warning": "#c15c17"
           },
           "bars": false,
           "dashLength": 10,
           "dashes": false,
-          "datasource": "prometheus",
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
           "fieldConfig": {
             "defaults": {
               "custom": {}
             },
             "overrides": []
           },
@@ -143,13 +146,16 @@

           "aliasColors": {
             "avg": "#cffaff"
           },
           "bars": false,
           "dashLength": 10,
           "dashes": false,
-          "datasource": "prometheus",
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
           "fieldConfig": {
             "defaults": {
               "custom": {}
             },
             "overrides": []
           },
@@ -283,13 +289,16 @@

             "MAX_virtual_memory_bytes": "#e5ac0e",
             "Max Virtual Memory": "#584477"
           },
           "bars": false,
           "dashLength": 10,
           "dashes": false,
-          "datasource": "prometheus",
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
           "fieldConfig": {
             "defaults": {
               "custom": {}
             },
             "overrides": []
           },
@@ -406,13 +415,16 @@

           "aliasColors": {
             "MAX_resident_memory_bytes_max": "#e5ac0e"
           },
           "bars": false,
           "dashLength": 10,
           "dashes": false,
-          "datasource": "prometheus",
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
           "fieldConfig": {
             "defaults": {
               "custom": {}
             },
             "overrides": []
           },
@@ -523,13 +535,16 @@

           "aliasColors": {
             "all nodes": "#e5a8e2"
           },
           "bars": false,
           "dashLength": 10,
           "dashes": false,
-          "datasource": "prometheus",
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
           "fieldConfig": {
             "defaults": {
               "custom": {}
             },
             "overrides": []
           },
@@ -648,13 +663,16 @@

           "aliasColors": {
             "MAX_resident_memory_bytes_max": "#e5ac0e"
           },
           "bars": false,
           "dashLength": 10,
           "dashes": false,
-          "datasource": "prometheus",
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
           "description": "BPF memory usage in the entire system including components not managed by Cilium.",
           "fieldConfig": {
             "defaults": {
               "custom": {}
             },
             "overrides": []
@@ -771,13 +789,16 @@

         },
         {
           "aliasColors": {},
           "bars": false,
           "dashLength": 10,
           "dashes": false,
-          "datasource": "prometheus",
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
           "description": "Fill percentage of BPF maps, tagged by map name",
           "fieldConfig": {
             "defaults": {
               "custom": {}
             },
             "overrides": []
@@ -882,13 +903,16 @@

         },
         {
           "aliasColors": {},
           "bars": false,
           "dashLength": 10,
           "dashes": false,
-          "datasource": "prometheus",
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
           "fieldConfig": {
             "defaults": {
               "custom": {}
             },
             "overrides": []
           },
@@ -983,13 +1007,16 @@

         },
         {
           "aliasColors": {},
           "bars": false,
           "dashLength": 10,
           "dashes": false,
-          "datasource": "prometheus",
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
           "fieldConfig": {
             "defaults": {
               "custom": {}
             },
             "overrides": []
           },
@@ -1084,13 +1111,16 @@

         },
         {
           "aliasColors": {},
           "bars": false,
           "dashLength": 10,
           "dashes": false,
-          "datasource": "prometheus",
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
           "fieldConfig": {
             "defaults": {
               "custom": {}
             },
             "overrides": []
           },
@@ -1185,13 +1215,16 @@

         },
         {
           "aliasColors": {},
           "bars": false,
           "dashLength": 10,
           "dashes": false,
-          "datasource": "prometheus",
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
           "fieldConfig": {
             "defaults": {
               "custom": {}
             },
             "overrides": []
           },
@@ -1286,13 +1319,16 @@

         },
         {
           "aliasColors": {},
           "bars": false,
           "dashLength": 10,
           "dashes": false,
-          "datasource": "prometheus",
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
           "fieldConfig": {
             "defaults": {
               "custom": {}
             },
             "overrides": []
           },
@@ -1387,13 +1423,16 @@

         },
         {
           "aliasColors": {},
           "bars": false,
           "dashLength": 10,
           "dashes": false,
-          "datasource": "prometheus",
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
           "fieldConfig": {
             "defaults": {
               "custom": {}
             },
             "overrides": []
           },
@@ -1523,13 +1562,16 @@

         },
         {
           "aliasColors": {},
           "bars": true,
           "dashLength": 10,
           "dashes": false,
-          "datasource": "prometheus",
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
           "fieldConfig": {
             "defaults": {
               "custom": {}
             },
             "overrides": []
           },
@@ -1624,13 +1666,16 @@

         },
         {
           "aliasColors": {},
           "bars": true,
           "dashLength": 10,
           "dashes": false,
-          "datasource": "prometheus",
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
           "decimals": 2,
           "fieldConfig": {
             "defaults": {
               "custom": {}
             },
             "overrides": []
@@ -1727,13 +1772,16 @@

         },
         {
           "aliasColors": {},
           "bars": false,
           "dashLength": 10,
           "dashes": false,
-          "datasource": "prometheus",
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
           "fieldConfig": {
             "defaults": {
               "custom": {}
             },
             "overrides": []
           },
@@ -1828,13 +1876,16 @@

         },
         {
           "aliasColors": {},
           "bars": false,
           "dashLength": 10,
           "dashes": false,
-          "datasource": "prometheus",
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
           "fieldConfig": {
             "defaults": {
               "custom": {}
             },
             "overrides": []
           },
@@ -1927,13 +1978,16 @@

         },
         {
           "aliasColors": {},
           "bars": false,
           "dashLength": 10,
           "dashes": false,
-          "datasource": "prometheus",
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
           "fieldConfig": {
             "defaults": {
               "custom": {}
             },
             "overrides": []
           },
@@ -2028,13 +2082,16 @@

         },
         {
           "aliasColors": {},
           "bars": false,
           "dashLength": 10,
           "dashes": false,
-          "datasource": "prometheus",
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
           "fieldConfig": {
             "defaults": {
               "custom": {}
             },
             "overrides": []
           },
@@ -2129,13 +2186,16 @@

         },
         {
           "aliasColors": {},
           "bars": false,
           "dashLength": 10,
           "dashes": false,
-          "datasource": "prometheus",
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
           "fieldConfig": {
             "defaults": {
               "custom": {}
             },
             "overrides": []
           },
@@ -2251,13 +2311,16 @@

         },
         {
           "aliasColors": {},
           "bars": true,
           "dashLength": 10,
           "dashes": false,
-          "datasource": "prometheus",
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
           "decimals": 2,
           "fieldConfig": {
             "defaults": {
               "custom": {}
             },
             "overrides": []
@@ -2354,13 +2417,16 @@

         },
         {
           "aliasColors": {},
           "bars": true,
           "dashLength": 10,
           "dashes": false,
-          "datasource": "prometheus",
+          "datasource": {
[Diff truncated by flux-local]
--- HelmRelease: kube-system/cilium ConfigMap: kube-system/cilium-config

+++ HelmRelease: kube-system/cilium ConfigMap: kube-system/cilium-config

@@ -11,13 +11,15 @@

   cilium-endpoint-gc-interval: 5m0s
   nodes-gc-interval: 5m0s
   skip-cnp-status-startup-clean: 'false'
   debug: 'false'
   debug-verbose: ''
   enable-policy: default
+  policy-cidr-match-mode: ''
   prometheus-serve-addr: :9962
+  controller-group-metrics: write-cni-file sync-host-ips sync-lb-maps-with-k8s-services
   proxy-prometheus-port: '9964'
   operator-prometheus-serve-addr: :9963
   enable-metrics: 'true'
   enable-ipv4: 'true'
   enable-ipv6: 'false'
   custom-cni-conf: 'false'
@@ -31,33 +33,37 @@

   bpf-lb-external-clusterip: 'false'
   preallocate-bpf-maps: 'false'
   sidecar-istio-proxy-image: cilium/istio_proxy
   cluster-name: kubernetes
   cluster-id: '1'
   routing-mode: native
+  service-no-backend-response: reject
   enable-l7-proxy: 'true'
   enable-ipv4-masquerade: 'true'
   enable-ipv4-big-tcp: 'false'
   enable-ipv6-big-tcp: 'false'
   enable-ipv6-masquerade: 'true'
   enable-bpf-masquerade: 'true'
+  enable-masquerade-to-route-source: 'false'
   enable-xt-socket-fallback: 'true'
   install-no-conntrack-iptables-rules: 'false'
   auto-direct-node-routes: 'true'
   enable-bandwidth-manager: 'true'
   enable-bbr: 'true'
   enable-local-redirect-policy: 'true'
   ipv4-native-routing-cidr: 10.32.0.0/16
   kube-proxy-replacement: 'true'
   kube-proxy-replacement-healthz-bind-address: 0.0.0.0:10256
   bpf-lb-sock: 'false'
   enable-health-check-nodeport: 'true'
+  enable-health-check-loadbalancer-ip: 'false'
   node-port-bind-protection: 'true'
   enable-auto-protect-node-port-range: 'true'
   bpf-lb-mode: dsr
   bpf-lb-algorithm: maglev
+  bpf-lb-acceleration: disabled
   enable-svc-source-range-check: 'true'
   enable-l2-neigh-discovery: 'true'
   arping-refresh-period: 30s
   enable-endpoint-routes: 'true'
   enable-k8s-networkpolicy: 'true'
   write-cni-conf-when-ready: /host/etc/cni/net.d/05-cilium.conflist
@@ -71,21 +77,21 @@

   operator-api-serve-addr: 127.0.0.1:9234
   enable-hubble: 'true'
   hubble-socket-path: /var/run/cilium/hubble.sock
   hubble-metrics-server: :9965
   hubble-metrics: dns:query drop tcp flow port-distribution icmp http
   enable-hubble-open-metrics: 'false'
+  hubble-export-file-max-size-mb: '10'
+  hubble-export-file-max-backups: '5'
   hubble-listen-address: :4244
   hubble-disable-tls: 'false'
   hubble-tls-cert-file: /var/lib/cilium/tls/hubble/server.crt
   hubble-tls-key-file: /var/lib/cilium/tls/hubble/server.key
   hubble-tls-client-ca-files: /var/lib/cilium/tls/hubble/client-ca.crt
   ipam: kubernetes
   ipam-cilium-node-update-rate: 15s
-  disable-cnp-status-updates: 'true'
-  cnp-node-status-gc-interval: 0s
   egress-gateway-reconciliation-trigger-interval: 1s
   enable-vtep: 'false'
   vtep-endpoint: ''
   vtep-cidr: ''
   vtep-mask: ''
   vtep-mac: ''
@@ -95,14 +101,14 @@

   l2-announcements-retry-period: 1s
   enable-bgp-control-plane: 'false'
   bpf-root: /sys/fs/bpf
   cgroup-root: /run/cilium/cgroupv2
   enable-k8s-terminating-endpoint: 'true'
   enable-sctp: 'false'
-  k8s-client-qps: '5'
-  k8s-client-burst: '10'
+  k8s-client-qps: '10'
+  k8s-client-burst: '20'
   remove-cilium-node-taints: 'true'
   set-cilium-node-taints: 'true'
   set-cilium-is-up-condition: 'true'
   unmanaged-pod-watcher-interval: '15'
   tofqdns-dns-reject-response-code: refused
   tofqdns-enable-dns-compression: 'true'
@@ -116,7 +122,8 @@

   mesh-auth-rotated-identities-queue-size: '1024'
   mesh-auth-gc-interval: 5m0s
   proxy-connect-timeout: '2'
   proxy-max-requests-per-connection: '0'
   proxy-max-connection-duration-seconds: '0'
   external-envoy-proxy: 'false'
+  max-connected-clusters: '255'
 
--- HelmRelease: kube-system/cilium ConfigMap: kube-system/hubble-ui-nginx

+++ HelmRelease: kube-system/cilium ConfigMap: kube-system/hubble-ui-nginx

@@ -15,8 +15,10 @@

     \ range,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;\n\
     \        if ($request_method = OPTIONS) {\n            return 204;\n        }\n\
     \        # /CORS\n\n        location /api {\n            proxy_http_version 1.1;\n\
     \            proxy_pass_request_headers on;\n            proxy_hide_header Access-Control-Allow-Origin;\n\
     \            proxy_pass http://127.0.0.1:8090;\n        }\n        location /\
     \ {\n            # double `/index.html` is required here \n            try_files\
-    \ $uri $uri/ /index.html /index.html;\n        }\n    }\n}"
+    \ $uri $uri/ /index.html /index.html;\n        }\n\n        # Liveness probe\n\
+    \        location /healthz {\n            access_log off;\n            add_header\
+    \ Content-Type text/plain;\n            return 200 'ok';\n        }\n    }\n}"
 
--- HelmRelease: kube-system/cilium ConfigMap: kube-system/hubble-dashboard

+++ HelmRelease: kube-system/cilium ConfigMap: kube-system/hubble-dashboard

@@ -3238,11 +3238,11 @@

           "2d",
           "7d",
           "30d"
         ]
       },
       "timezone": "",
-      "title": "Hubble",
+      "title": "Hubble Metrics and Monitoring",
       "uid": "5HftnJAWz",
       "version": 24
     }
 
--- HelmRelease: kube-system/cilium ClusterRole: kube-system/cilium

+++ HelmRelease: kube-system/cilium ClusterRole: kube-system/cilium

@@ -54,12 +54,15 @@

   - get
 - apiGroups:
   - cilium.io
   resources:
   - ciliumloadbalancerippools
   - ciliumbgppeeringpolicies
+  - ciliumbgpnodeconfigs
+  - ciliumbgpadvertisements
+  - ciliumbgppeerconfigs
   - ciliumclusterwideenvoyconfigs
   - ciliumclusterwidenetworkpolicies
   - ciliumegressgatewaypolicies
   - ciliumendpoints
   - ciliumendpointslices
   - ciliumenvoyconfigs
@@ -108,9 +111,10 @@

   resources:
   - ciliumnetworkpolicies/status
   - ciliumclusterwidenetworkpolicies/status
   - ciliumendpoints/status
   - ciliumendpoints
   - ciliuml2announcementpolicies/status
+  - ciliumbgpnodeconfigs/status
   verbs:
   - patch
 
--- HelmRelease: kube-system/cilium ClusterRole: kube-system/cilium-operator

+++ HelmRelease: kube-system/cilium ClusterRole: kube-system/cilium-operator

@@ -116,12 +116,15 @@

   - update
 - apiGroups:
   - cilium.io
   resources:
   - ciliumendpointslices
   - ciliumenvoyconfigs
+  - ciliumbgppeerconfigs
+  - ciliumbgpadvertisements
+  - ciliumbgpnodeconfigs
   verbs:
   - create
   - update
   - get
   - list
   - watch
@@ -142,12 +145,17 @@

   - customresourcedefinitions
   verbs:
   - update
   resourceNames:
   - ciliumloadbalancerippools.cilium.io
   - ciliumbgppeeringpolicies.cilium.io
+  - ciliumbgpclusterconfigs.cilium.io
+  - ciliumbgppeerconfigs.cilium.io
+  - ciliumbgpadvertisements.cilium.io
+  - ciliumbgpnodeconfigs.cilium.io
+  - ciliumbgpnodeconfigoverrides.cilium.io
   - ciliumclusterwideenvoyconfigs.cilium.io
   - ciliumclusterwidenetworkpolicies.cilium.io
   - ciliumegressgatewaypolicies.cilium.io
   - ciliumendpoints.cilium.io
   - ciliumendpointslices.cilium.io
   - ciliumenvoyconfigs.cilium.io
@@ -162,12 +170,14 @@

   - ciliumpodippools.cilium.io
 - apiGroups:
   - cilium.io
   resources:
   - ciliumloadbalancerippools
   - ciliumpodippools
+  - ciliumbgpclusterconfigs
+  - ciliumbgpnodeconfigoverrides
   verbs:
   - get
   - list
   - watch
 - apiGroups:
   - cilium.io
--- HelmRelease: kube-system/cilium DaemonSet: kube-system/cilium

+++ HelmRelease: kube-system/cilium DaemonSet: kube-system/cilium

@@ -16,21 +16,21 @@

     rollingUpdate:
       maxUnavailable: 2
     type: RollingUpdate
   template:
     metadata:
       annotations:
-        cilium.io/cilium-configmap-checksum: 62369f011c13d1b6052d10db732ae4ef85402bbf305ae29a3b4f2b54f8868ed4
+        cilium.io/cilium-configmap-checksum: 933f0962b5476687fb46f21d7697e50ac24906fd554cc709acea9f57c1944c45
       labels:
         k8s-app: cilium
         app.kubernetes.io/name: cilium-agent
         app.kubernetes.io/part-of: cilium
     spec:
       containers:
       - name: cilium-agent
-        image: quay.io/cilium/cilium:v1.14.5@sha256:d3b287029755b6a47dee01420e2ea469469f1b174a2089c10af7e5e9289ef05b
+        image: quay.io/cilium/cilium:v1.15.0-rc.0@sha256:dfd696fb4325e996098607224cf379ccdbbe969634750fa10082e7ac31d0819a
         imagePullPolicy: IfNotPresent
         command:
         - cilium-agent
         args:
         - --config-dir=/tmp/cilium/config-map
         startupProbe:
@@ -42,12 +42,13 @@

             httpHeaders:
             - name: brief
               value: 'true'
           failureThreshold: 105
           periodSeconds: 2
           successThreshold: 1
+          initialDelaySeconds: 5
         livenessProbe:
           httpGet:
             host: 127.0.0.1
             path: /healthz
             port: 9879
             scheme: HTTP
@@ -81,12 +82,16 @@

           valueFrom:
             fieldRef:
               apiVersion: v1
               fieldPath: metadata.namespace
         - name: CILIUM_CLUSTERMESH_CONFIG
           value: /var/lib/cilium/clustermesh/
+        - name: GOMEMLIMIT
+          valueFrom:
+            resourceFieldRef:
+              resource: limits.memory
         - name: KUBERNETES_SERVICE_HOST
           value: 192.168.42.254
         - name: KUBERNETES_SERVICE_PORT
           value: '6443'
         lifecycle:
           postStart:
@@ -105,16 +110,16 @@

                 # We do it using a 'postStart' hook since this may need to run
                 # for nodes which might have already been init'ed but may still
                 # have dangling rules. This is safe because there are no
                 # dependencies on anything that is part of the startup script
                 # itself, and can be safely run multiple times per node (e.g. in
                 # case of a restart).
-                if [[ "$(iptables-save | grep -c 'AWS-SNAT-CHAIN|AWS-CONNMARK-CHAIN')" != "0" ]];
+                if [[ "$(iptables-save | grep -E -c 'AWS-SNAT-CHAIN|AWS-CONNMARK-CHAIN')" != "0" ]];
                 then
                     echo 'Deleting iptables rules created by the AWS CNI VPC plugin'
-                    iptables-save | grep -v 'AWS-SNAT-CHAIN|AWS-CONNMARK-CHAIN' | iptables-restore
+                    iptables-save | grep -E -v 'AWS-SNAT-CHAIN|AWS-CONNMARK-CHAIN' | iptables-restore
                 fi
                 echo 'Done!'
           preStop:
             exec:
               command:
               - /cni-uninstall.sh
@@ -158,16 +163,16 @@

           mountPath: /var/lib/cilium/tls/hubble
           readOnly: true
         - name: tmp
           mountPath: /tmp
       initContainers:
       - name: config
-        image: quay.io/cilium/cilium:v1.14.5@sha256:d3b287029755b6a47dee01420e2ea469469f1b174a2089c10af7e5e9289ef05b
-        imagePullPolicy: IfNotPresent
-        command:
-        - cilium
+        image: quay.io/cilium/cilium:v1.15.0-rc.0@sha256:dfd696fb4325e996098607224cf379ccdbbe969634750fa10082e7ac31d0819a
+        imagePullPolicy: IfNotPresent
+        command:
+        - cilium-dbg
         - build-config
         env:
         - name: K8S_NODE_NAME
           valueFrom:
             fieldRef:
               apiVersion: v1
@@ -183,13 +188,13 @@

           value: '6443'
         volumeMounts:
         - name: tmp
           mountPath: /tmp
         terminationMessagePolicy: FallbackToLogsOnError
       - name: mount-cgroup
-        image: quay.io/cilium/cilium:v1.14.5@sha256:d3b287029755b6a47dee01420e2ea469469f1b174a2089c10af7e5e9289ef05b
+        image: quay.io/cilium/cilium:v1.15.0-rc.0@sha256:dfd696fb4325e996098607224cf379ccdbbe969634750fa10082e7ac31d0819a
         imagePullPolicy: IfNotPresent
         env:
         - name: CGROUP_ROOT
           value: /run/cilium/cgroupv2
         - name: BIN_PATH
           value: /opt/cni/bin
@@ -206,13 +211,13 @@

         - name: cni-path
           mountPath: /hostbin
         terminationMessagePolicy: FallbackToLogsOnError
         securityContext:
           privileged: true
       - name: apply-sysctl-overwrites
-        image: quay.io/cilium/cilium:v1.14.5@sha256:d3b287029755b6a47dee01420e2ea469469f1b174a2089c10af7e5e9289ef05b
+        image: quay.io/cilium/cilium:v1.15.0-rc.0@sha256:dfd696fb4325e996098607224cf379ccdbbe969634750fa10082e7ac31d0819a
         imagePullPolicy: IfNotPresent
         env:
         - name: BIN_PATH
           value: /opt/cni/bin
         command:
         - sh
@@ -227,13 +232,13 @@

         - name: cni-path
           mountPath: /hostbin
         terminationMessagePolicy: FallbackToLogsOnError
         securityContext:
           privileged: true
       - name: clean-cilium-state
-        image: quay.io/cilium/cilium:v1.14.5@sha256:d3b287029755b6a47dee01420e2ea469469f1b174a2089c10af7e5e9289ef05b
+        image: quay.io/cilium/cilium:v1.15.0-rc.0@sha256:dfd696fb4325e996098607224cf379ccdbbe969634750fa10082e7ac31d0819a
         imagePullPolicy: IfNotPresent
         command:
         - /init-container.sh
         env:
         - name: CILIUM_ALL_STATE
           valueFrom:
@@ -243,12 +248,18 @@

               optional: true
         - name: CILIUM_BPF_STATE
           valueFrom:
             configMapKeyRef:
               name: cilium-config
               key: clean-cilium-bpf-state
+              optional: true
+        - name: WRITE_CNI_CONF_WHEN_READY
+          valueFrom:
+            configMapKeyRef:
+              name: cilium-config
+              key: write-cni-conf-when-ready
               optional: true
         - name: KUBERNETES_SERVICE_HOST
           value: 192.168.42.254
         - name: KUBERNETES_SERVICE_PORT
           value: '6443'
         terminationMessagePolicy: FallbackToLogsOnError
@@ -260,13 +271,13 @@

         - name: cilium-cgroup
           mountPath: /run/cilium/cgroupv2
           mountPropagation: HostToContainer
         - name: cilium-run
           mountPath: /var/run/cilium
       - name: install-cni-binaries
-        image: quay.io/cilium/cilium:v1.14.5@sha256:d3b287029755b6a47dee01420e2ea469469f1b174a2089c10af7e5e9289ef05b
+        image: quay.io/cilium/cilium:v1.15.0-rc.0@sha256:dfd696fb4325e996098607224cf379ccdbbe969634750fa10082e7ac31d0819a
         imagePullPolicy: IfNotPresent
         command:
         - /install-plugin.sh
         resources:
           requests:
             cpu: 100m
--- HelmRelease: kube-system/cilium Deployment: kube-system/cilium-operator

+++ HelmRelease: kube-system/cilium Deployment: kube-system/cilium-operator

@@ -20,22 +20,22 @@

       maxSurge: 25%
       maxUnavailable: 50%
     type: RollingUpdate
   template:
     metadata:
       annotations:
-        cilium.io/cilium-configmap-checksum: 62369f011c13d1b6052d10db732ae4ef85402bbf305ae29a3b4f2b54f8868ed4
+        cilium.io/cilium-configmap-checksum: 933f0962b5476687fb46f21d7697e50ac24906fd554cc709acea9f57c1944c45
       labels:
         io.cilium/app: operator
         name: cilium-operator
         app.kubernetes.io/part-of: cilium
         app.kubernetes.io/name: cilium-operator
     spec:
       containers:
       - name: cilium-operator
-        image: quay.io/cilium/operator-generic:v1.14.5@sha256:303f9076bdc73b3fc32aaedee64a14f6f44c8bb08ee9e3956d443021103ebe7a
+        image: quay.io/cilium/operator-generic:v1.15.0-rc.0@sha256:cc0800697151d9a68c9547c66e9d5f4a67537efd369cb10caf19e79748b24b02
         imagePullPolicy: IfNotPresent
         command:
         - cilium-operator-generic
         args:
         - --config-dir=/tmp/cilium/config-map
         - --debug=$(CILIUM_DEBUG)
--- HelmRelease: kube-system/cilium Deployment: kube-system/hubble-relay

+++ HelmRelease: kube-system/cilium Deployment: kube-system/hubble-relay

@@ -34,27 +34,35 @@

           capabilities:
             drop:
             - ALL
           runAsGroup: 65532
           runAsNonRoot: true
           runAsUser: 65532
-        image: quay.io/cilium/hubble-relay:v1.14.5@sha256:dbef89f924a927043d02b40c18e417c1ea0e8f58b44523b80fef7e3652db24d4
+        image: quay.io/cilium/hubble-relay:v1.15.0-rc.0@sha256:eb89a6c12bef00f62f393630958f58d769f0add5ba6fa914180ec21d845034ae
         imagePullPolicy: IfNotPresent
         command:
         - hubble-relay
         args:
         - serve
         ports:
         - name: grpc
           containerPort: 4245
         readinessProbe:
-          tcpSocket:
-            port: grpc
+          grpc:
+            port: 4222
+          timeoutSeconds: 3
         livenessProbe:
-          tcpSocket:
-            port: grpc
+          grpc:
+            port: 4222
+          timeoutSeconds: 3
+        startupProbe:
+          grpc:
+            port: 4222
+          timeoutSeconds: 3
+          failureThreshold: 20
+          periodSeconds: 3
         volumeMounts:
         - name: config
           mountPath: /etc/hubble-relay
           readOnly: true
         - name: tls
           mountPath: /var/lib/hubble-relay/tls
--- HelmRelease: kube-system/cilium Deployment: kube-system/hubble-ui

+++ HelmRelease: kube-system/cilium Deployment: kube-system/hubble-ui

@@ -17,13 +17,13 @@

     rollingUpdate:
       maxUnavailable: 1
     type: RollingUpdate
   template:
     metadata:
       annotations:
-        cilium.io/hubble-ui-nginx-configmap-checksum: 02d6b04b131029fae39270192dcff10fa3a64af9d1d4d0049f1efbc3f5526a34
+        cilium.io/hubble-ui-nginx-configmap-checksum: e8acee96ed990156efd0291c8c33709d2c7902d2ec993eefa16c7cd3d1a9d84b
       labels:
         k8s-app: hubble-ui
         app.kubernetes.io/name: hubble-ui
         app.kubernetes.io/part-of: cilium
     spec:
       priorityClassName: null
@@ -34,12 +34,20 @@

       - name: frontend
         image: quay.io/cilium/hubble-ui:v0.12.1@sha256:9e5f81ee747866480ea1ac4630eb6975ff9227f9782b7c93919c081c33f38267
         imagePullPolicy: IfNotPresent
         ports:
         - name: http
           containerPort: 8081
+        livenessProbe:
+          httpGet:
+            path: /healthz
+            port: 8081
+        readinessProbe:
+          httpGet:
+            path: /
+            port: 8081
         volumeMounts:
         - name: hubble-ui-nginx-conf
           mountPath: /etc/nginx/conf.d/default.conf
           subPath: nginx.conf
         - name: tmp-dir
           mountPath: /tmp
--- HelmRelease: kube-system/cilium ConfigMap: kube-system/hubble-dns-namespace

+++ HelmRelease: kube-system/cilium ConfigMap: kube-system/hubble-dns-namespace

@@ -0,0 +1,240 @@

+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: hubble-dns-namespace
+  namespace: kube-system
+  labels:
+    k8s-app: hubble
+    app.kubernetes.io/name: hubble
+    app.kubernetes.io/part-of: cilium
+    grafana_dashboard: '1'
+  annotations:
+    grafana_folder: Cilium
+data:
+  hubble-dns-namespace.json: "{\n    \"__inputs\": [\n      {\n        \"name\": \"\
+    DS_PROMETHEUS\",\n        \"label\": \"Prometheus\",\n        \"description\"\
+    : \"\",\n        \"type\": \"datasource\",\n        \"pluginId\": \"prometheus\"\
+    ,\n        \"pluginName\": \"Prometheus\"\n      }\n    ],\n    \"__elements\"\
+    : {},\n    \"__requires\": [\n      {\n        \"type\": \"panel\",\n        \"\
+    id\": \"bargauge\",\n        \"name\": \"Bar gauge\",\n        \"version\": \"\
+    \"\n      },\n      {\n        \"type\": \"grafana\",\n        \"id\": \"grafana\"\
+    ,\n        \"name\": \"Grafana\",\n        \"version\": \"9.4.7\"\n      },\n\
+    \      {\n        \"type\": \"datasource\",\n        \"id\": \"prometheus\",\n\
+    \        \"name\": \"Prometheus\",\n        \"version\": \"1.0.0\"\n      },\n\
+    \      {\n        \"type\": \"panel\",\n        \"id\": \"timeseries\",\n    \
+    \    \"name\": \"Time series\",\n        \"version\": \"\"\n      }\n    ],\n\
+    \    \"annotations\": {\n      \"list\": [\n        {\n          \"builtIn\":\
+    \ 1,\n          \"datasource\": {\n            \"type\": \"datasource\",\n   \
+    \         \"uid\": \"grafana\"\n          },\n          \"enable\": true,\n  \
+    \        \"hide\": true,\n          \"iconColor\": \"rgba(0, 211, 255, 1)\",\n\
+    \          \"name\": \"Annotations & Alerts\",\n          \"target\": {\n    \
+    \        \"limit\": 100,\n            \"matchAny\": false,\n            \"tags\"\
+    : [],\n            \"type\": \"dashboard\"\n          },\n          \"type\":\
+    \ \"dashboard\"\n        }\n      ]\n    },\n    \"description\": \"\",\n    \"\
+    editable\": true,\n    \"fiscalYearStartMonth\": 0,\n    \"gnetId\": 16612,\n\
+    \    \"graphTooltip\": 0,\n    \"id\": null,\n    \"links\": [\n      {\n    \
+    \    \"asDropdown\": true,\n        \"icon\": \"external link\",\n        \"includeVars\"\
+    : true,\n        \"keepTime\": true,\n        \"tags\": [\n          \"cilium-overview\"\
+    \n        ],\n        \"targetBlank\": false,\n        \"title\": \"Cilium Overviews\"\
+    ,\n        \"tooltip\": \"\",\n        \"type\": \"dashboards\",\n        \"url\"\
+    : \"\"\n      },\n      {\n        \"asDropdown\": true,\n        \"icon\": \"\
+    external link\",\n        \"includeVars\": false,\n        \"keepTime\": true,\n\
+    \        \"tags\": [\n          \"hubble\"\n        ],\n        \"targetBlank\"\
+    : false,\n        \"title\": \"Hubble\",\n        \"tooltip\": \"\",\n       \
+    \ \"type\": \"dashboards\",\n        \"url\": \"\"\n      }\n    ],\n    \"liveNow\"\
+    : false,\n    \"panels\": [\n      {\n        \"collapsed\": false,\n        \"\
+    gridPos\": {\n          \"h\": 1,\n          \"w\": 24,\n          \"x\": 0,\n\
+    \          \"y\": 0\n        },\n        \"id\": 2,\n        \"panels\": [],\n\
+    \        \"title\": \"DNS\",\n        \"type\": \"row\"\n      },\n      {\n \
+    \       \"datasource\": {\n          \"type\": \"prometheus\",\n          \"uid\"\
+    : \"${DS_PROMETHEUS}\"\n        },\n        \"description\": \"\",\n        \"\
+    fieldConfig\": {\n          \"defaults\": {\n            \"color\": {\n      \
+    \        \"mode\": \"palette-classic\"\n            },\n            \"custom\"\
+    : {\n              \"axisCenteredZero\": false,\n              \"axisColorMode\"\
+    : \"text\",\n              \"axisLabel\": \"\",\n              \"axisPlacement\"\
+    : \"auto\",\n              \"barAlignment\": 0,\n              \"drawStyle\":\
+    \ \"line\",\n              \"fillOpacity\": 10,\n              \"gradientMode\"\
+    : \"none\",\n              \"hideFrom\": {\n                \"legend\": false,\n\
+    \                \"tooltip\": false,\n                \"viz\": false\n       \
+    \       },\n              \"lineInterpolation\": \"linear\",\n              \"\
+    lineWidth\": 1,\n              \"pointSize\": 5,\n              \"scaleDistribution\"\
+    : {\n                \"type\": \"linear\"\n              },\n              \"\
+    showPoints\": \"auto\",\n              \"spanNulls\": false,\n              \"\
+    stacking\": {\n                \"group\": \"A\",\n                \"mode\": \"\
+    normal\"\n              },\n              \"thresholdsStyle\": {\n           \
+    \     \"mode\": \"off\"\n              }\n            },\n            \"mappings\"\
+    : [],\n            \"min\": 0,\n            \"thresholds\": {\n              \"\
+    mode\": \"absolute\",\n              \"steps\": [\n                {\n       \
+    \           \"color\": \"green\",\n                  \"value\": null\n       \
+    \         },\n                {\n                  \"color\": \"red\",\n     \
+    \             \"value\": 80\n                }\n              ]\n            },\n\
+    \            \"unit\": \"reqps\"\n          },\n          \"overrides\": []\n\
+    \        },\n        \"gridPos\": {\n          \"h\": 9,\n          \"w\": 12,\n\
+    \          \"x\": 0,\n          \"y\": 1\n        },\n        \"id\": 37,\n  \
+    \      \"options\": {\n          \"legend\": {\n            \"calcs\": [\n   \
+    \           \"mean\",\n              \"lastNotNull\"\n            ],\n       \
+    \     \"displayMode\": \"table\",\n            \"placement\": \"bottom\",\n  \
+    \          \"showLegend\": true\n          },\n          \"tooltip\": {\n    \
+    \        \"mode\": \"single\",\n            \"sort\": \"none\"\n          }\n\
+    \        },\n        \"targets\": [\n          {\n            \"datasource\":\
+    \ {\n              \"type\": \"prometheus\",\n              \"uid\": \"${DS_PROMETHEUS}\"\
+    \n            },\n            \"editorMode\": \"code\",\n            \"expr\"\
+    : \"sum(rate(hubble_dns_queries_total{cluster=~\\\"$cluster\\\", source_namespace=~\\\
+    \"$source_namespace\\\", destination_namespace=~\\\"$destination_namespace\\\"\
+    }[$__rate_interval])) by (source) > 0\",\n            \"legendFormat\": \"{{source}}\"\
+    ,\n            \"range\": true,\n            \"refId\": \"A\"\n          }\n \
+    \       ],\n        \"title\": \"DNS queries\",\n        \"type\": \"timeseries\"\
+    \n      },\n      {\n        \"datasource\": {\n          \"type\": \"prometheus\"\
+    ,\n          \"uid\": \"${DS_PROMETHEUS}\"\n        },\n        \"fieldConfig\"\
+    : {\n          \"defaults\": {\n            \"color\": {\n              \"mode\"\
+    : \"thresholds\"\n            },\n            \"mappings\": [],\n            \"\
+    min\": 0,\n            \"thresholds\": {\n              \"mode\": \"absolute\"\
+    ,\n              \"steps\": [\n                {\n                  \"color\"\
+    : \"green\",\n                  \"value\": null\n                }\n         \
+    \     ]\n            },\n            \"unit\": \"reqps\"\n          },\n     \
+    \     \"overrides\": []\n        },\n        \"gridPos\": {\n          \"h\":\
+    \ 9,\n          \"w\": 12,\n          \"x\": 12,\n          \"y\": 1\n       \
+    \ },\n        \"id\": 41,\n        \"options\": {\n          \"displayMode\":\
+    \ \"gradient\",\n          \"minVizHeight\": 10,\n          \"minVizWidth\": 0,\n\
+    \          \"orientation\": \"horizontal\",\n          \"reduceOptions\": {\n\
+    \            \"calcs\": [\n              \"lastNotNull\"\n            ],\n   \
+    \         \"fields\": \"\",\n            \"values\": false\n          },\n   \
+    \       \"showUnfilled\": true\n        },\n        \"pluginVersion\": \"9.4.7\"\
+    ,\n        \"targets\": [\n          {\n            \"datasource\": {\n      \
+    \        \"type\": \"prometheus\",\n              \"uid\": \"${DS_PROMETHEUS}\"\
+    \n            },\n            \"editorMode\": \"code\",\n            \"expr\"\
+    : \"topk(10, sum(rate(hubble_dns_queries_total{cluster=~\\\"$cluster\\\", source_namespace=~\\\
+    \"$source_namespace\\\", destination_namespace=~\\\"$destination_namespace\\\"\
+    }[$__rate_interval])*60) by (query))\",\n            \"legendFormat\": \"{{query}}\"\
+    ,\n            \"range\": true,\n            \"refId\": \"A\"\n          }\n \
+    \       ],\n        \"title\": \"Top 10 DNS queries\",\n        \"type\": \"bargauge\"\
+    \n      },\n      {\n        \"datasource\": {\n          \"type\": \"prometheus\"\
+    ,\n          \"uid\": \"${DS_PROMETHEUS}\"\n        },\n        \"fieldConfig\"\
+    : {\n          \"defaults\": {\n            \"color\": {\n              \"mode\"\
+    : \"palette-classic\"\n            },\n            \"custom\": {\n           \
+    \   \"axisCenteredZero\": false,\n              \"axisColorMode\": \"text\",\n\
+    \              \"axisLabel\": \"\",\n              \"axisPlacement\": \"auto\"\
+    ,\n              \"barAlignment\": 0,\n              \"drawStyle\": \"line\",\n\
+    \              \"fillOpacity\": 10,\n              \"gradientMode\": \"none\"\
+    ,\n              \"hideFrom\": {\n                \"legend\": false,\n       \
+    \         \"tooltip\": false,\n                \"viz\": false\n              },\n\
+    \              \"lineInterpolation\": \"linear\",\n              \"lineWidth\"\
+    : 1,\n              \"pointSize\": 5,\n              \"scaleDistribution\": {\n\
+    \                \"type\": \"linear\"\n              },\n              \"showPoints\"\
+    : \"auto\",\n              \"spanNulls\": false,\n              \"stacking\":\
+    \ {\n                \"group\": \"A\",\n                \"mode\": \"normal\"\n\
[Diff truncated by flux-local]
--- HelmRelease: kube-system/cilium ConfigMap: kube-system/hubble-network-overview-namespace

+++ HelmRelease: kube-system/cilium ConfigMap: kube-system/hubble-network-overview-namespace

@@ -0,0 +1,396 @@

+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: hubble-network-overview-namespace
+  namespace: kube-system
+  labels:
+    k8s-app: hubble
+    app.kubernetes.io/name: hubble
+    app.kubernetes.io/part-of: cilium
+    grafana_dashboard: '1'
+  annotations:
+    grafana_folder: Cilium
+data:
+  hubble-network-overview-namespace.json: "{\n    \"__inputs\": [\n      {\n     \
+    \   \"name\": \"DS_PROMETHEUS\",\n        \"label\": \"Prometheus\",\n       \
+    \ \"description\": \"\",\n        \"type\": \"datasource\",\n        \"pluginId\"\
+    : \"prometheus\",\n        \"pluginName\": \"Prometheus\"\n      }\n    ],\n \
+    \   \"__elements\": {},\n    \"__requires\": [\n      {\n        \"type\": \"\
+    panel\",\n        \"id\": \"bargauge\",\n        \"name\": \"Bar gauge\",\n  \
+    \      \"version\": \"\"\n      },\n      {\n        \"type\": \"grafana\",\n\
+    \        \"id\": \"grafana\",\n        \"name\": \"Grafana\",\n        \"version\"\
+    : \"9.4.7\"\n      },\n      {\n        \"type\": \"datasource\",\n        \"\
+    id\": \"prometheus\",\n        \"name\": \"Prometheus\",\n        \"version\"\
+    : \"1.0.0\"\n      },\n      {\n        \"type\": \"panel\",\n        \"id\":\
+    \ \"timeseries\",\n        \"name\": \"Time series\",\n        \"version\": \"\
+    \"\n      }\n    ],\n    \"annotations\": {\n      \"list\": [\n        {\n  \
+    \        \"builtIn\": 1,\n          \"datasource\": {\n            \"type\": \"\
+    datasource\",\n            \"uid\": \"grafana\"\n          },\n          \"enable\"\
+    : true,\n          \"hide\": true,\n          \"iconColor\": \"rgba(0, 211, 255,\
+    \ 1)\",\n          \"name\": \"Annotations & Alerts\",\n          \"target\":\
+    \ {\n            \"limit\": 100,\n            \"matchAny\": false,\n         \
+    \   \"tags\": [],\n            \"type\": \"dashboard\"\n          },\n       \
+    \   \"type\": \"dashboard\"\n        }\n      ]\n    },\n    \"description\":\
+    \ \"\",\n    \"editable\": true,\n    \"fiscalYearStartMonth\": 0,\n    \"gnetId\"\
+    : 16612,\n    \"graphTooltip\": 0,\n    \"id\": null,\n    \"links\": [\n    \
+    \  {\n        \"asDropdown\": true,\n        \"icon\": \"external link\",\n  \
+    \      \"includeVars\": true,\n        \"keepTime\": true,\n        \"tags\":\
+    \ [\n          \"cilium-overview\"\n        ],\n        \"targetBlank\": false,\n\
+    \        \"title\": \"Cilium Overviews\",\n        \"tooltip\": \"\",\n      \
+    \  \"type\": \"dashboards\",\n        \"url\": \"\"\n      },\n      {\n     \
+    \   \"asDropdown\": true,\n        \"icon\": \"external link\",\n        \"includeVars\"\
+    : false,\n        \"keepTime\": true,\n        \"tags\": [\n          \"hubble\"\
+    \n        ],\n        \"targetBlank\": false,\n        \"title\": \"Hubble\",\n\
+    \        \"tooltip\": \"\",\n        \"type\": \"dashboards\",\n        \"url\"\
+    : \"\"\n      }\n    ],\n    \"liveNow\": false,\n    \"panels\": [\n      {\n\
+    \        \"collapsed\": false,\n        \"gridPos\": {\n          \"h\": 1,\n\
+    \          \"w\": 24,\n          \"x\": 0,\n          \"y\": 0\n        },\n \
+    \       \"id\": 8,\n        \"panels\": [],\n        \"title\": \"Flows processed\"\
+    ,\n        \"type\": \"row\"\n      },\n      {\n        \"datasource\": {\n \
+    \         \"type\": \"prometheus\",\n          \"uid\": \"${DS_PROMETHEUS}\"\n\
+    \        },\n        \"fieldConfig\": {\n          \"defaults\": {\n         \
+    \   \"color\": {\n              \"mode\": \"palette-classic\"\n            },\n\
+    \            \"custom\": {\n              \"axisCenteredZero\": false,\n     \
+    \         \"axisColorMode\": \"text\",\n              \"axisLabel\": \"\",\n \
+    \             \"axisPlacement\": \"auto\",\n              \"barAlignment\": 0,\n\
+    \              \"drawStyle\": \"line\",\n              \"fillOpacity\": 10,\n\
+    \              \"gradientMode\": \"none\",\n              \"hideFrom\": {\n  \
+    \              \"legend\": false,\n                \"tooltip\": false,\n     \
+    \           \"viz\": false\n              },\n              \"lineInterpolation\"\
+    : \"linear\",\n              \"lineWidth\": 1,\n              \"pointSize\": 5,\n\
+    \              \"scaleDistribution\": {\n                \"type\": \"linear\"\n\
+    \              },\n              \"showPoints\": \"auto\",\n              \"spanNulls\"\
+    : false,\n              \"stacking\": {\n                \"group\": \"A\",\n \
+    \               \"mode\": \"normal\"\n              },\n              \"thresholdsStyle\"\
+    : {\n                \"mode\": \"off\"\n              }\n            },\n    \
+    \        \"mappings\": [],\n            \"min\": 0,\n            \"thresholds\"\
+    : {\n              \"mode\": \"absolute\",\n              \"steps\": [\n     \
+    \           {\n                  \"color\": \"green\",\n                  \"value\"\
+    : null\n                },\n                {\n                  \"color\": \"\
+    red\",\n                  \"value\": 80\n                }\n              ]\n\
+    \            },\n            \"unit\": \"ops\"\n          },\n          \"overrides\"\
+    : []\n        },\n        \"gridPos\": {\n          \"h\": 9,\n          \"w\"\
+    : 12,\n          \"x\": 0,\n          \"y\": 1\n        },\n        \"id\": 12,\n\
+    \        \"options\": {\n          \"legend\": {\n            \"calcs\": [],\n\
+    \            \"displayMode\": \"list\",\n            \"placement\": \"bottom\"\
+    ,\n            \"showLegend\": true\n          },\n          \"tooltip\": {\n\
+    \            \"mode\": \"single\",\n            \"sort\": \"none\"\n         \
+    \ }\n        },\n        \"targets\": [\n          {\n            \"datasource\"\
+    : {\n              \"type\": \"prometheus\",\n              \"uid\": \"${DS_PROMETHEUS}\"\
+    \n            },\n            \"editorMode\": \"code\",\n            \"expr\"\
+    : \"sum(rate(hubble_flows_processed_total{cluster=~\\\"$cluster\\\", source_namespace=~\\\
+    \"$source_namespace\\\", destination_namespace=~\\\"$destination_namespace\\\"\
+    }[$__rate_interval])) by (type, subtype)\",\n            \"legendFormat\": \"\
+    {{type}}/{{subtype}}\",\n            \"range\": true,\n            \"refId\":\
+    \ \"A\"\n          }\n        ],\n        \"title\": \"Flows processed by type\"\
+    ,\n        \"type\": \"timeseries\"\n      },\n      {\n        \"datasource\"\
+    : {\n          \"type\": \"prometheus\",\n          \"uid\": \"${DS_PROMETHEUS}\"\
+    \n        },\n        \"fieldConfig\": {\n          \"defaults\": {\n        \
+    \    \"color\": {\n              \"mode\": \"palette-classic\"\n            },\n\
+    \            \"custom\": {\n              \"axisCenteredZero\": false,\n     \
+    \         \"axisColorMode\": \"text\",\n              \"axisLabel\": \"\",\n \
+    \             \"axisPlacement\": \"auto\",\n              \"barAlignment\": 0,\n\
+    \              \"drawStyle\": \"line\",\n              \"fillOpacity\": 10,\n\
+    \              \"gradientMode\": \"none\",\n              \"hideFrom\": {\n  \
+    \              \"legend\": false,\n                \"tooltip\": false,\n     \
+    \           \"viz\": false\n              },\n              \"lineInterpolation\"\
+    : \"linear\",\n              \"lineWidth\": 1,\n              \"pointSize\": 5,\n\
+    \              \"scaleDistribution\": {\n                \"type\": \"linear\"\n\
+    \              },\n              \"showPoints\": \"auto\",\n              \"spanNulls\"\
+    : false,\n              \"stacking\": {\n                \"group\": \"A\",\n \
+    \               \"mode\": \"normal\"\n              },\n              \"thresholdsStyle\"\
+    : {\n                \"mode\": \"off\"\n              }\n            },\n    \
+    \        \"mappings\": [],\n            \"min\": 0,\n            \"thresholds\"\
+    : {\n              \"mode\": \"absolute\",\n              \"steps\": [\n     \
+    \           {\n                  \"color\": \"green\",\n                  \"value\"\
+    : null\n                },\n                {\n                  \"color\": \"\
+    red\",\n                  \"value\": 80\n                }\n              ]\n\
+    \            },\n            \"unit\": \"ops\"\n          },\n          \"overrides\"\
+    : []\n        },\n        \"gridPos\": {\n          \"h\": 9,\n          \"w\"\
+    : 12,\n          \"x\": 12,\n          \"y\": 1\n        },\n        \"id\": 35,\n\
+    \        \"options\": {\n          \"legend\": {\n            \"calcs\": [],\n\
+    \            \"displayMode\": \"list\",\n            \"placement\": \"bottom\"\
+    ,\n            \"showLegend\": true\n          },\n          \"tooltip\": {\n\
+    \            \"mode\": \"single\",\n            \"sort\": \"none\"\n         \
+    \ }\n        },\n        \"targets\": [\n          {\n            \"datasource\"\
+    : {\n              \"type\": \"prometheus\",\n              \"uid\": \"${DS_PROMETHEUS}\"\
+    \n            },\n            \"editorMode\": \"code\",\n            \"expr\"\
+    : \"sum(rate(hubble_flows_processed_total{cluster=~\\\"$cluster\\\", source_namespace=~\\\
+    \"$source_namespace\\\", destination_namespace=~\\\"$destination_namespace\\\"\
+    }[$__rate_interval])) by (verdict)\",\n            \"legendFormat\": \"{{verdict}}\"\
+    ,\n            \"range\": true,\n            \"refId\": \"A\"\n          }\n \
+    \       ],\n        \"title\": \"Flows processed by verdict\",\n        \"type\"\
+    : \"timeseries\"\n      },\n      {\n        \"datasource\": {\n          \"type\"\
+    : \"prometheus\",\n          \"uid\": \"${DS_PROMETHEUS}\"\n        },\n     \
[Diff truncated by flux-local]

@bot-ross bot-ross bot added the area/ansible label Jan 4, 2024
@onedr0p onedr0p merged commit 57d6f9f into main Jan 4, 2024
7 checks passed
@onedr0p onedr0p deleted the onedr0p-patch-1 branch January 4, 2024 13:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/kubernetes Changes made in the kubernetes directory cluster/main
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant