Fix the sidecar ci error. (#1694)

Fixes the sidecar part of #1679

Signed-off-by: Ye Cao <[email protected]>

k8s/cmd/README.md

@@ -1464,7 +1464,7 @@ metadata:
   ownerReferences: []
 spec:
   ports:
-  - name: vineyard-sidecar-etcd-for-vineyard-port
+  - name: etcd-for-vineyard-port
     port: 2379
     protocol: TCP
     targetPort: 2379

k8s/cmd/commands/deploy/deploy_vineyard_deployment_test.go

@@ -476,7 +476,7 @@ func TestGetVineyardDeploymentObjectsFromTemplate_third(t *testing.T) {
 						"spec": map[string]interface{}{
 							"ports": []interface{}{
 								map[string]interface{}{
-									"name":       "test-vineyardd-sample-etcd-for-vineyard-port",
+									"name":       "etcd-for-vineyard-port",
 									"port":       int64(2379),
 									"protocol":   "TCP",
 									"targetPort": int64(2379),

k8s/cmd/commands/inject/inject.go

@@ -167,7 +167,7 @@ var (
 	  ownerReferences: []
 	spec:
 	  ports:
-	  - name: vineyard-sidecar-etcd-for-vineyard-port
+	  - name: etcd-for-vineyard-port
 	    port: 2379
 	    protocol: TCP
 	    targetPort: 2379

k8s/cmd/commands/inject/inject_test.go

@@ -101,7 +101,7 @@ metadata:
   ownerReferences: []
 spec:
   ports:
-  - name: vineyard-sidecar-etcd-for-vineyard-port
+  - name: etcd-for-vineyard-port
     port: 2379
     protocol: TCP
     targetPort: 2379

k8s/config/manager/kustomization.yaml

@@ -4,5 +4,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
 - name: controller
-  newName: vineyardcloudnative/vineyard-operator
+  newName: localhost:5001/vineyard-operator
   newTag: latest

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
@@ -99,7 +99,7 @@ spec:
     emptyDir: {}
   {{- end }}
 {{- if .Spec.Volumes }}
-{{ toYaml .Spec.Volumes | indent 4 }}
+{{ toYaml .Spec.Volumes | indent 2 }}
 {{- end }}
   {{- if .Spec.Metric.Enable }}
   - name: log

k8s/pkg/templates/vineyardd/etcd-service.yaml

@@ -20,7 +20,7 @@ metadata:
   namespace: {{ .Namespace }}
 spec:
   ports:
-  - name: {{ .Name }}-etcd-for-vineyard-port
+  - name: etcd-for-vineyard-port
     port: 2379
     protocol: TCP
     targetPort: 2379

k8s/pkg/webhook/sidecar/sidecar_webhook.go

@@ -37,6 +37,7 @@ import (
 	"k8s.io/client-go/util/retry"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
+	"sigs.k8s.io/yaml"
 
 	"github.com/v6d-io/v6d/k8s/apis/k8s/v1alpha1"
 	"github.com/v6d-io/v6d/k8s/pkg/config/annotations"
@@ -59,6 +60,7 @@ type Injector struct {
 func (r *Injector) Handle(ctx context.Context, req admission.Request) admission.Response {
 	logger := log.FromContext(ctx).WithName("Injector")
 
+	sidecar := &v1alpha1.Sidecar{}
 	templatePod := &corev1.Pod{}
 	pod := &corev1.Pod{}
 	if err := r.decoder.Decode(req, pod); err != nil {
@@ -67,8 +69,6 @@ func (r *Injector) Handle(ctx context.Context, req admission.Request) admission.
 
 	anno := pod.Annotations
 	if v, ok := anno[annotations.SidecarNameAnno]; ok && v == "default" {
-		// create the default sidecar cr
-		sidecar := &v1alpha1.Sidecar{}
 		// get the pod's label as cr's name
 		l := pod.Labels
 		keys := []string{}
@@ -131,29 +131,53 @@ func (r *Injector) Handle(ctx context.Context, req admission.Request) admission.
 				return admission.Errored(http.StatusInternalServerError, err)
 			}
 		}
-
-		buf, err := templates.ReadFile("sidecar/injection-template.yaml")
-		if err != nil {
-			logger.Error(err, "failed to read injection template")
+	} else {
+		// get the sidecar cr
+		if err := r.Get(
+			ctx,
+			types.NamespacedName{Name: v, Namespace: pod.Namespace},
+			sidecar,
+		); err != nil {
+			logger.Error(err, "get custom sidecar cr failed")
 			return admission.Errored(http.StatusInternalServerError, err)
 		}
+	}
+	buf, err := templates.ReadFile("sidecar/injection-template.yaml")
+	if err != nil {
+		logger.Error(err, "failed to read injection template")
+		return admission.Errored(http.StatusInternalServerError, err)
+	}
 
-		if tpl, err := template.New("sidecar").Parse(string(buf)); err == nil {
-			var buf bytes.Buffer
-			if err := tpl.Execute(&buf, sidecar); err == nil {
-				decode := scheme.Codecs.UniversalDeserializer().Decode
-				obj, _, _ := decode(buf.Bytes(), nil, nil)
-				templatePod = obj.(*corev1.Pod)
-			} else {
-				logger.Error(err, "failed to execute template")
-				return admission.Errored(http.StatusInternalServerError, err)
+	tmplFunc := map[string]interface{}{
+		"toYaml": func(v interface{}) string {
+			bs, err := yaml.Marshal(v)
+			if err != nil {
+				logger.Error(err, "failed to marshal object %v to yaml", v)
+				return ""
 			}
-		}
-		if err := r.ApplyToSidecar(sidecar, templatePod, pod, true); err != nil {
-			logger.Error(err, "failed to apply sidecar cr to pod")
+			return string(bs)
+		},
+		"indent": func(spaces int, s string) string {
+			prefix := strings.Repeat(" ", spaces)
+			return prefix + strings.Replace(s, "\n", "\n"+prefix, -1)
+		},
+	}
+
+	if tpl, err := template.New("sidecar").Funcs(tmplFunc).Parse(string(buf)); err == nil {
+		var buf bytes.Buffer
+		if err := tpl.Execute(&buf, sidecar); err == nil {
+			decode := scheme.Codecs.UniversalDeserializer().Decode
+			obj, _, _ := decode(buf.Bytes(), nil, nil)
+			templatePod = obj.(*corev1.Pod)
+		} else {
+			logger.Error(err, "failed to execute template")
 			return admission.Errored(http.StatusInternalServerError, err)
 		}
 	}
+	if err := r.ApplyToSidecar(sidecar, templatePod, pod, true); err != nil {
+		logger.Error(err, "failed to apply sidecar cr to pod")
+		return admission.Errored(http.StatusInternalServerError, err)
+	}
 
 	marshaledPod, err := json.Marshal(pod)
 	if err != nil {

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-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-with-custom-sidecar
   namespace: vineyard-job
 spec:
   selector:
     matchLabels:
-      app: job-deployment
+      app: job-with-custom-sidecar
   replicas: 2
   template:
     metadata:
       annotations:
         sidecar.v6d.io/name: "sidecar-sample"
       labels:
-        app: job-deployment
+        app: job-with-custom-sidecar
         sidecar.v6d.io/enabled: "true"
     spec:
       containers:

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-with-default-sidecar
   namespace: vineyard-job
 spec:
   selector:
     matchLabels:
-      app: job-deployment
+      app: job-with-default-sidecar
   replicas: 2
   template:
     metadata:
       annotations:
         sidecar.v6d.io/name: "default"
       labels:
-        app.kubernetes.io/instance: job-deployment
-        app: job-deployment
+        app.kubernetes.io/instance: job-with-default-sidecar
+        app: job-with-default-sidecar
         sidecar.v6d.io/enabled: "true"
     spec:
       containers:

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-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-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-with-custom-sidecar
           for: condition=Available
   timeout: 20m
 
@@ -65,23 +65,23 @@ verify:
     interval: 10s
   cases:
     - query: |
-        kubectl get pod -l app=job-deployment-with-default-sidecar -n vineyard-job -oname | \
+        kubectl get pod -l app=job-with-default-sidecar -n vineyard-job -oname | \
           awk -F '/' '{print $2}' | \
           head -n 1 | \
           xargs kubectl logs -c job -n vineyard-job | \
           yq e '{"sum": .}' - | \
           yq e 'to_entries' -
       expected: ../verify/values.yaml
     - query: |
-        kubectl get pod -l app=job-deployment-with-default-sidecar -n vineyard-job1 -oname | \
+        kubectl get pod -l app=job-with-default-sidecar -n vineyard-job1 -oname | \
           awk -F '/' '{print $2}' | \
           head -n 1 | \
           xargs kubectl logs -c job -n vineyard-job1 | \
           yq e '{"sum": .}' - | \
           yq e 'to_entries' -
       expected: ../verify/values.yaml
     - query: |
-        kubectl get pod -l app=job-deployment-with-custom-sidecar -n vineyard-job -oname | \
+        kubectl get pod -l app=job-with-custom-sidecar -n vineyard-job -oname | \
           awk -F '/' '{print $2}' | \
           head -n 1 | \
           xargs kubectl logs -c job -n vineyard-job | \