feat: Initial e2e tests and migrate old ones into e2e

internal/pkg/testutil/kube.go

@@ -2,8 +2,6 @@ package testutil
 
 import (
 	"context"
-	"encoding/json"
-	"fmt"
 	"math/rand"
 	"sort"
 	"strconv"
@@ -12,13 +10,10 @@ import (
 
 	argorolloutv1alpha1 "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1"
 	argorollout "github.com/argoproj/argo-rollouts/pkg/client/clientset/versioned"
-	openshiftv1 "github.com/openshift/api/apps/v1"
-	appsclient "github.com/openshift/client-go/apps/clientset/versioned"
 	"github.com/sirupsen/logrus"
 	"github.com/stakater/Reloader/internal/pkg/callbacks"
 	"github.com/stakater/Reloader/internal/pkg/constants"
 	"github.com/stakater/Reloader/internal/pkg/crypto"
-	"github.com/stakater/Reloader/internal/pkg/metrics"
 	"github.com/stakater/Reloader/internal/pkg/options"
 	"github.com/stakater/Reloader/internal/pkg/util"
 	"github.com/stakater/Reloader/pkg/common"
@@ -36,8 +31,6 @@ var (
 	letters = []rune("abcdefghijklmnopqrstuvwxyz")
 	// ConfigmapResourceType is a resource type which controller watches for changes
 	ConfigmapResourceType = "configMaps"
-	// SecretResourceType is a resource type which controller watches for changes
-	SecretResourceType = "secrets"
 )
 
 var (
@@ -45,11 +38,6 @@ var (
 	Pod                 = "test-reloader-" + RandSeq(5)
 	Namespace           = "test-reloader-" + RandSeq(5)
 	ConfigmapNamePrefix = "testconfigmap-reloader"
-	SecretNamePrefix    = "testsecret-reloader"
-	Data                = "dGVzdFNlY3JldEVuY29kaW5nRm9yUmVsb2FkZXI="
-	NewData             = "dGVzdE5ld1NlY3JldEVuY29kaW5nRm9yUmVsb2FkZXI="
-	UpdatedData         = "dGVzdFVwZGF0ZWRTZWNyZXRFbmNvZGluZ0ZvclJlbG9hZGVy"
-	Collectors          = metrics.NewCollectors()
 	SleepDuration       = 3 * time.Second
 )
 
@@ -105,25 +93,6 @@ func getAnnotations(name string, autoReload bool, secretAutoReload bool, configm
 	return annotations
 }
 
-func getEnvVarSources(name string) []v1.EnvFromSource {
-	return []v1.EnvFromSource{
-		{
-			ConfigMapRef: &v1.ConfigMapEnvSource{
-				LocalObjectReference: v1.LocalObjectReference{
-					Name: name,
-				},
-			},
-		},
-		{
-			SecretRef: &v1.SecretEnvSource{
-				LocalObjectReference: v1.LocalObjectReference{
-					Name: name,
-				},
-			},
-		},
-	}
-}
-
 func getVolumes(name string) []v1.Volume {
 	return []v1.Volume{
 		{
@@ -244,23 +213,6 @@ func getPodTemplateSpecWithEnvVars(name string) v1.PodTemplateSpec {
 	}
 }
 
-func getPodTemplateSpecWithEnvVarSources(name string) v1.PodTemplateSpec {
-	return v1.PodTemplateSpec{
-		ObjectMeta: metav1.ObjectMeta{
-			Labels: map[string]string{"secondLabel": "temp"},
-		},
-		Spec: v1.PodSpec{
-			Containers: []v1.Container{
-				{
-					Image:   "tutum/hello-world",
-					Name:    name,
-					EnvFrom: getEnvVarSources(name),
-				},
-			},
-		},
-	}
-}
-
 func getPodTemplateSpecWithVolumes(name string) v1.PodTemplateSpec {
 	return v1.PodTemplateSpec{
 		ObjectMeta: metav1.ObjectMeta{
@@ -285,65 +237,6 @@ func getPodTemplateSpecWithVolumes(name string) v1.PodTemplateSpec {
 	}
 }
 
-func getPodTemplateSpecWithInitContainer(name string) v1.PodTemplateSpec {
-	return v1.PodTemplateSpec{
-		ObjectMeta: metav1.ObjectMeta{
-			Labels: map[string]string{"secondLabel": "temp"},
-		},
-		Spec: v1.PodSpec{
-			InitContainers: []v1.Container{
-				{
-					Image:        "busybox",
-					Name:         "busyBox",
-					VolumeMounts: getVolumeMounts(),
-				},
-			},
-			Containers: []v1.Container{
-				{
-					Image: "tutum/hello-world",
-					Name:  name,
-					Env: []v1.EnvVar{
-						{
-							Name:  "BUCKET_NAME",
-							Value: "test",
-						},
-					},
-				},
-			},
-			Volumes: getVolumes(name),
-		},
-	}
-}
-
-func getPodTemplateSpecWithInitContainerAndEnv(name string) v1.PodTemplateSpec {
-	return v1.PodTemplateSpec{
-		ObjectMeta: metav1.ObjectMeta{
-			Labels: map[string]string{"secondLabel": "temp"},
-		},
-		Spec: v1.PodSpec{
-			InitContainers: []v1.Container{
-				{
-					Image:   "busybox",
-					Name:    "busyBox",
-					EnvFrom: getEnvVarSources(name),
-				},
-			},
-			Containers: []v1.Container{
-				{
-					Image: "tutum/hello-world",
-					Name:  name,
-					Env: []v1.EnvVar{
-						{
-							Name:  "BUCKET_NAME",
-							Value: "test",
-						},
-					},
-				},
-			},
-		},
-	}
-}
-
 // GetDeployment provides deployment for testing
 func GetDeployment(namespace string, deploymentName string) *appsv1.Deployment {
 	replicaset := int32(1)
@@ -362,58 +255,6 @@ func GetDeployment(namespace string, deploymentName string) *appsv1.Deployment {
 	}
 }
 
-// GetDeploymentConfig provides deployment for testing
-func GetDeploymentConfig(namespace string, deploymentConfigName string) *openshiftv1.DeploymentConfig {
-	replicaset := int32(1)
-	podTemplateSpecWithVolume := getPodTemplateSpecWithVolumes(deploymentConfigName)
-	return &openshiftv1.DeploymentConfig{
-		ObjectMeta: getObjectMeta(namespace, deploymentConfigName, false, false, false, map[string]string{}),
-		Spec: openshiftv1.DeploymentConfigSpec{
-			Replicas: replicaset,
-			Strategy: openshiftv1.DeploymentStrategy{
-				Type: openshiftv1.DeploymentStrategyTypeRolling,
-			},
-			Template: &podTemplateSpecWithVolume,
-		},
-	}
-}
-
-// GetDeploymentWithInitContainer provides deployment with init container and volumeMounts
-func GetDeploymentWithInitContainer(namespace string, deploymentName string) *appsv1.Deployment {
-	replicaset := int32(1)
-	return &appsv1.Deployment{
-		ObjectMeta: getObjectMeta(namespace, deploymentName, false, false, false, map[string]string{}),
-		Spec: appsv1.DeploymentSpec{
-			Selector: &metav1.LabelSelector{
-				MatchLabels: map[string]string{"secondLabel": "temp"},
-			},
-			Replicas: &replicaset,
-			Strategy: appsv1.DeploymentStrategy{
-				Type: appsv1.RollingUpdateDeploymentStrategyType,
-			},
-			Template: getPodTemplateSpecWithInitContainer(deploymentName),
-		},
-	}
-}
-
-// GetDeploymentWithInitContainerAndEnv provides deployment with init container and EnvSource
-func GetDeploymentWithInitContainerAndEnv(namespace string, deploymentName string) *appsv1.Deployment {
-	replicaset := int32(1)
-	return &appsv1.Deployment{
-		ObjectMeta: getObjectMeta(namespace, deploymentName, true, false, false, map[string]string{}),
-		Spec: appsv1.DeploymentSpec{
-			Selector: &metav1.LabelSelector{
-				MatchLabels: map[string]string{"secondLabel": "temp"},
-			},
-			Replicas: &replicaset,
-			Strategy: appsv1.DeploymentStrategy{
-				Type: appsv1.RollingUpdateDeploymentStrategyType,
-			},
-			Template: getPodTemplateSpecWithInitContainerAndEnv(deploymentName),
-		},
-	}
-}
-
 func GetDeploymentWithEnvVars(namespace string, deploymentName string) *appsv1.Deployment {
 	replicaset := int32(1)
 	return &appsv1.Deployment{
@@ -431,117 +272,6 @@ func GetDeploymentWithEnvVars(namespace string, deploymentName string) *appsv1.D
 	}
 }
 
-func GetDeploymentConfigWithEnvVars(namespace string, deploymentConfigName string) *openshiftv1.DeploymentConfig {
-	replicaset := int32(1)
-	podTemplateSpecWithEnvVars := getPodTemplateSpecWithEnvVars(deploymentConfigName)
-	return &openshiftv1.DeploymentConfig{
-		ObjectMeta: getObjectMeta(namespace, deploymentConfigName, false, false, false, map[string]string{}),
-		Spec: openshiftv1.DeploymentConfigSpec{
-			Replicas: replicaset,
-			Strategy: openshiftv1.DeploymentStrategy{
-				Type: openshiftv1.DeploymentStrategyTypeRolling,
-			},
-			Template: &podTemplateSpecWithEnvVars,
-		},
-	}
-}
-
-func GetDeploymentWithEnvVarSources(namespace string, deploymentName string) *appsv1.Deployment {
-	replicaset := int32(1)
-	return &appsv1.Deployment{
-		ObjectMeta: getObjectMeta(namespace, deploymentName, true, false, false, map[string]string{}),
-		Spec: appsv1.DeploymentSpec{
-			Selector: &metav1.LabelSelector{
-				MatchLabels: map[string]string{"secondLabel": "temp"},
-			},
-			Replicas: &replicaset,
-			Strategy: appsv1.DeploymentStrategy{
-				Type: appsv1.RollingUpdateDeploymentStrategyType,
-			},
-			Template: getPodTemplateSpecWithEnvVarSources(deploymentName),
-		},
-	}
-}
-
-func GetDeploymentWithPodAnnotations(namespace string, deploymentName string, both bool) *appsv1.Deployment {
-	replicaset := int32(1)
-	deployment := &appsv1.Deployment{
-		ObjectMeta: getObjectMeta(namespace, deploymentName, false, false, false, map[string]string{}),
-		Spec: appsv1.DeploymentSpec{
-			Selector: &metav1.LabelSelector{
-				MatchLabels: map[string]string{"secondLabel": "temp"},
-			},
-			Replicas: &replicaset,
-			Strategy: appsv1.DeploymentStrategy{
-				Type: appsv1.RollingUpdateDeploymentStrategyType,
-			},
-			Template: getPodTemplateSpecWithEnvVarSources(deploymentName),
-		},
-	}
-	if !both {
-		deployment.Annotations = nil
-	}
-	deployment.Spec.Template.Annotations = getAnnotations(deploymentName, true, false, false, map[string]string{})
-	return deployment
-}
-
-func GetDeploymentWithTypedAutoAnnotation(namespace string, deploymentName string, resourceType string) *appsv1.Deployment {
-	replicaset := int32(1)
-	var objectMeta metav1.ObjectMeta
-	switch resourceType {
-	case SecretResourceType:
-		objectMeta = getObjectMeta(namespace, deploymentName, false, true, false, map[string]string{})
-	case ConfigmapResourceType:
-		objectMeta = getObjectMeta(namespace, deploymentName, false, false, true, map[string]string{})
-	}
-
-	return &appsv1.Deployment{
-		ObjectMeta: objectMeta,
-		Spec: appsv1.DeploymentSpec{
-			Selector: &metav1.LabelSelector{
-				MatchLabels: map[string]string{"secondLabel": "temp"},
-			},
-			Replicas: &replicaset,
-			Strategy: appsv1.DeploymentStrategy{
-				Type: appsv1.RollingUpdateDeploymentStrategyType,
-			},
-			Template: getPodTemplateSpecWithVolumes(deploymentName),
-		},
-	}
-}
-
-func GetDeploymentWithExcludeAnnotation(namespace string, deploymentName string, resourceType string) *appsv1.Deployment {
-	replicaset := int32(1)
-
-	annotation := map[string]string{}
-
-	switch resourceType {
-	case SecretResourceType:
-		annotation[options.SecretExcludeReloaderAnnotation] = deploymentName
-	case ConfigmapResourceType:
-		annotation[options.ConfigmapExcludeReloaderAnnotation] = deploymentName
-	}
-
-	return &appsv1.Deployment{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:        deploymentName,
-			Namespace:   namespace,
-			Labels:      map[string]string{"firstLabel": "temp"},
-			Annotations: annotation,
-		},
-		Spec: appsv1.DeploymentSpec{
-			Selector: &metav1.LabelSelector{
-				MatchLabels: map[string]string{"secondLabel": "temp"},
-			},
-			Replicas: &replicaset,
-			Strategy: appsv1.DeploymentStrategy{
-				Type: appsv1.RollingUpdateDeploymentStrategyType,
-			},
-			Template: getPodTemplateSpecWithVolumes(deploymentName),
-		},
-	}
-}
-
 // GetDaemonSet provides daemonset for testing
 func GetDaemonSet(namespace string, daemonsetName string) *appsv1.DaemonSet {
 	return &appsv1.DaemonSet{
@@ -629,18 +359,6 @@ func GetConfigmapWithUpdatedLabel(namespace string, configmapName string, testLa
 	}
 }
 
-// GetSecret provides secret for testing
-func GetSecret(namespace string, secretName string, data string) *v1.Secret {
-	return &v1.Secret{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      secretName,
-			Namespace: namespace,
-			Labels:    map[string]string{"firstLabel": "temp"},
-		},
-		Data: map[string][]byte{"test.url": []byte(data)},
-	}
-}
-
 func GetCronJob(namespace string, cronJobName string) *batchv1.CronJob {
 	return &batchv1.CronJob{
 		ObjectMeta: getObjectMeta(namespace, cronJobName, false, false, false, map[string]string{}),
@@ -699,18 +417,6 @@ func GetJobWithEnvVar(namespace string, jobName string) *batchv1.Job {
 	}
 }
 
-// GetSecretWithUpdatedLabel provides secret for testing
-func GetSecretWithUpdatedLabel(namespace string, secretName string, label string, data string) *v1.Secret {
-	return &v1.Secret{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      secretName,
-			Namespace: namespace,
-			Labels:    map[string]string{"firstLabel": label},
-		},
-		Data: map[string][]byte{"test.url": []byte(data)},
-	}
-}
-
 // GetResourceSHAFromEnvVar returns the SHA value of given environment variable
 func GetResourceSHAFromEnvVar(containers []v1.Container, envVar string) string {
 	for i := range containers {
@@ -724,38 +430,10 @@ func GetResourceSHAFromEnvVar(containers []v1.Container, envVar string) string {
 	return ""
 }
 
-// GetResourceSHAFromAnnotation returns the SHA value of given environment variable
-func GetResourceSHAFromAnnotation(podAnnotations map[string]string) string {
-	lastReloadedResourceName := fmt.Sprintf("%s/%s",
-		constants.ReloaderAnnotationPrefix,
-		constants.LastReloadedFromAnnotation,
-	)
-
-	annotationJson, ok := podAnnotations[lastReloadedResourceName]
-	if !ok {
-		return ""
-	}
-
-	var last common.ReloadSource
-	bytes := []byte(annotationJson)
-	err := json.Unmarshal(bytes, &last)
-	if err != nil {
-		return ""
-	}
-
-	return last.Hash
-}
-
-// ConvertResourceToSHA generates SHA from secret or configmap data
+// ConvertResourceToSHA generates SHA from configmap data
 func ConvertResourceToSHA(resourceType string, namespace string, resourceName string, data string) string {
 	values := []string{}
-	switch resourceType {
-	case SecretResourceType:
-		secret := GetSecret(namespace, resourceName, data)
-		for k, v := range secret.Data {
-			values = append(values, k+"="+string(v[:]))
-		}
-	case ConfigmapResourceType:
+	if resourceType == ConfigmapResourceType {
 		configmap := GetConfigmap(namespace, resourceName, data)
 		for k, v := range configmap.Data {
 			values = append(values, k+"="+v)
@@ -774,15 +452,6 @@ func CreateConfigMap(client kubernetes.Interface, namespace string, configmapNam
 	return configmapClient, err
 }
 
-// CreateSecret creates a secret in given namespace and returns the SecretInterface
-func CreateSecret(client kubernetes.Interface, namespace string, secretName string, data string) (core_v1.SecretInterface, error) {
-	logrus.Infof("Creating secret")
-	secretClient := client.CoreV1().Secrets(namespace)
-	_, err := secretClient.Create(context.TODO(), GetSecret(namespace, secretName, data), metav1.CreateOptions{})
-	time.Sleep(3 * time.Second)
-	return secretClient, err
-}
-
 // CreateDeployment creates a deployment in given namespace and returns the Deployment
 func CreateDeployment(client kubernetes.Interface, deploymentName string, namespace string, volumeMount bool) (*appsv1.Deployment, error) {
 	logrus.Infof("Creating Deployment")
@@ -798,108 +467,6 @@ func CreateDeployment(client kubernetes.Interface, deploymentName string, namesp
 	return deployment, err
 }
 
-// CreateDeployment creates a deployment in given namespace and returns the Deployment
-func CreateDeploymentWithAnnotations(client kubernetes.Interface, deploymentName string, namespace string, additionalAnnotations map[string]string, volumeMount bool) (*appsv1.Deployment, error) {
-	logrus.Infof("Creating Deployment")
-	deploymentClient := client.AppsV1().Deployments(namespace)
-	var deploymentObj *appsv1.Deployment
-	if volumeMount {
-		deploymentObj = GetDeployment(namespace, deploymentName)
-	} else {
-		deploymentObj = GetDeploymentWithEnvVars(namespace, deploymentName)
-	}
-
-	for annotationKey, annotationValue := range additionalAnnotations {
-		deploymentObj.Annotations[annotationKey] = annotationValue
-	}
-
-	deployment, err := deploymentClient.Create(context.TODO(), deploymentObj, metav1.CreateOptions{})
-	time.Sleep(3 * time.Second)
-	return deployment, err
-}
-
-// CreateDeploymentConfig creates a deploymentConfig in given namespace and returns the DeploymentConfig
-func CreateDeploymentConfig(client appsclient.Interface, deploymentName string, namespace string, volumeMount bool) (*openshiftv1.DeploymentConfig, error) {
-	logrus.Infof("Creating DeploymentConfig")
-	deploymentConfigsClient := client.AppsV1().DeploymentConfigs(namespace)
-	var deploymentConfigObj *openshiftv1.DeploymentConfig
-	if volumeMount {
-		deploymentConfigObj = GetDeploymentConfig(namespace, deploymentName)
-	} else {
-		deploymentConfigObj = GetDeploymentConfigWithEnvVars(namespace, deploymentName)
-	}
-	deploymentConfig, err := deploymentConfigsClient.Create(context.TODO(), deploymentConfigObj, metav1.CreateOptions{})
-	time.Sleep(5 * time.Second)
-	return deploymentConfig, err
-}
-
-// CreateDeploymentWithInitContainer creates a deployment in given namespace with init container and returns the Deployment
-func CreateDeploymentWithInitContainer(client kubernetes.Interface, deploymentName string, namespace string, volumeMount bool) (*appsv1.Deployment, error) {
-	logrus.Infof("Creating Deployment")
-	deploymentClient := client.AppsV1().Deployments(namespace)
-	var deploymentObj *appsv1.Deployment
-	if volumeMount {
-		deploymentObj = GetDeploymentWithInitContainer(namespace, deploymentName)
-	} else {
-		deploymentObj = GetDeploymentWithInitContainerAndEnv(namespace, deploymentName)
-	}
-	deployment, err := deploymentClient.Create(context.TODO(), deploymentObj, metav1.CreateOptions{})
-	time.Sleep(3 * time.Second)
-	return deployment, err
-}
-
-// CreateDeploymentWithEnvVarSource creates a deployment in given namespace and returns the Deployment
-func CreateDeploymentWithEnvVarSource(client kubernetes.Interface, deploymentName string, namespace string) (*appsv1.Deployment, error) {
-	logrus.Infof("Creating Deployment")
-	deploymentClient := client.AppsV1().Deployments(namespace)
-	deploymentObj := GetDeploymentWithEnvVarSources(namespace, deploymentName)
-	deployment, err := deploymentClient.Create(context.TODO(), deploymentObj, metav1.CreateOptions{})
-	time.Sleep(3 * time.Second)
-	return deployment, err
-
-}
-
-// CreateDeploymentWithPodAnnotations creates a deployment in given namespace and returns the Deployment
-func CreateDeploymentWithPodAnnotations(client kubernetes.Interface, deploymentName string, namespace string, both bool) (*appsv1.Deployment, error) {
-	logrus.Infof("Creating Deployment")
-	deploymentClient := client.AppsV1().Deployments(namespace)
-	deploymentObj := GetDeploymentWithPodAnnotations(namespace, deploymentName, both)
-	deployment, err := deploymentClient.Create(context.TODO(), deploymentObj, metav1.CreateOptions{})
-	time.Sleep(3 * time.Second)
-	return deployment, err
-}
-
-// CreateDeploymentWithEnvVarSourceAndAnnotations returns a deployment in given
-// namespace with given annotations.
-func CreateDeploymentWithEnvVarSourceAndAnnotations(client kubernetes.Interface, deploymentName string, namespace string, annotations map[string]string) (*appsv1.Deployment, error) {
-	logrus.Infof("Creating Deployment")
-	deploymentClient := client.AppsV1().Deployments(namespace)
-	deploymentObj := GetDeploymentWithEnvVarSources(namespace, deploymentName)
-	deploymentObj.Annotations = annotations
-	deployment, err := deploymentClient.Create(context.TODO(), deploymentObj, metav1.CreateOptions{})
-	time.Sleep(3 * time.Second)
-	return deployment, err
-}
-
-// CreateDeploymentWithTypedAutoAnnotation creates a deployment in given namespace and returns the Deployment with typed auto annotation
-func CreateDeploymentWithTypedAutoAnnotation(client kubernetes.Interface, deploymentName string, namespace string, resourceType string) (*appsv1.Deployment, error) {
-	logrus.Infof("Creating Deployment")
-	deploymentClient := client.AppsV1().Deployments(namespace)
-	deploymentObj := GetDeploymentWithTypedAutoAnnotation(namespace, deploymentName, resourceType)
-	deployment, err := deploymentClient.Create(context.TODO(), deploymentObj, metav1.CreateOptions{})
-	time.Sleep(3 * time.Second)
-	return deployment, err
-}
-
-// CreateDeploymentWithExcludeAnnotation creates a deployment in given namespace and returns the Deployment with typed auto annotation
-func CreateDeploymentWithExcludeAnnotation(client kubernetes.Interface, deploymentName string, namespace string, resourceType string) (*appsv1.Deployment, error) {
-	logrus.Infof("Creating Deployment")
-	deploymentClient := client.AppsV1().Deployments(namespace)
-	deploymentObj := GetDeploymentWithExcludeAnnotation(namespace, deploymentName, resourceType)
-	deployment, err := deploymentClient.Create(context.TODO(), deploymentObj, metav1.CreateOptions{})
-	return deployment, err
-}
-
 // CreateDaemonSet creates a deployment in given namespace and returns the DaemonSet
 func CreateDaemonSet(client kubernetes.Interface, daemonsetName string, namespace string, volumeMount bool) (*appsv1.DaemonSet, error) {
 	logrus.Infof("Creating DaemonSet")
@@ -968,14 +535,6 @@ func DeleteDeployment(client kubernetes.Interface, namespace string, deploymentN
 	return deploymentError
 }
 
-// DeleteDeploymentConfig deletes a deploymentConfig in given namespace and returns the error if any
-func DeleteDeploymentConfig(client appsclient.Interface, namespace string, deploymentConfigName string) error {
-	logrus.Infof("Deleting DeploymentConfig")
-	deploymentConfigError := client.AppsV1().DeploymentConfigs(namespace).Delete(context.TODO(), deploymentConfigName, metav1.DeleteOptions{})
-	time.Sleep(3 * time.Second)
-	return deploymentConfigError
-}
-
 // DeleteDaemonSet creates a daemonset in given namespace and returns the error if any
 func DeleteDaemonSet(client kubernetes.Interface, namespace string, daemonsetName string) error {
 	logrus.Infof("Deleting DaemonSet %s", daemonsetName)
@@ -1022,20 +581,6 @@ func UpdateConfigMap(configmapClient core_v1.ConfigMapInterface, namespace strin
 	return updateErr
 }
 
-// UpdateSecret updates a secret in given namespace and returns the error if any
-func UpdateSecret(secretClient core_v1.SecretInterface, namespace string, secretName string, label string, data string) error {
-	logrus.Infof("Updating secret %q.\n", secretName)
-	var secret *v1.Secret
-	if label != "" {
-		secret = GetSecretWithUpdatedLabel(namespace, secretName, label, data)
-	} else {
-		secret = GetSecret(namespace, secretName, data)
-	}
-	_, updateErr := secretClient.Update(context.TODO(), secret, metav1.UpdateOptions{})
-	time.Sleep(3 * time.Second)
-	return updateErr
-}
-
 // DeleteConfigMap deletes a configmap in given namespace and returns the error if any
 func DeleteConfigMap(client kubernetes.Interface, namespace string, configmapName string) error {
 	logrus.Infof("Deleting configmap %q.\n", configmapName)
@@ -1044,14 +589,6 @@ func DeleteConfigMap(client kubernetes.Interface, namespace string, configmapNam
 	return err
 }
 
-// DeleteSecret deletes a secret in given namespace and returns the error if any
-func DeleteSecret(client kubernetes.Interface, namespace string, secretName string) error {
-	logrus.Infof("Deleting secret %q.\n", secretName)
-	err := client.CoreV1().Secrets(namespace).Delete(context.TODO(), secretName, metav1.DeleteOptions{})
-	time.Sleep(3 * time.Second)
-	return err
-}
-
 // RandSeq generates a random sequence
 func RandSeq(n int) string {
 	b := make([]rune, n)
@@ -1107,100 +644,6 @@ func VerifyResourceEnvVarUpdate(clients kube.Clients, config common.Config, envV
 	return false
 }
 
-// VerifyResourceEnvVarRemoved verifies whether the rolling upgrade happened or not and all Envvars SKAKATER_name_CONFIGMAP/SECRET are removed
-func VerifyResourceEnvVarRemoved(clients kube.Clients, config common.Config, envVarPostfix string, upgradeFuncs callbacks.RollingUpgradeFuncs) bool {
-	items := upgradeFuncs.ItemsFunc(clients, config.Namespace)
-	for _, i := range items {
-		containers := upgradeFuncs.ContainersFunc(i)
-		accessor, err := meta.Accessor(i)
-		if err != nil {
-			return false
-		}
-
-		annotations := accessor.GetAnnotations()
-		// match statefulsets with the correct annotation
-
-		annotationValue := annotations[config.Annotation]
-		searchAnnotationValue := annotations[options.AutoSearchAnnotation]
-		reloaderEnabledValue := annotations[options.ReloaderAutoAnnotation]
-		typedAutoAnnotationEnabledValue := annotations[config.TypedAutoAnnotation]
-		reloaderEnabled, err := strconv.ParseBool(reloaderEnabledValue)
-		typedAutoAnnotationEnabled, errTyped := strconv.ParseBool(typedAutoAnnotationEnabledValue)
-
-		matches := false
-		if err == nil && reloaderEnabled || errTyped == nil && typedAutoAnnotationEnabled {
-			matches = true
-		} else if annotationValue != "" {
-			values := strings.Split(annotationValue, ",")
-			for _, value := range values {
-				value = strings.Trim(value, " ")
-				if value == config.ResourceName {
-					matches = true
-					break
-				}
-			}
-		} else if searchAnnotationValue == "true" {
-			if config.ResourceAnnotations[options.SearchMatchAnnotation] == "true" {
-				matches = true
-			}
-		}
-
-		if matches {
-			envName := constants.EnvVarPrefix + util.ConvertToEnvVarName(config.ResourceName) + "_" + envVarPostfix
-			value := GetResourceSHAFromEnvVar(containers, envName)
-			if value == "" {
-				return true
-			}
-		}
-	}
-	return false
-}
-
-// VerifyResourceAnnotationUpdate verifies whether the rolling upgrade happened or not
-func VerifyResourceAnnotationUpdate(clients kube.Clients, config common.Config, upgradeFuncs callbacks.RollingUpgradeFuncs) bool {
-	items := upgradeFuncs.ItemsFunc(clients, config.Namespace)
-	for _, i := range items {
-		podAnnotations := upgradeFuncs.PodAnnotationsFunc(i)
-		accessor, err := meta.Accessor(i)
-		if err != nil {
-			return false
-		}
-		annotations := accessor.GetAnnotations()
-		// match statefulsets with the correct annotation
-		annotationValue := annotations[config.Annotation]
-		searchAnnotationValue := annotations[options.AutoSearchAnnotation]
-		reloaderEnabledValue := annotations[options.ReloaderAutoAnnotation]
-		typedAutoAnnotationEnabledValue := annotations[config.TypedAutoAnnotation]
-		reloaderEnabled, _ := strconv.ParseBool(reloaderEnabledValue)
-		typedAutoAnnotationEnabled, _ := strconv.ParseBool(typedAutoAnnotationEnabledValue)
-		matches := false
-		if reloaderEnabled || typedAutoAnnotationEnabled || reloaderEnabledValue == "" && typedAutoAnnotationEnabledValue == "" && options.AutoReloadAll {
-			matches = true
-		} else if annotationValue != "" {
-			values := strings.Split(annotationValue, ",")
-			for _, value := range values {
-				value = strings.Trim(value, " ")
-				if value == config.ResourceName {
-					matches = true
-					break
-				}
-			}
-		} else if searchAnnotationValue == "true" {
-			if config.ResourceAnnotations[options.SearchMatchAnnotation] == "true" {
-				matches = true
-			}
-		}
-
-		if matches {
-			updated := GetResourceSHAFromAnnotation(podAnnotations)
-			if updated == config.SHAValue {
-				return true
-			}
-		}
-	}
-	return false
-}
-
 func GetSHAfromEmptyData() string {
 	return crypto.GenerateSHA("")
 }