update

Signed-off-by: zirain <[email protected]>
envoyproxy · Oct 25, 2024 · fc090d1 · fc090d1
1 parent 9f64fe8
commit fc090d1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 226 deletions.
diff --git a/test/helm/gateway-addons-helm/e2e.in.yaml b/test/helm/gateway-addons-helm/e2e.in.yaml
@@ -2,3 +2,5 @@ grafana:
   enabled: false
 opentelemetry-collector:
   enabled: true
+fluent-bit:
+  enabled: false
diff --git a/test/helm/gateway-addons-helm/e2e.out.yaml b/test/helm/gateway-addons-helm/e2e.out.yaml
@@ -15,19 +15,6 @@ metadata:
     app.kubernetes.io/part-of: alloy
     app.kubernetes.io/component: rbac
 ---
-# Source: gateway-addons-helm/charts/fluent-bit/templates/serviceaccount.yaml
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: fluent-bit
-  namespace: monitoring
-  labels:
-    helm.sh/chart: fluent-bit-0.30.4
-    app.kubernetes.io/name: fluent-bit
-    app.kubernetes.io/instance: gateway-addons-helm
-    app.kubernetes.io/version: "2.1.4"
-    app.kubernetes.io/managed-by: Helm
----
 # Source: gateway-addons-helm/charts/loki/templates/serviceaccount.yaml
 apiVersion: v1
 kind: ServiceAccount
@@ -197,74 +184,6 @@ data:
       forward_to = [loki.write.alloy.receiver]
     }
 ---
