fix hubble enable flag

Signed-off-by: l1b0k <[email protected]>

Author: l1b0k

cmd/terway-cli/policy.go

@@ -30,7 +30,7 @@ type PolicyConfig struct {
 }
 
 type CNIConfig struct {
-	HubbleEnabled       bool   `json:"cilium_enable_hubble,omitempty"`
+	HubbleEnabled       string `json:"cilium_enable_hubble,omitempty"`
 	HubbleMetrics       string `json:"cilium_hubble_metrics,omitempty"`
 	HubbleListenAddress string `json:"cilium_hubble_listen_address,omitempty"`
 	HubbleMetricServer  string `json:"cilium_hubble_metrics_server,omitempty"`
@@ -272,7 +272,7 @@ func policyConfig(container *gabs.Container) ([]string, error) {
 			return nil, fmt.Errorf("failed to unmarshal args: %w", err)
 		}
 
-		if h.HubbleEnabled {
+		if h.HubbleEnabled == "true" {
 			if h.HubbleMetrics == "" {
 				h.HubbleMetrics = "drop"
 			}

cmd/terway-cli/policy_test.go

@@ -150,6 +150,46 @@ func Test_policyConfig(t *testing.T) {
 				assert.Contains(t, strings, "--other=false")
 			},
 		},
+		{
+			name: "test hubble",
+			args: args{container: func() *gabs.Container {
+				cniJSON, _ := gabs.ParseJSON([]byte(`{
+  "cniVersion": "0.4.0",
+  "name": "terway-chainer",
+  "plugins": [
+    {
+      "bandwidth_mode": "edt",
+      "capabilities": {
+        "bandwidth": true
+      },
+      "cilium_args": "disable-per-package-lb=true",
+      "eniip_virtual_type": "datapathv2",
+      "network_policy_provider": "ebpf",
+      "cilium_enable_hubble": "true",
+      "cilium_hubble_listen_address": ":4244",
+      "cilium_hubble_metrics_server": ":9091",
+      "cilium_hubble_metrics": "drop,tcp,flow,port-distribution,icmp",
+      "type": "terway"
+    },
+    {
+      "data-path": "datapathv2",
+      "enable-debug": false,
+      "log-file": "/var/run/cilium/cilium-cni.log",
+      "type": "cilium-cni"
+    }
+  ]
+}`))
+				return cniJSON
+			}()},
+			readFunc: func(name string) ([]byte, error) {
+				return []byte("#define DIRECT_ROUTING_DEV_IFINDEX 0\n#define DISABLE_PER_PACKET_LB 1\n"), nil
+			},
+			checkFunc: func(t *testing.T, strings []string, err error) {
+				assert.NoError(t, err)
+				assert.Contains(t, strings, "--disable-per-package-lb=true")
+				assert.Contains(t, strings, "--enable-hubble=true")
+			},
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {