Revert "Add support for overriding default pod specs (#307)" (#319)

This reverts commit eb7dcde.
kanisterio · Sep 25, 2019 · a5e8985 · a5e8985
1 parent 5b14b00
commit a5e8985
Show file tree

Hide file tree

Showing 10 changed files with 57 additions and 224 deletions.
diff --git a/pkg/function/copy_volume_data.go b/pkg/function/copy_volume_data.go
@@ -17,7 +17,6 @@ package function
 import (
 	"context"
 	"fmt"
-	"reflect"
 
 	"github.com/pkg/errors"
 	v1 "k8s.io/api/core/v1"
@@ -44,7 +43,6 @@ const (
 	CopyVolumeDataOutputBackupArtifactLocation = "backupArtifactLocation"
 	CopyVolumeDataEncryptionKeyArg             = "encryptionKey"
 	CopyVolumeDataOutputBackupTag              = "backupTag"
-	CopyVolumeDataPodOverrideArg               = "podOverride"
 )
 
 func init() {
@@ -59,7 +57,7 @@ func (*copyVolumeDataFunc) Name() string {
 	return "CopyVolumeData"
 }
 
-func copyVolumeData(ctx context.Context, cli kubernetes.Interface, tp param.TemplateParams, namespace, pvc, targetPath, encryptionKey string, podOverride v1.PodSpec) (map[string]interface{}, error) {
+func copyVolumeData(ctx context.Context, cli kubernetes.Interface, tp param.TemplateParams, namespace, pvc, targetPath, encryptionKey string) (map[string]interface{}, error) {
 	// Validate PVC exists
 	if _, err := cli.CoreV1().PersistentVolumeClaims(namespace).Get(pvc, metav1.GetOptions{}); err != nil {
 		return nil, errors.Wrapf(err, "Failed to retrieve PVC. Namespace %s, Name %s", namespace, pvc)
@@ -72,7 +70,6 @@ func copyVolumeData(ctx context.Context, cli kubernetes.Interface, tp param.Temp
 		Image:        kanisterToolsImage,
 		Command:      []string{"sh", "-c", "tail -f /dev/null"},
 		Volumes:      map[string]string{pvc: mountPoint},
-		PodOverride:  podOverride,
 	}
 	pr := kube.NewPodRunner(cli, options)
 	podFunc := copyVolumeDataPodFunc(cli, tp, namespace, mountPoint, targetPath, encryptionKey)
@@ -123,7 +120,6 @@ func copyVolumeDataPodFunc(cli kubernetes.Interface, tp param.TemplateParams, na
 
 func (*copyVolumeDataFunc) Exec(ctx context.Context, tp param.TemplateParams, args map[string]interface{}) (map[string]interface{}, error) {
 	var namespace, vol, targetPath, encryptionKey string
-	var podOverride v1.PodSpec
 	var err error
 	if err = Arg(args, CopyVolumeDataNamespaceArg, &namespace); err != nil {
 		return nil, err
@@ -137,24 +133,11 @@ func (*copyVolumeDataFunc) Exec(ctx context.Context, tp param.TemplateParams, ar
 	if err = OptArg(args, CopyVolumeDataEncryptionKeyArg, &encryptionKey, restic.GeneratePassword()); err != nil {
 		return nil, err
 	}
-	if err = OptArg(args, CopyVolumeDataPodOverrideArg, &podOverride, v1.PodSpec{}); err != nil {
-		return nil, err
-	}
-
-	// Check if PodOverride specs are passed through actionset
-	// If yes, override podOverride specs
-	if !reflect.DeepEqual(tp.PodOverride, v1.PodSpec{}) {
-		podOverride, err = kube.PodSpecOverride(ctx, podOverride, tp.PodOverride)
-		if err != nil {
-			return nil, err
-		}
-	}
-
 	cli, err := kube.NewClient()
 	if err != nil {
 		return nil, errors.Wrapf(err, "Failed to create Kubernetes client")
 	}
-	return copyVolumeData(ctx, cli, tp, namespace, vol, targetPath, encryptionKey, podOverride)
+	return copyVolumeData(ctx, cli, tp, namespace, vol, targetPath, encryptionKey)
 }
 
 func (*copyVolumeDataFunc) RequiredArgs() []string {

diff --git a/pkg/function/delete_data.go b/pkg/function/delete_data.go
@@ -16,7 +16,6 @@ package function
 
 import (
 	"context"
-	"reflect"
 	"strings"
 
 	"github.com/pkg/errors"
@@ -43,9 +42,7 @@ const (
 	DeleteDataEncryptionKeyArg = "encryptionKey"
 	// DeleteDataReclaimSpace provides a way to specify if space should be reclaimed
 	DeleteDataReclaimSpace = "reclaimSpace"
-	// DeleteDataPodOverrideArg contains pod specs to override default pod specs
-	DeleteDataPodOverrideArg = "podOverride"
-	deleteDataJobPrefix      = "delete-data-"
+	deleteDataJobPrefix    = "delete-data-"
 )
 
 func init() {
@@ -60,13 +57,12 @@ func (*deleteDataFunc) Name() string {
 	return "DeleteData"
 }
 
-func deleteData(ctx context.Context, cli kubernetes.Interface, tp param.TemplateParams, reclaimSpace bool, namespace, encryptionKey string, targetPaths, deleteTags, deleteIdentifiers []string, jobPrefix string, podOverride v1.PodSpec) (map[string]interface{}, error) {
+func deleteData(ctx context.Context, cli kubernetes.Interface, tp param.TemplateParams, reclaimSpace bool, namespace, encryptionKey string, targetPaths, deleteTags, deleteIdentifiers []string, jobPrefix string) (map[string]interface{}, error) {
 	options := &kube.PodOptions{
 		Namespace:    namespace,
 		GenerateName: jobPrefix,
 		Image:        kanisterToolsImage,
 		Command:      []string{"sh", "-c", "tail -f /dev/null"},
-		PodOverride:  podOverride,
 	}
 	pr := kube.NewPodRunner(cli, options)
 	podFunc := deleteDataPodFunc(cli, tp, reclaimSpace, namespace, encryptionKey, targetPaths, deleteTags, deleteIdentifiers)
@@ -141,7 +137,6 @@ func pruneData(cli kubernetes.Interface, tp param.TemplateParams, pod *v1.Pod, n
 func (*deleteDataFunc) Exec(ctx context.Context, tp param.TemplateParams, args map[string]interface{}) (map[string]interface{}, error) {
 	var namespace, deleteArtifactPrefix, deleteIdentifier, deleteTag, encryptionKey string
 	var reclaimSpace bool
-	var podOverride v1.PodSpec
 	var err error
 	if err = Arg(args, DeleteDataNamespaceArg, &namespace); err != nil {
 		return nil, err
@@ -161,18 +156,6 @@ func (*deleteDataFunc) Exec(ctx context.Context, tp param.TemplateParams, args m
 	if err = OptArg(args, DeleteDataReclaimSpace, &reclaimSpace, false); err != nil {
 		return nil, err
 	}
-	if err = OptArg(args, DeleteDataPodOverrideArg, &podOverride, v1.PodSpec{}); err != nil {
-		return nil, err
-	}
-
-	// Check if PodOverride specs are passed through actionset
-	// If yes, override podOverride specs
-	if !reflect.DeepEqual(tp.PodOverride, v1.PodSpec{}) {
-		podOverride, err = kube.PodSpecOverride(ctx, podOverride, tp.PodOverride)
-		if err != nil {
-			return nil, err
-		}
-	}
 	// Validate profile
 	if err = validateProfile(tp.Profile); err != nil {
 		return nil, err
@@ -181,7 +164,7 @@ func (*deleteDataFunc) Exec(ctx context.Context, tp param.TemplateParams, args m
 	if err != nil {
 		return nil, errors.Wrapf(err, "Failed to create Kubernetes client")
 	}
-	return deleteData(ctx, cli, tp, reclaimSpace, namespace, encryptionKey, strings.Fields(deleteArtifactPrefix), strings.Fields(deleteTag), strings.Fields(deleteIdentifier), deleteDataJobPrefix, podOverride)
+	return deleteData(ctx, cli, tp, reclaimSpace, namespace, encryptionKey, strings.Fields(deleteArtifactPrefix), strings.Fields(deleteTag), strings.Fields(deleteIdentifier), deleteDataJobPrefix)
 }
 
 func (*deleteDataFunc) RequiredArgs() []string {

diff --git a/pkg/function/delete_data_all.go b/pkg/function/delete_data_all.go
@@ -20,7 +20,6 @@ import (
 	"fmt"
 
 	"github.com/pkg/errors"
-	"k8s.io/api/core/v1"
 
 	kanister "github.com/kanisterio/kanister/pkg"
 	"github.com/kanisterio/kanister/pkg/kube"
@@ -39,9 +38,7 @@ const (
 	DeleteDataAllReclaimSpace = "reclaimSpace"
 	// DeleteDataAllBackupInfo provides backup info required for delete
 	DeleteDataAllBackupInfo = "backupInfo"
-	// DeleteDataAllPodOverrideArg contains pod specs to override default pod specs
-	DeleteDataAllPodOverrideArg = "podOverride"
-	deleteDataAllJobPrefix      = "delete-data-all-"
+	deleteDataAllJobPrefix  = "delete-data-all-"
 )
 
 func init() {
@@ -58,7 +55,6 @@ func (*deleteDataAllFunc) Name() string {
 
 func (*deleteDataAllFunc) Exec(ctx context.Context, tp param.TemplateParams, args map[string]interface{}) (map[string]interface{}, error) {
 	var namespace, deleteArtifactPrefix, backupInfo, encryptionKey string
-	var podOverride v1.PodSpec
 	var reclaimSpace bool
 	var err error
 	if err = Arg(args, DeleteDataAllNamespaceArg, &namespace); err != nil {
@@ -96,7 +92,7 @@ func (*deleteDataAllFunc) Exec(ctx context.Context, tp param.TemplateParams, arg
 		deleteIdentifiers = append(deleteIdentifiers, info.BackupID)
 	}
 
-	return deleteData(ctx, cli, tp, reclaimSpace, namespace, encryptionKey, targetPaths, nil, deleteIdentifiers, deleteDataAllJobPrefix, podOverride)
+	return deleteData(ctx, cli, tp, reclaimSpace, namespace, encryptionKey, targetPaths, nil, deleteIdentifiers, deleteDataAllJobPrefix)
 }
 
 func (*deleteDataAllFunc) RequiredArgs() []string {

diff --git a/pkg/function/kube_task.go b/pkg/function/kube_task.go
@@ -16,7 +16,6 @@ package function
 
 import (
 	"context"
-	"reflect"
 
 	"github.com/pkg/errors"
 	"k8s.io/api/core/v1"
@@ -31,11 +30,10 @@ import (
 )
 
 const (
-	jobPrefix              = "kanister-job-"
-	KubeTaskNamespaceArg   = "namespace"
-	KubeTaskImageArg       = "image"
-	KubeTaskCommandArg     = "command"
-	KubeTaskPodOverrideArg = "podOverride"
+	jobPrefix            = "kanister-job-"
+	KubeTaskNamespaceArg = "namespace"
+	KubeTaskImageArg     = "image"
+	KubeTaskCommandArg   = "command"
 )
 
 func init() {
@@ -50,7 +48,7 @@ func (*kubeTaskFunc) Name() string {
 	return "KubeTask"
 }
 
-func kubeTask(ctx context.Context, cli kubernetes.Interface, namespace, image string, command []string, podOverride v1.PodSpec) (map[string]interface{}, error) {
+func kubeTask(ctx context.Context, cli kubernetes.Interface, namespace, image string, command []string) (map[string]interface{}, error) {
 	var serviceAccount string
 	var err error
 	if namespace == "" {
@@ -69,9 +67,7 @@ func kubeTask(ctx context.Context, cli kubernetes.Interface, namespace, image st
 		Image:              image,
 		Command:            command,
 		ServiceAccountName: serviceAccount,
-		PodOverride:        podOverride,
 	}
-
 	pr := kube.NewPodRunner(cli, options)
 	podFunc := kubeTaskPodFunc(cli)
 	return pr.Run(ctx, podFunc)
@@ -103,7 +99,6 @@ func kubeTaskPodFunc(cli kubernetes.Interface) func(ctx context.Context, pod *v1
 func (ktf *kubeTaskFunc) Exec(ctx context.Context, tp param.TemplateParams, args map[string]interface{}) (map[string]interface{}, error) {
 	var namespace, image string
 	var command []string
-	var podOverride v1.PodSpec
 	var err error
 	if err = Arg(args, KubeTaskImageArg, &image); err != nil {
 		return nil, err
@@ -114,24 +109,11 @@ func (ktf *kubeTaskFunc) Exec(ctx context.Context, tp param.TemplateParams, args
 	if err = OptArg(args, KubeTaskNamespaceArg, &namespace, ""); err != nil {
 		return nil, err
 	}
-	if err = OptArg(args, KubeTaskPodOverrideArg, &podOverride, v1.PodSpec{}); err != nil {
-		return nil, err
-	}
-
-	// Check if PodOverride specs are passed through actionset
-	// If yes, override podOverride specs
-	if !reflect.DeepEqual(tp.PodOverride, v1.PodSpec{}) {
-		podOverride, err = kube.PodSpecOverride(ctx, podOverride, tp.PodOverride)
-		if err != nil {
-			return nil, err
-		}
-	}
-
 	cli, err := kube.NewClient()
 	if err != nil {
 		return nil, errors.Wrapf(err, "Failed to create Kubernetes client")
 	}
-	return kubeTask(ctx, cli, namespace, image, command, podOverride)
+	return kubeTask(ctx, cli, namespace, image, command)
 }
 
 func (*kubeTaskFunc) RequiredArgs() []string {

diff --git a/pkg/function/kube_task_test.go b/pkg/function/kube_task_test.go
@@ -126,13 +126,6 @@ func (s *KubeTaskSuite) TestKubeTask(c *C) {
 		StatefulSet: &param.StatefulSetParams{
 			Namespace: s.namespace,
 		},
-		PodOverride: v1.PodSpec{
-			Containers: []v1.Container{
-				{
-					ImagePullPolicy: "Always",
-				},
-			},
-		},
 	}
 	action := "test"
 	for _, tc := range []struct {

diff --git a/pkg/function/prepare_data.go b/pkg/function/prepare_data.go
@@ -17,7 +17,6 @@ package function
 import (
 	"context"
 	"fmt"
-	"reflect"
 
 	"github.com/pkg/errors"
 	"k8s.io/api/core/v1"
@@ -38,7 +37,6 @@ const (
 	PrepareDataCommandArg     = "command"
 	PrepareDataVolumes        = "volumes"
 	PrepareDataServiceAccount = "serviceaccount"
-	PrepareDataPodOverrideArg = "podOverride"
 )
 
 func init() {
@@ -75,7 +73,7 @@ func getVolumes(tp param.TemplateParams) (map[string]string, error) {
 	return vols, nil
 }
 
-func prepareData(ctx context.Context, cli kubernetes.Interface, namespace, serviceAccount, image string, vols map[string]string, podOverride v1.PodSpec, command ...string) (map[string]interface{}, error) {
+func prepareData(ctx context.Context, cli kubernetes.Interface, namespace, serviceAccount, image string, vols map[string]string, command ...string) (map[string]interface{}, error) {
 	// Validate volumes
 	for pvc := range vols {
 		if _, err := cli.CoreV1().PersistentVolumeClaims(namespace).Get(pvc, metav1.GetOptions{}); err != nil {
@@ -89,7 +87,6 @@ func prepareData(ctx context.Context, cli kubernetes.Interface, namespace, servi
 		Command:            command,
 		Volumes:            vols,
 		ServiceAccountName: serviceAccount,
-		PodOverride:        podOverride,
 	}
 	pr := kube.NewPodRunner(cli, options)
 	podFunc := prepareDataPodFunc(cli)
@@ -117,7 +114,6 @@ func (*prepareDataFunc) Exec(ctx context.Context, tp param.TemplateParams, args
 	var namespace, image, serviceAccount string
 	var command []string
 	var vols map[string]string
-	var podOverride v1.PodSpec
 	var err error
 	if err = Arg(args, PrepareDataNamespaceArg, &namespace); err != nil {
 		return nil, err
@@ -134,19 +130,6 @@ func (*prepareDataFunc) Exec(ctx context.Context, tp param.TemplateParams, args
 	if err = OptArg(args, PrepareDataServiceAccount, &serviceAccount, ""); err != nil {
 		return nil, err
 	}
-	if err = OptArg(args, PrepareDataPodOverrideArg, &podOverride, v1.PodSpec{}); err != nil {
-		return nil, err
-	}
-
-	// Check if PodOverride specs are passed through actionset
-	// If yes, override podOverride specs
-	if !reflect.DeepEqual(tp.PodOverride, v1.PodSpec{}) {
-		podOverride, err = kube.PodSpecOverride(ctx, podOverride, tp.PodOverride)
-		if err != nil {
-			return nil, err
-		}
-	}
-
 	cli, err := kube.NewClient()
 	if err != nil {
 		return nil, errors.Wrapf(err, "Failed to create Kubernetes client")
@@ -156,7 +139,7 @@ func (*prepareDataFunc) Exec(ctx context.Context, tp param.TemplateParams, args
 			return nil, err
 		}
 	}
-	return prepareData(ctx, cli, namespace, serviceAccount, image, vols, podOverride, command...)
+	return prepareData(ctx, cli, namespace, serviceAccount, image, vols, command...)
 }
 
 func (*prepareDataFunc) RequiredArgs() []string {