diff --git a/test/e2e_kubeadm/dns_addon_test.go b/test/e2e_kubeadm/dns_addon_test.go index f8f42337d95..b0f10851793 100644 --- a/test/e2e_kubeadm/dns_addon_test.go +++ b/test/e2e_kubeadm/dns_addon_test.go @@ -97,7 +97,7 @@ var _ = Describe("DNS addon", func() { d := GetDeployment(f.ClientSet, kubeSystemNamespace, kubeDNSDeploymentName) - framework.ExpectEqual(d.Spec.Template.Spec.ServiceAccountName, kubeDNSServiceAccountName) + gomega.Expect(d.Spec.Template.Spec.ServiceAccountName).To(gomega.Equal(kubeDNSServiceAccountName)) }) }) }) @@ -142,7 +142,7 @@ var _ = Describe("DNS addon", func() { d := GetDeployment(f.ClientSet, kubeSystemNamespace, coreDNSDeploymentName) - framework.ExpectEqual(d.Spec.Template.Spec.ServiceAccountName, coreDNSServiceAccountName) + gomega.Expect(d.Spec.Template.Spec.ServiceAccountName).To(gomega.Equal(coreDNSServiceAccountName)) }) }) }) diff --git a/test/e2e_kubeadm/kubeadm_certs_test.go b/test/e2e_kubeadm/kubeadm_certs_test.go index e5a368eed93..9bc78b3bba3 100644 --- a/test/e2e_kubeadm/kubeadm_certs_test.go +++ b/test/e2e_kubeadm/kubeadm_certs_test.go @@ -68,11 +68,11 @@ var _ = Describe("kubeadm-certs [copy-certs]", func() { // Checks the kubeadm-certs is ownen by a time lived token gomega.Expect(s.OwnerReferences).To(gomega.HaveLen(1), "%s should have one owner reference", kubeadmCertsSecretName) ownRef := s.OwnerReferences[0] - framework.ExpectEqual(ownRef.Kind, "Secret", "%s should be owned by a secret", kubeadmCertsSecretName) + gomega.Expect(ownRef.Kind).To(gomega.Equal("Secret"), "%s should be owned by a secret", kubeadmCertsSecretName) gomega.Expect(*ownRef.BlockOwnerDeletion).To(gomega.BeTrue(), "%s should be deleted on owner deletion", kubeadmCertsSecretName) o := GetSecret(f.ClientSet, kubeSystemNamespace, ownRef.Name) - framework.ExpectEqual(o.Type, corev1.SecretTypeBootstrapToken, "%s should have an owner reference that refers to a bootstrap-token", kubeadmCertsSecretName) + gomega.Expect(o.Type).To(gomega.Equal(corev1.SecretTypeBootstrapToken), "%s should have an owner reference that refers to a bootstrap-token", kubeadmCertsSecretName) gomega.Expect(o.Data).To(gomega.HaveKey("expiration"), "%s should have an owner reference with an expiration", kubeadmCertsSecretName) // gets the ClusterConfiguration from the kubeadm kubeadm-config ConfigMap as a untyped map diff --git a/test/e2e_kubeadm/kubeadm_config_test.go b/test/e2e_kubeadm/kubeadm_config_test.go index 3fb6ef6b98c..d3045d3d9fa 100644 --- a/test/e2e_kubeadm/kubeadm_config_test.go +++ b/test/e2e_kubeadm/kubeadm_config_test.go @@ -19,7 +19,7 @@ package kubeadm import ( "context" - yaml "gopkg.in/yaml.v2" + "gopkg.in/yaml.v2" authv1 "k8s.io/api/authorization/v1" rbacv1 "k8s.io/api/rbac/v1" clientset "k8s.io/client-go/kubernetes" diff --git a/test/e2e_kubeadm/proxy_addon_test.go b/test/e2e_kubeadm/proxy_addon_test.go index a7332910c5a..2b9b2631a93 100644 --- a/test/e2e_kubeadm/proxy_addon_test.go +++ b/test/e2e_kubeadm/proxy_addon_test.go @@ -100,7 +100,7 @@ var _ = Describe("proxy addon", func() { ginkgo.It("should exist and be properly configured", func(ctx context.Context) { ds := GetDaemonSet(f.ClientSet, kubeSystemNamespace, kubeProxyDaemonSetName) - framework.ExpectEqual(ds.Spec.Template.Spec.ServiceAccountName, kubeProxyServiceAccountName) + gomega.Expect(ds.Spec.Template.Spec.ServiceAccountName).To(gomega.Equal(kubeProxyServiceAccountName)) }) }) })