-# Source: gateway-addons-helm/charts/fluent-bit/templates/configmap.yaml
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: fluent-bit
-  namespace: monitoring
-  labels:
-    helm.sh/chart: fluent-bit-0.30.4
-    app.kubernetes.io/name: fluent-bit
-    app.kubernetes.io/instance: gateway-addons-helm
-    app.kubernetes.io/version: "2.1.4"
-    app.kubernetes.io/managed-by: Helm
-data:
-  custom_parsers.conf: |
-    [PARSER]
-        Name docker_no_time
-        Format json
-        Time_Keep Off
-        Time_Key time
-        Time_Format %Y-%m-%dT%H:%M:%S.%L
-    
-  fluent-bit.conf: |
-    [SERVICE]
-        Daemon Off
-        Flush 1
-        Log_Level info
-        Parsers_File parsers.conf
-        Parsers_File custom_parsers.conf
-        HTTP_Server On
-        HTTP_Listen 0.0.0.0
-        HTTP_Port 2020
-        Health_Check On
-    
-    [INPUT]
-        Name tail
-        Path /var/log/containers/*.log
-        multiline.parser docker, cri
-        Tag kube.*
-        Mem_Buf_Limit 5MB
-        Skip_Long_Lines On
-    
-    [FILTER]
-        Name kubernetes
-        Match kube.*
-        Merge_Log On
-        Keep_Log Off
-        K8S-Logging.Parser On
-        K8S-Logging.Exclude On
-    
-    [FILTER]
-        Name grep
-        Match kube.*
-        Regex $kubernetes['container_name'] ^envoy$
-    
-    [FILTER]
-        Name parser
-        Match kube.*
-        Key_Name log
-        Parser envoy
-        Reserve_Data True
-    
-    [OUTPUT]
-        Name                   loki
-        Match                  kube.*
-        Host                   loki.monitoring.svc.cluster.local
-        Port                   3100
-        Labels                 job=fluentbit, app=$kubernetes['labels']['app'], k8s_namespace_name=$kubernetes['namespace_name'], k8s_pod_name=$kubernetes['pod_name'], k8s_container_name=$kubernetes['container_name']
----
 # Source: gateway-addons-helm/charts/loki/templates/configmap.yaml
 apiVersion: v1
 kind: ConfigMap
@@ -9526,28 +9445,6 @@ rules:
     resources: ["replicasets"]
     verbs: ["get", "list", "watch"]
 ---
-# Source: gateway-addons-helm/charts/fluent-bit/templates/clusterrole.yaml
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: fluent-bit
-  labels:
-    helm.sh/chart: fluent-bit-0.30.4
-    app.kubernetes.io/name: fluent-bit
-    app.kubernetes.io/instance: gateway-addons-helm
-    app.kubernetes.io/version: "2.1.4"
-    app.kubernetes.io/managed-by: Helm
-rules:
-  - apiGroups:
-      - ""
-    resources:
-      - namespaces
-      - pods
-    verbs:
-      - get
-      - list
-      - watch
----
 # Source: gateway-addons-helm/charts/prometheus/templates/clusterrole.yaml
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
@@ -9623,26 +9520,6 @@ subjects:
     name: alloy
     namespace: monitoring
 ---
-# Source: gateway-addons-helm/charts/fluent-bit/templates/clusterrolebinding.yaml
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: fluent-bit
-  labels:
-    helm.sh/chart: fluent-bit-0.30.4
-    app.kubernetes.io/name: fluent-bit
-    app.kubernetes.io/instance: gateway-addons-helm
-    app.kubernetes.io/version: "2.1.4"
-    app.kubernetes.io/managed-by: Helm
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: fluent-bit
-subjects:
-  - kind: ServiceAccount
-    name: fluent-bit
-    namespace: monitoring
----
 # Source: gateway-addons-helm/charts/prometheus/templates/clusterrolebinding.yaml
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
@@ -9691,29 +9568,6 @@ spec:
       targetPort: 12345
       protocol: "TCP"
 ---
-# Source: gateway-addons-helm/charts/fluent-bit/templates/service.yaml
-apiVersion: v1
-kind: Service
-metadata:
-  name: fluent-bit
-  namespace: monitoring
-  labels:
-    helm.sh/chart: fluent-bit-0.30.4
-    app.kubernetes.io/name: fluent-bit
-    app.kubernetes.io/instance: gateway-addons-helm
-    app.kubernetes.io/version: "2.1.4"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  type: ClusterIP
-  ports:
-    - port: 2020
-      targetPort: http
-      protocol: TCP
-      name: http
-  selector:
-    app.kubernetes.io/name: fluent-bit
-    app.kubernetes.io/instance: gateway-addons-helm
----
 # Source: gateway-addons-helm/charts/loki/templates/service-memberlist.yaml
 apiVersion: v1
 kind: Service
@@ -10005,85 +9859,6 @@ spec:
           configMap:
             name: alloy
 ---
-# Source: gateway-addons-helm/charts/fluent-bit/templates/daemonset.yaml
-apiVersion: apps/v1
-kind: DaemonSet
-metadata:
-  name: fluent-bit
-  namespace: monitoring
-  labels:
-    helm.sh/chart: fluent-bit-0.30.4
-    app.kubernetes.io/name: fluent-bit
-    app.kubernetes.io/instance: gateway-addons-helm
-    app.kubernetes.io/version: "2.1.4"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: fluent-bit
-      app.kubernetes.io/instance: gateway-addons-helm
-  template:
-    metadata:
-      annotations:
-        checksum/config: 03d122555879033ccf6443369f73463490b100f195550b1483d337f497c749e3
-        checksum/luascripts: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
-        fluentbit.io/exclude: "true"
-        prometheus.io/path: /api/v1/metrics/prometheus
-        prometheus.io/port: "2020"
-        prometheus.io/scrape: "true"
-      labels:
-        app.kubernetes.io/name: fluent-bit
-        app.kubernetes.io/instance: gateway-addons-helm
-    spec:
-      serviceAccountName: fluent-bit
-      hostNetwork: false
-      dnsPolicy: ClusterFirst
-      containers:
-        - name: fluent-bit
-          image: "fluent/fluent-bit:2.1.4"
-          imagePullPolicy: Always
-          ports:
-            - name: http
-              containerPort: 2020
-              protocol: TCP
-          livenessProbe:
-            httpGet:
-              path: /
-              port: http
-          readinessProbe:
-            httpGet:
-              path: /api/v1/health
-              port: http
-          volumeMounts:
-            - mountPath: /fluent-bit/etc/fluent-bit.conf
-              name: config
-              subPath: fluent-bit.conf
-            - mountPath: /fluent-bit/etc/custom_parsers.conf
-              name: config
-              subPath: custom_parsers.conf
-            - mountPath: /var/log
-              name: varlog
-            - mountPath: /var/lib/docker/containers
-              name: varlibdockercontainers
-              readOnly: true
-            - mountPath: /etc/machine-id
-              name: etcmachineid
-              readOnly: true
-      volumes:
-        - name: config
-          configMap:
-            name: fluent-bit
-        - hostPath:
-            path: /var/log
-          name: varlog
-        - hostPath:
-            path: /var/lib/docker/containers
-          name: varlibdockercontainers
-        - hostPath:
-            path: /etc/machine-id
-            type: File
-          name: etcmachineid
----
 # Source: gateway-addons-helm/charts/opentelemetry-collector/templates/deployment.yaml
 apiVersion: apps/v1
 kind: Deployment

diff --git a/tools/make/kube.mk b/tools/make/kube.mk
@@ -191,7 +191,7 @@ uninstall-benchmark-server: ## Uninstall nighthawk server for benchmark test
 .PHONY: install-eg-addons
 install-eg-addons: helm-generate.gateway-addons-helm
 	@$(LOG_TARGET)
-	helm upgrade -i eg-addons charts/gateway-addons-helm --set fluent-bit.enabled=false,grafana.enabled=false,opentelemetry-collector.enabled=true -n monitoring --create-namespace --timeout='$(WAIT_TIMEOUT)' --wait --wait-for-jobs
+	helm upgrade -i eg-addons charts/gateway-addons-helm -f test/helm/gateway-addons-helm/e2e.in.yaml -n monitoring --create-namespace --timeout='$(WAIT_TIMEOUT)' --wait --wait-for-jobs
 	# Change loki service type from ClusterIP to LoadBalancer
 	kubectl patch service loki -n monitoring -p '{"spec": {"type": "LoadBalancer"}}'
 	# Wait service Ready