From 3131116ed665b5686df8443263908c433a213a13 Mon Sep 17 00:00:00 2001 From: Vlad Losev Date: Thu, 4 Jun 2020 10:05:44 -0700 Subject: [PATCH] Re-adds sleep statements. --- internal/pkg/handler/upgrade_test.go | 16 ++++++++++++++++ internal/pkg/testutil/kube.go | 17 +++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/internal/pkg/handler/upgrade_test.go b/internal/pkg/handler/upgrade_test.go index 578757bb..565cd9e8 100644 --- a/internal/pkg/handler/upgrade_test.go +++ b/internal/pkg/handler/upgrade_test.go @@ -715,6 +715,7 @@ func TestRollingUpgradeForDeploymentWithConfigmapViaSearchAnnotationNoTriggers(t logrus.Infof("Verifying deployment update") updated := testutil.VerifyResourceUpdate(clients, config, constants.ConfigmapEnvVarPostfix, deploymentFuncs) + time.Sleep(5 * time.Second) if updated { t.Errorf("Deployment was updated unexpectedly") } @@ -771,6 +772,7 @@ func TestRollingUpgradeForDeploymentWithConfigmapInInitContainer(t *testing.T) { collectors := getCollectors() err := PerformRollingUpgrade(clients, config, deploymentFuncs, collectors) + time.Sleep(5 * time.Second) if err != nil { t.Errorf("Rolling upgrade failed for Deployment with Configmap") } @@ -816,6 +818,7 @@ func TestRollingUpgradeForDeploymentWithConfigmapAsEnvVar(t *testing.T) { collectors := getCollectors() err := PerformRollingUpgrade(clients, config, deploymentFuncs, collectors) + time.Sleep(5 * time.Second) if err != nil { t.Errorf("Rolling upgrade failed for Deployment with Configmap used as env var") } @@ -838,6 +841,7 @@ func TestRollingUpgradeForDeploymentWithConfigmapAsEnvVarInInitContainer(t *test collectors := getCollectors() err := PerformRollingUpgrade(clients, config, deploymentFuncs, collectors) + time.Sleep(5 * time.Second) if err != nil { t.Errorf("Rolling upgrade failed for Deployment with Configmap used as env var") } @@ -860,6 +864,7 @@ func TestRollingUpgradeForDeploymentWithConfigmapAsEnvVarFrom(t *testing.T) { collectors := getCollectors() err := PerformRollingUpgrade(clients, config, deploymentFuncs, collectors) + time.Sleep(5 * time.Second) if err != nil { t.Errorf("Rolling upgrade failed for Deployment with Configmap used as env var") } @@ -882,6 +887,7 @@ func TestRollingUpgradeForDeploymentWithSecret(t *testing.T) { collectors := getCollectors() err := PerformRollingUpgrade(clients, config, deploymentFuncs, collectors) + time.Sleep(5 * time.Second) if err != nil { t.Errorf("Rolling upgrade failed for Deployment with Secret") } @@ -927,6 +933,7 @@ func TestRollingUpgradeForDeploymentWithSecretinInitContainer(t *testing.T) { collectors := getCollectors() err := PerformRollingUpgrade(clients, config, deploymentFuncs, collectors) + time.Sleep(5 * time.Second) if err != nil { t.Errorf("Rolling upgrade failed for Deployment with Secret") } @@ -972,6 +979,7 @@ func TestRollingUpgradeForDeploymentWithSecretAsEnvVar(t *testing.T) { collectors := getCollectors() err := PerformRollingUpgrade(clients, config, deploymentFuncs, collectors) + time.Sleep(5 * time.Second) if err != nil { t.Errorf("Rolling upgrade failed for Deployment with Secret") } @@ -994,6 +1002,7 @@ func TestRollingUpgradeForDeploymentWithSecretAsEnvVarFrom(t *testing.T) { collectors := getCollectors() err := PerformRollingUpgrade(clients, config, deploymentFuncs, collectors) + time.Sleep(5 * time.Second) if err != nil { t.Errorf("Rolling upgrade failed for Deployment with Secret") } @@ -1016,6 +1025,7 @@ func TestRollingUpgradeForDeploymentWithSecretAsEnvVarInInitContainer(t *testing collectors := getCollectors() err := PerformRollingUpgrade(clients, config, deploymentFuncs, collectors) + time.Sleep(5 * time.Second) if err != nil { t.Errorf("Rolling upgrade failed for Deployment with Secret") } @@ -1038,6 +1048,7 @@ func TestRollingUpgradeForDaemonSetWithConfigmap(t *testing.T) { collectors := getCollectors() err := PerformRollingUpgrade(clients, config, daemonSetFuncs, collectors) + time.Sleep(5 * time.Second) if err != nil { t.Errorf("Rolling upgrade failed for DaemonSet with configmap") } @@ -1083,6 +1094,7 @@ func TestRollingUpgradeForDaemonSetWithConfigmapAsEnvVar(t *testing.T) { collectors := getCollectors() err := PerformRollingUpgrade(clients, config, daemonSetFuncs, collectors) + time.Sleep(5 * time.Second) if err != nil { t.Errorf("Rolling upgrade failed for DaemonSet with configmap used as env var") } @@ -1105,6 +1117,7 @@ func TestRollingUpgradeForDaemonSetWithSecret(t *testing.T) { collectors := getCollectors() err := PerformRollingUpgrade(clients, config, daemonSetFuncs, collectors) + time.Sleep(5 * time.Second) if err != nil { t.Errorf("Rolling upgrade failed for DaemonSet with secret") } @@ -1150,6 +1163,7 @@ func TestRollingUpgradeForStatefulSetWithConfigmap(t *testing.T) { collectors := getCollectors() err := PerformRollingUpgrade(clients, config, statefulSetFuncs, collectors) + time.Sleep(5 * time.Second) if err != nil { t.Errorf("Rolling upgrade failed for StatefulSet with configmap") } @@ -1195,6 +1209,7 @@ func TestRollingUpgradeForStatefulSetWithSecret(t *testing.T) { collectors := getCollectors() err := PerformRollingUpgrade(clients, config, statefulSetFuncs, collectors) + time.Sleep(5 * time.Second) if err != nil { t.Errorf("Rolling upgrade failed for StatefulSet with secret") } @@ -1240,6 +1255,7 @@ func TestRollingUpgradeForDeploymentWithPodAnnotations(t *testing.T) { collectors := getCollectors() err := PerformRollingUpgrade(clients, config, deploymentFuncs, collectors) + time.Sleep(5 * time.Second) if err != nil { t.Errorf("Rolling upgrade failed for Deployment with pod annotations") } diff --git a/internal/pkg/testutil/kube.go b/internal/pkg/testutil/kube.go index 6d2d9938..07acd05d 100644 --- a/internal/pkg/testutil/kube.go +++ b/internal/pkg/testutil/kube.go @@ -598,6 +598,7 @@ func CreateConfigMap(client kubernetes.Interface, namespace string, configmapNam logrus.Infof("Creating configmap") configmapClient := client.CoreV1().ConfigMaps(namespace) _, err := configmapClient.Create(GetConfigmap(namespace, configmapName, data)) + time.Sleep(3 * time.Second) return configmapClient, err } @@ -606,6 +607,7 @@ func CreateSecret(client kubernetes.Interface, namespace string, secretName stri logrus.Infof("Creating secret") secretClient := client.CoreV1().Secrets(namespace) _, err := secretClient.Create(GetSecret(namespace, secretName, data)) + time.Sleep(3 * time.Second) return secretClient, err } // CreateDeployment creates a deployment in given namespace and returns the Deployment @@ -619,6 +621,7 @@ func CreateDeployment(client kubernetes.Interface, deploymentName string, namesp deploymentObj = GetDeploymentWithEnvVars(namespace, deploymentName) } deployment, err := deploymentClient.Create(deploymentObj) + time.Sleep(3 * time.Second) return deployment, err } @@ -633,6 +636,7 @@ func CreateDeploymentConfig(client appsclient.Interface, deploymentName string, deploymentConfigObj = GetDeploymentConfigWithEnvVars(namespace, deploymentName) } deploymentConfig, err := deploymentConfigsClient.Create(deploymentConfigObj) + time.Sleep(5 * time.Second) return deploymentConfig, err } @@ -647,6 +651,7 @@ func CreateDeploymentWithInitContainer(client kubernetes.Interface, deploymentNa deploymentObj = GetDeploymentWithInitContainerAndEnv(namespace, deploymentName) } deployment, err := deploymentClient.Create(deploymentObj) + time.Sleep(3 * time.Second) return deployment, err } @@ -658,6 +663,7 @@ func CreateDeploymentWithEnvVarSourceAndAnnotations(client kubernetes.Interface, deploymentObj := GetDeploymentWithEnvVarSources(namespace, deploymentName) deploymentObj.Annotations = annotations deployment, err := deploymentClient.Create(deploymentObj) + time.Sleep(3 * time.Second) return deployment, err } @@ -672,6 +678,7 @@ func CreateDeploymentWithPodAnnotations(client kubernetes.Interface, deploymentN deploymentClient := client.AppsV1().Deployments(namespace) deploymentObj := GetDeploymentWithPodAnnotations(namespace, deploymentName, both) deployment, err := deploymentClient.Create(deploymentObj) + time.Sleep(3 * time.Second) return deployment, err } @@ -686,6 +693,7 @@ func CreateDaemonSet(client kubernetes.Interface, daemonsetName string, namespac daemonsetObj = GetDaemonSetWithEnvVars(namespace, daemonsetName) } daemonset, err := daemonsetClient.Create(daemonsetObj) + time.Sleep(3 * time.Second) return daemonset, err } @@ -700,6 +708,7 @@ func CreateStatefulSet(client kubernetes.Interface, statefulsetName string, name statefulsetObj = GetStatefulSetWithEnvVar(namespace, statefulsetName) } statefulset, err := statefulsetClient.Create(statefulsetObj) + time.Sleep(3 * time.Second) return statefulset, err } @@ -707,6 +716,7 @@ func CreateStatefulSet(client kubernetes.Interface, statefulsetName string, name func DeleteDeployment(client kubernetes.Interface, namespace string, deploymentName string) error { logrus.Infof("Deleting Deployment") deploymentError := client.AppsV1().Deployments(namespace).Delete(deploymentName, &metav1.DeleteOptions{}) + time.Sleep(3 * time.Second) return deploymentError } @@ -714,6 +724,7 @@ func DeleteDeployment(client kubernetes.Interface, namespace string, deploymentN func DeleteDeploymentConfig(client appsclient.Interface, namespace string, deploymentConfigName string) error { logrus.Infof("Deleting DeploymentConfig") deploymentConfigError := client.AppsV1().DeploymentConfigs(namespace).Delete(deploymentConfigName, &metav1.DeleteOptions{}) + time.Sleep(3 * time.Second) return deploymentConfigError } @@ -721,6 +732,7 @@ func DeleteDeploymentConfig(client appsclient.Interface, namespace string, deplo func DeleteDaemonSet(client kubernetes.Interface, namespace string, daemonsetName string) error { logrus.Infof("Deleting DaemonSet %s", daemonsetName) daemonsetError := client.AppsV1().DaemonSets(namespace).Delete(daemonsetName, &metav1.DeleteOptions{}) + time.Sleep(3 * time.Second) return daemonsetError } @@ -728,6 +740,7 @@ func DeleteDaemonSet(client kubernetes.Interface, namespace string, daemonsetNam func DeleteStatefulSet(client kubernetes.Interface, namespace string, statefulsetName string) error { logrus.Infof("Deleting StatefulSet %s", statefulsetName) statefulsetError := client.AppsV1().StatefulSets(namespace).Delete(statefulsetName, &metav1.DeleteOptions{}) + time.Sleep(3 * time.Second) return statefulsetError } @@ -741,6 +754,7 @@ func UpdateConfigMap(configmapClient core_v1.ConfigMapInterface, namespace strin configmap = GetConfigmap(namespace, configmapName, data) } _, updateErr := configmapClient.Update(configmap) + time.Sleep(3 * time.Second) return updateErr } @@ -754,6 +768,7 @@ func UpdateSecret(secretClient core_v1.SecretInterface, namespace string, secret secret = GetSecret(namespace, secretName, data) } _, updateErr := secretClient.Update(secret) + time.Sleep(3 * time.Second) return updateErr } @@ -761,6 +776,7 @@ func UpdateSecret(secretClient core_v1.SecretInterface, namespace string, secret func DeleteConfigMap(client kubernetes.Interface, namespace string, configmapName string) error { logrus.Infof("Deleting configmap %q.\n", configmapName) err := client.CoreV1().ConfigMaps(namespace).Delete(configmapName, &metav1.DeleteOptions{}) + time.Sleep(3 * time.Second) return err } @@ -768,6 +784,7 @@ func DeleteConfigMap(client kubernetes.Interface, namespace string, configmapNam func DeleteSecret(client kubernetes.Interface, namespace string, secretName string) error { logrus.Infof("Deleting secret %q.\n", secretName) err := client.CoreV1().Secrets(namespace).Delete(secretName, &metav1.DeleteOptions{}) + time.Sleep(3 * time.Second) return err }