feat: Native DaemonSet Progressive Delivery - Part 1: Core Infrastructure

Signed-off-by: Marco Ma <marco.ma@sap.com>

Author: marcomasap

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.20.14-alpine3.19 as builder
+FROM golang:1.20.14-alpine3.19 AS builder
 
 WORKDIR /workspace
 

Dockerfile_multiarch

@@ -1,7 +1,7 @@
 # Build the manager binary
 ARG BASE_IMAGE=alpine
 ARG BASE_IMAGE_VERION=3.17
-FROM --platform=$BUILDPLATFORM golang:1.19-alpine3.17 as builder
+FROM --platform=$BUILDPLATFORM golang:1.19-alpine3.17 AS builder
 
 WORKDIR /workspace
 

config/rbac/role.yaml

@@ -102,6 +102,32 @@ rules:
   - get
   - patch
   - update
+- apiGroups:
+  - apps
+  resources:
+  - daemonsets
+  verbs:
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - apps
+  resources:
+  - daemonsets/status
+  verbs:
+  - get
+  - patch
+  - update
+- apiGroups:
+  - apps
+  resources:
+  - controllerrevisions
+  verbs:
+  - get
+  - list
+  - watch
 - apiGroups:
   - apps.kruise.io
   resources:

config/webhook/manifests.yaml

@@ -24,6 +24,26 @@ webhooks:
     resources:
     - clonesets
   sideEffects: None
+- admissionReviewVersions:
+  - v1
+  - v1beta1
+  clientConfig:
+    service:
+      name: webhook-service
+      namespace: system
+      path: /mutate-apps-v1-daemonset
+  failurePolicy: Fail
+  name: mdaemonset-native.kb.io
+  rules:
+  - apiGroups:
+    - apps
+    apiVersions:
+    - v1
+    operations:
+    - UPDATE
+    resources:
+    - daemonsets
+  sideEffects: None
 - admissionReviewVersions:
   - v1
   - v1beta1

pkg/controller/batchrelease/batchrelease_controller.go

@@ -61,6 +61,7 @@ func init() {
 	watchedWorkload = sync.Map{}
 	watchedWorkload.LoadOrStore(util.ControllerKindDep.String(), struct{}{})
 	watchedWorkload.LoadOrStore(util.ControllerKindSts.String(), struct{}{})
+	watchedWorkload.LoadOrStore(util.ControllerKindDS.String(), struct{}{})
 	watchedWorkload.LoadOrStore(util.ControllerKruiseKindDS.String(), struct{}{})
 	watchedWorkload.LoadOrStore(util.ControllerKruiseKindCS.String(), struct{}{})
 	watchedWorkload.LoadOrStore(util.ControllerKruiseKindSts.String(), struct{}{})

pkg/controller/batchrelease/batchrelease_event_handler.go

@@ -134,6 +134,8 @@ func (w workloadEventHandler) Update(ctx context.Context, evt event.UpdateEvent,
 		gvk = util.ControllerKruiseKindCS
 	case *kruiseappsv1alpha1.DaemonSet:
 		gvk = util.ControllerKruiseKindDS
+	case *appsv1.DaemonSet:
+		gvk = util.ControllerKindDS
 	case *appsv1.Deployment:
 		gvk = util.ControllerKindDep
 	case *appsv1.StatefulSet:
@@ -187,6 +189,8 @@ func (w *workloadEventHandler) handleWorkload(q workqueue.RateLimitingInterface,
 		gvk = util.ControllerKruiseKindCS
 	case *kruiseappsv1alpha1.DaemonSet:
 		gvk = util.ControllerKruiseKindDS
+	case *appsv1.DaemonSet:
+		gvk = util.ControllerKindDS
 	case *appsv1.Deployment:
 		gvk = util.ControllerKindDep
 	case *appsv1.StatefulSet:

pkg/controller/batchrelease/batchrelease_executor.go

@@ -43,6 +43,7 @@ import (
 	"github.com/openkruise/rollouts/pkg/controller/batchrelease/control/partitionstyle/cloneset"
 	"github.com/openkruise/rollouts/pkg/controller/batchrelease/control/partitionstyle/daemonset"
 	partitiondeployment "github.com/openkruise/rollouts/pkg/controller/batchrelease/control/partitionstyle/deployment"
+	"github.com/openkruise/rollouts/pkg/controller/batchrelease/control/partitionstyle/nativedaemonset"
 	"github.com/openkruise/rollouts/pkg/controller/batchrelease/control/partitionstyle/statefulset"
 	"github.com/openkruise/rollouts/pkg/util"
 	"github.com/openkruise/rollouts/pkg/util/errors"
@@ -230,14 +231,18 @@ func (r *Executor) getReleaseController(release *v1beta1.BatchRelease, newStatus
 		fallthrough
 
 	case v1beta1.PartitionRollingStyle, "":
-		if targetRef.APIVersion == appsv1alpha1.GroupVersion.String() && targetRef.Kind == reflect.TypeOf(appsv1alpha1.CloneSet{}).Name() {
-			klog.InfoS("Using CloneSet partition-style release controller for this batch release", "workload name", targetKey.Name, "namespace", targetKey.Namespace)
-			return partitionstyle.NewControlPlane(cloneset.NewController, r.client, r.recorder, release, newStatus, targetKey, gvk), nil
-		}
 		if targetRef.APIVersion == appsv1alpha1.GroupVersion.String() && targetRef.Kind == reflect.TypeOf(appsv1alpha1.DaemonSet{}).Name() {
 			klog.InfoS("Using DaemonSet partition-style release controller for this batch release", "workload name", targetKey.Name, "namespace", targetKey.Namespace)
 			return partitionstyle.NewControlPlane(daemonset.NewController, r.client, r.recorder, release, newStatus, targetKey, gvk), nil
 		}
+		if targetRef.APIVersion == apps.SchemeGroupVersion.String() && targetRef.Kind == reflect.TypeOf(apps.DaemonSet{}).Name() {
+			klog.InfoS("Using Native DaemonSet partition-style release controller for this batch release", "workload name", targetKey.Name, "namespace", targetKey.Namespace)
+			return partitionstyle.NewControlPlane(nativedaemonset.NewController, r.client, r.recorder, release, newStatus, targetKey, gvk), nil
+		}
+		if targetRef.APIVersion == appsv1alpha1.GroupVersion.String() && targetRef.Kind == reflect.TypeOf(appsv1alpha1.CloneSet{}).Name() {
+			klog.InfoS("Using CloneSet partition-style release controller for this batch release", "workload name", targetKey.Name, "namespace", targetKey.Namespace)
+			return partitionstyle.NewControlPlane(cloneset.NewController, r.client, r.recorder, release, newStatus, targetKey, gvk), nil
+		}
 		if targetRef.APIVersion == apps.SchemeGroupVersion.String() && targetRef.Kind == reflect.TypeOf(apps.Deployment{}).Name() {
 			klog.InfoS("Using Deployment partition-style release controller for this batch release", "workload name", targetKey.Name, "namespace", targetKey.Namespace)
 			return partitionstyle.NewControlPlane(partitiondeployment.NewController, r.client, r.recorder, release, newStatus, targetKey, gvk), nil