fix: for update strategy add propogation from cluster to components (#…

…1016) Signed-off-by: Kara Guo <xinguo@google.com> Co-authored-by: Kara Guo <xinguo@google.com>
goharbor · Apr 4, 2023 · 12cb7d7 · 12cb7d7
1 parent 63e689b
commit 12cb7d7
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 0 deletions.
diff --git a/apis/goharbor.io/v1beta1/jobservice_types.go b/apis/goharbor.io/v1beta1/jobservice_types.go
@@ -4,6 +4,7 @@ import (
 	"errors"
 
 	harbormetav1 "github.com/goharbor/harbor-operator/apis/meta/v1alpha1"
+	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -88,6 +89,10 @@ type JobServiceSpec struct {
 
 	// +kubebuilder:validation:Optional
 	Storage *JobServiceStorageSpec `json:"storage,omitempty"`
+
+	// +kubebuilder:validation:Optional
+	// +kubebuilder:default="RollingUpdate"
+	UpdateStrategyType appsv1.DeploymentStrategyType `json:"updateStrategyType,omitempty"`
 }
 
 type JobServiceStorageSpec struct {

diff --git a/apis/goharbor.io/v1beta1/registry_types.go b/apis/goharbor.io/v1beta1/registry_types.go
@@ -2,6 +2,7 @@ package v1beta1
 
 import (
 	harbormetav1 "github.com/goharbor/harbor-operator/apis/meta/v1alpha1"
+	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -54,6 +55,10 @@ type RegistrySpec struct {
 
 	// +kubebuilder:validation:Optional
 	Trace *harbormetav1.TraceSpec `json:"trace,omitempty"`
+
+	// +kubebuilder:validation:Optional
+	// +kubebuilder:default="RollingUpdate"
+	UpdateStrategyType appsv1.DeploymentStrategyType `json:"updateStrategyType,omitempty"`
 }
 
 func (r *RegistrySpec) Default() {

diff --git a/charts/harbor-operator/templates/crds.yaml b/charts/harbor-operator/templates/crds.yaml
@@ -25515,6 +25515,9 @@ spec:
                 required:
                 - provider
                 type: object
+              updateStrategyType:
+                default: RollingUpdate
+                type: string
               workerPool:
                 description: Configurations of worker pool
                 properties:
@@ -32915,6 +32918,9 @@ spec:
                 required:
                 - provider
                 type: object
+              updateStrategyType:
+                default: RollingUpdate
+                type: string
               validation:
                 properties:
                   disabled:

diff --git a/controllers/goharbor/harbor/jobservice.go b/controllers/goharbor/harbor/jobservice.go
@@ -185,6 +185,7 @@ func (r *Reconciler) GetJobService(ctx context.Context, harbor *goharborv1.Harbo
 			Storage: &goharborv1.JobServiceStorageSpec{
 				ScanDataExports: r.JobServiceScanDataExportsStorage(ctx, harbor),
 			},
+			UpdateStrategyType: harbor.Spec.UpdateStrategyType,
 		},
 	}, nil
 }
diff --git a/controllers/goharbor/harbor/registry.go b/controllers/goharbor/harbor/registry.go
@@ -283,6 +283,7 @@ func (r *Reconciler) GetRegistry(ctx context.Context, harbor *goharborv1.Harbor)
 			Proxy:                harbor.GetComponentProxySpec(harbormetav1.RegistryComponent),
 			Network:              harbor.Spec.Network,
 			Trace:                harbor.Spec.Trace,
+			UpdateStrategyType:   harbor.Spec.UpdateStrategyType,
 		},
 	}, nil
 }
diff --git a/controllers/goharbor/jobservice/deployments.go b/controllers/goharbor/jobservice/deployments.go
@@ -348,6 +348,10 @@ func (r *Reconciler) GetDeployment(ctx context.Context, jobservice *goharborv1.J
 		},
 	}
 
+	if len(jobservice.Spec.UpdateStrategyType) > 0 {
+		deploy.Spec.Strategy.Type = jobservice.Spec.UpdateStrategyType
+	}
+
 	jobservice.Spec.ComponentSpec.ApplyToDeployment(deploy)
 
 	return deploy, nil

diff --git a/controllers/goharbor/registry/deployments.go b/controllers/goharbor/registry/deployments.go
@@ -329,6 +329,10 @@ func (r *Reconciler) GetDeployment(ctx context.Context, registry *goharborv1.Reg
 		},
 	}
 
+	if len(registry.Spec.UpdateStrategyType) > 0 {
+		deploy.Spec.Strategy.Type = registry.Spec.UpdateStrategyType
+	}
+
 	if err = r.ApplyStorageConfiguration(ctx, registry, deploy); err != nil {
 		return nil, errors.Wrap(err, "cannot apply storage configuration")
 	}

diff --git a/manifests/cluster/deployment.yaml b/manifests/cluster/deployment.yaml
@@ -25544,6 +25544,9 @@ spec:
                 required:
                 - provider
                 type: object
+              updateStrategyType:
+                default: RollingUpdate
+                type: string
               workerPool:
                 description: Configurations of worker pool
                 properties:
@@ -45358,6 +45361,9 @@ spec:
                 required:
                 - provider
                 type: object
+              updateStrategyType:
+                default: RollingUpdate
+                type: string
               validation:
                 properties:
                   disabled:

diff --git a/manifests/harbor/deployment.yaml b/manifests/harbor/deployment.yaml
@@ -25544,6 +25544,9 @@ spec:
                 required:
                 - provider
                 type: object
+              updateStrategyType:
+                default: RollingUpdate
+                type: string
               workerPool:
                 description: Configurations of worker pool
                 properties:
@@ -32958,6 +32961,9 @@ spec:
                 required:
                 - provider
                 type: object
+              updateStrategyType:
+                default: RollingUpdate
+                type: string
               validation:
                 properties:
                   disabled: