Fix the sidecar ci error.

Signed-off-by: Ye Cao <[email protected]>
v6d-io · Dec 25, 2023 · 4b6ca21 · 4b6ca21
1 parent 5b0ef1a
commit 4b6ca21
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git a/k8s/pkg/templates/sidecar/injection-template.yaml b/k8s/pkg/templates/sidecar/injection-template.yaml
@@ -9,8 +9,8 @@ spec:
       image: {{ .Spec.Vineyard.Image }}
       imagePullPolicy: {{ .Spec.Vineyard.ImagePullPolicy }}
 {{- if .Spec.SecurityContext }}
-          securityContext:
-{{ toYaml .Spec.SecurityContext | indent 12 }}
+      securityContext:
+{{ toYaml .Spec.SecurityContext | indent 8 }}
 {{- end }}
       env:
       - name: VINEYARDD_UID

diff --git a/k8s/test/e2e/sidecar-demo/sidecar-with-custom-sidecar.yaml b/k8s/test/e2e/sidecar-demo/sidecar-with-custom-sidecar.yaml
@@ -20,27 +20,27 @@ metadata:
   namespace: vineyard-job
 spec:
   replicas: 2
-  selector: app=job-deployment
+  selector: app=job-deployment-with-custom-sidecar
   vineyard:
     image: localhost:5001/vineyardd:latest
     socket: /var/run/vineyard.sock
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: job-deployment
+  name: job-deployment-with-custom-sidecar
   namespace: vineyard-job
 spec:
   selector:
     matchLabels:
-      app: job-deployment
+      app: job-deployment-with-custom-sidecar
   replicas: 2
   template:
     metadata:
       annotations:
         sidecar.v6d.io/name: "sidecar-sample"
       labels:
-        app: job-deployment
+        app: job-deployment-with-custom-sidecar
         sidecar.v6d.io/enabled: "true"
     spec:
       containers:

diff --git a/k8s/test/e2e/sidecar-demo/sidecar-with-default-sidecar.yaml b/k8s/test/e2e/sidecar-demo/sidecar-with-default-sidecar.yaml
@@ -16,20 +16,20 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: job-deployment
+  name: job-deployment-with-default-sidecar
   namespace: vineyard-job
 spec:
   selector:
     matchLabels:
-      app: job-deployment
+      app: job-deployment-with-default-sidecar
   replicas: 2
   template:
     metadata:
       annotations:
         sidecar.v6d.io/name: "default"
       labels:
         app.kubernetes.io/instance: job-deployment
-        app: job-deployment
+        app: job-deployment-with-default-sidecar
         sidecar.v6d.io/enabled: "true"
     spec:
       containers:

diff --git a/k8s/test/e2e/sidecar/e2e.yaml b/k8s/test/e2e/sidecar/e2e.yaml
@@ -28,7 +28,7 @@ setup:
             --sidecar.image="localhost:5001/vineyardd:latest"| kubectl apply -f -
       wait:
         - namespace: vineyard-job
-          resource: deployment/job-deployment
+          resource: deployment/job-deployment-with-default-sidecar
           for: condition=Available
     - name: install app with default sidecar via kubectl
       command: |
@@ -40,15 +40,15 @@ setup:
           kubectl apply -f -
       wait:
         - namespace: vineyard-job1
-          resource: deployment/job-deployment
+          resource: deployment/job-deployment-with-default-sidecar
           for: condition=Available
     - name: install app with custom sidecar
       command: |
         kubectl label namespace vineyard-job sidecar-injection=enabled
         kubectl apply -f k8s/test/e2e/sidecar-demo/sidecar-with-custom-sidecar.yaml
       wait:
         - namespace: vineyard-job
-          resource: deployment/job-deployment
+          resource: deployment/job-deployment-with-custom-sidecar
           for: condition=Available
   timeout: 20m
 

diff --git a/prometheus/grok_exporter.yml b/prometheus/grok_exporter.yml
@@ -1,5 +1,6 @@
 global:
   config_version: 3
+  retention_check_interval: 5s
 input:
   type: file
   path: /var/log/vineyard/vineyard.*.log.INFO.*