Update rover and satellite for eBPF Access Log (#157)

apache · Jan 19, 2024 · cf88376 · cf88376
1 parent 1c602a9
commit cf88376
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/Makefile.in b/Makefile.in
@@ -43,9 +43,9 @@ SW_AGENT_NODEJS_BACKEND_VERSION ?= 59ef1aed6a404e2e8afffbb4b81ea849ae4f3026
 SW_AGENT_NODEJS_FRONTEND_VERSION ?= 1e31bd17dcebb616163d848fc435f3a2d4822fb8
 
 SW_SATELLITE_IMAGE ?= ghcr.io/apache/skywalking-satellite/skywalking-satellite
-SW_SATELLITE_IMAGE_TAG ?= v38a86a5408c30b805bce2b5c79b7e8000e917a68
+SW_SATELLITE_IMAGE_TAG ?= v261daa37cfe4abbae6e12ef5706a941b4357b815
 
-SW_ROVER_IMAGE ?= ghcr.io/apache/skywalking-rover/skywalking-rover:9da447851549b20d12e762d8e180be47f7b7b986
+SW_ROVER_IMAGE ?= ghcr.io/apache/skywalking-rover/skywalking-rover:fd119ed0c652a5c33b7513b558937615febc6d63
 
 SWCK_OPERATOR_IMAGE ?= docker.io/apache/skywalking-swck
 SWCK_OPERATOR_IMAGE_TAG ?= v0.7.0

diff --git a/deploy/platform/kubernetes/templates/feature-rover/resources.yaml b/deploy/platform/kubernetes/templates/feature-rover/resources.yaml
@@ -47,6 +47,9 @@ spec:
             - name: host
               mountPath: /host
               readOnly: true
+            - name: sys
+              mountPath: /sys
+              readOnly: true
           env:
             - name: ROVER_PROCESS_DISCOVERY_KUBERNETES_ACTIVE
               value: "true"
@@ -57,13 +60,21 @@ spec:
             - name: ROVER_BACKEND_ADDR
               value: {{ template "skywalking.collector.address" . }}
             - name: ROVER_PROCESS_DISCOVERY_KUBERNETES_ANALYZER_ISTIO_ENVOY_SERVICE_NAME
-              value: mesh-svr::{{"{{"}}.Pod.LabelValue "service.istio.io/canonical-name,app.kubernetes.io/name,app"{{"}}"}}.{{"{{"}}.Pod.Namespace{{"}}"}}
+              value: mesh-svr::{{"{{"}}.Pod.LabelValue "service.istio.io/canonical-name,app.kubernetes.io/name,app" ""{{"}}"}}.{{"{{"}}.Pod.Namespace{{"}}"}}
             - name: ROVER_PROCESS_DISCOVERY_KUBERNETES_ANALYZER_ISTIO_APPLICATION_SERVICE_NAME
-              value: mesh-svr::{{"{{"}}.Pod.LabelValue "service.istio.io/canonical-name,app.kubernetes.io/name,app"{{"}}"}}.{{"{{"}}.Pod.Namespace{{"}}"}}
+              value: mesh-svr::{{"{{"}}.Pod.LabelValue "service.istio.io/canonical-name,app.kubernetes.io/name,app" ""{{"}}"}}.{{"{{"}}.Pod.Namespace{{"}}"}}
             - name: ROVER_PROCESS_DISCOVERY_KUBERNETES_ANALYZER_K8S_SERVICE_NAME
               value: skywalking-showcase::{{"{{"}}.Pod.ServiceName{{"}}"}}.{{"{{"}}.Pod.Namespace{{"}}"}}
             - name: ROVER_HOST_MAPPING
               value: /host
+            - name: ROVER_CORE_CLUSTER_NAME
+              value: skywalking-showcase
+            - name: ROVER_ACCESS_LOG_ACTIVE
+              value: "true"
+            - name: ROVER_ACCESS_LOG_EXCLUDE_NAMESPACES
+              value: gmp-system,kube-system,skywalking-showcase
+            - name: ROVER_ACCESS_LOG_EXCLUDE_CLUSTER
+              value: mesh-svr
       hostPID: true
       hostNetwork: true
       dnsPolicy: ClusterFirstWithHostNet
@@ -72,5 +83,10 @@ spec:
           hostPath:
             path: /
             type: Directory
+        - name: sys
+          hostPath:
+            path: /sys
+            type: Directory
+
 
 {{- end }}