Merge pull request #7942 from kaovilai/deployment.go-boolParam

Make pkg/install/Deployment podTemplateOptions bool functions accept bool param
vmware-tanzu · Jul 25, 2024 · 5b9b8e7 · 5b9b8e7
2 parents 442cc76 + bd2008c
commit 5b9b8e7
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/pkg/install/deployment.go b/pkg/install/deployment.go
@@ -95,9 +95,9 @@ func WithSecret(secretPresent bool) podTemplateOption {
 	}
 }
 
-func WithRestoreOnly() podTemplateOption {
+func WithRestoreOnly(b bool) podTemplateOption {
 	return func(c *podTemplateConfig) {
-		c.restoreOnly = true
+		c.restoreOnly = b
 	}
 }
 
@@ -143,21 +143,21 @@ func WithUploaderType(t string) podTemplateOption {
 	}
 }
 
-func WithDefaultVolumesToFsBackup() podTemplateOption {
+func WithDefaultVolumesToFsBackup(b bool) podTemplateOption {
 	return func(c *podTemplateConfig) {
-		c.defaultVolumesToFsBackup = true
+		c.defaultVolumesToFsBackup = b
 	}
 }
 
-func WithDefaultSnapshotMoveData() podTemplateOption {
+func WithDefaultSnapshotMoveData(b bool) podTemplateOption {
 	return func(c *podTemplateConfig) {
-		c.defaultSnapshotMoveData = true
+		c.defaultSnapshotMoveData = b
 	}
 }
 
-func WithDisableInformerCache() podTemplateOption {
+func WithDisableInformerCache(b bool) podTemplateOption {
 	return func(c *podTemplateConfig) {
-		c.disableInformerCache = true
+		c.disableInformerCache = b
 	}
 }
 
@@ -167,9 +167,9 @@ func WithServiceAccountName(sa string) podTemplateOption {
 	}
 }
 
-func WithPrivilegedNodeAgent() podTemplateOption {
+func WithPrivilegedNodeAgent(b bool) podTemplateOption {
 	return func(c *podTemplateConfig) {
-		c.privilegedNodeAgent = true
+		c.privilegedNodeAgent = b
 	}
 }
 

diff --git a/pkg/install/deployment_test.go b/pkg/install/deployment_test.go
@@ -31,7 +31,7 @@ func TestDeployment(t *testing.T) {
 
 	assert.Equal(t, "velero", deploy.ObjectMeta.Namespace)
 
-	deploy = Deployment("velero", WithRestoreOnly())
+	deploy = Deployment("velero", WithRestoreOnly(true))
 	assert.Equal(t, "--restore-only", deploy.Spec.Template.Spec.Containers[0].Args[1])
 
 	deploy = Deployment("velero", WithEnvFromSecretKey("my-var", "my-secret", "my-key"))
@@ -67,7 +67,7 @@ func TestDeployment(t *testing.T) {
 	deploy = Deployment("velero", WithServiceAccountName("test-sa"))
 	assert.Equal(t, "test-sa", deploy.Spec.Template.Spec.ServiceAccountName)
 
-	deploy = Deployment("velero", WithDisableInformerCache())
+	deploy = Deployment("velero", WithDisableInformerCache(true))
 	assert.Len(t, deploy.Spec.Template.Spec.Containers[0].Args, 2)
 	assert.Equal(t, "--disable-informer-cache=true", deploy.Spec.Template.Spec.Containers[0].Args[1])
 

diff --git a/pkg/install/resources.go b/pkg/install/resources.go
@@ -358,23 +358,23 @@ func AllResources(o *VeleroOptions) *unstructured.UnstructuredList {
 	}
 
 	if o.RestoreOnly {
-		deployOpts = append(deployOpts, WithRestoreOnly())
+		deployOpts = append(deployOpts, WithRestoreOnly(true))
 	}
 
 	if len(o.Plugins) > 0 {
 		deployOpts = append(deployOpts, WithPlugins(o.Plugins))
 	}
 
 	if o.DefaultVolumesToFsBackup {
-		deployOpts = append(deployOpts, WithDefaultVolumesToFsBackup())
+		deployOpts = append(deployOpts, WithDefaultVolumesToFsBackup(true))
 	}
 
 	if o.DefaultSnapshotMoveData {
-		deployOpts = append(deployOpts, WithDefaultSnapshotMoveData())
+		deployOpts = append(deployOpts, WithDefaultSnapshotMoveData(true))
 	}
 
 	if o.DisableInformerCache {
-		deployOpts = append(deployOpts, WithDisableInformerCache())
+		deployOpts = append(deployOpts, WithDisableInformerCache(true))
 	}
 
 	deploy := Deployment(o.Namespace, deployOpts...)
@@ -396,7 +396,7 @@ func AllResources(o *VeleroOptions) *unstructured.UnstructuredList {
 			dsOpts = append(dsOpts, WithFeatures(o.Features))
 		}
 		if o.PrivilegedNodeAgent {
-			dsOpts = append(dsOpts, WithPrivilegedNodeAgent())
+			dsOpts = append(dsOpts, WithPrivilegedNodeAgent(true))
 		}
 		ds := DaemonSet(o.Namespace, dsOpts...)
 		if err := appendUnstructured(resources, ds); err != nil {