Merge pull request #45062 from FengyunPan/fix-e2e-daemonset-secret

test/e2e_federation/daemonset.go

@@ -245,7 +245,8 @@ func waitForDaemonSetOrFail(clientset *kubeclientset.Clientset, namespace string
 	By(fmt.Sprintf("Fetching a federated daemonset shard of daemonset %q in namespace %q from cluster", daemonset.Name, namespace))
 	var clusterDaemonSet *v1beta1.DaemonSet
 	err := wait.PollImmediate(framework.Poll, timeout, func() (bool, error) {
-		clusterDaemonSet, err := clientset.Extensions().DaemonSets(namespace).Get(daemonset.Name, metav1.GetOptions{})
+		var err error
+		clusterDaemonSet, err = clientset.Extensions().DaemonSets(namespace).Get(daemonset.Name, metav1.GetOptions{})
 		if (!present) && errors.IsNotFound(err) { // We want it gone, and it's gone.
 			By(fmt.Sprintf("Success: shard of federated daemonset %q in namespace %q in cluster is absent", daemonset.Name, namespace))
 			return true, nil // Success

test/e2e_federation/secret.go

@@ -225,7 +225,8 @@ func waitForSecretOrFail(clientset *kubeclientset.Clientset, nsName string, secr
 	By(fmt.Sprintf("Fetching a federated secret shard of secret %q in namespace %q from cluster", secret.Name, nsName))
 	var clusterSecret *v1.Secret
 	err := wait.PollImmediate(framework.Poll, timeout, func() (bool, error) {
-		clusterSecret, err := clientset.Core().Secrets(nsName).Get(secret.Name, metav1.GetOptions{})
+		var err error
+		clusterSecret, err = clientset.Core().Secrets(nsName).Get(secret.Name, metav1.GetOptions{})
 		if (!present) && errors.IsNotFound(err) { // We want it gone, and it's gone.
 			By(fmt.Sprintf("Success: shard of federated secret %q in namespace %q in cluster is absent", secret.Name, nsName))
 			return true, nil // Success