github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

e2e_kubeadm: stop using deprecated framework.ExpectEqual

Browse Source
This commit is contained in:
SataQiu 2023-05-12 11:54:54 +08:00
parent 02659772cb
commit feb63fb028
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e_kubeadm/dns_addon_test.go
View File

@ -97,7 +97,7 @@ var _ = Describe("DNS addon", func() {
d := GetDeployment(f.ClientSet, kubeSystemNamespace, kubeDNSDeploymentName) 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) 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))
}) })
}) })
}) })

4
test/e2e_kubeadm/kubeadm_certs_test.go
View File

@ -68,11 +68,11 @@ var _ = Describe("kubeadm-certs [copy-certs]", func() {
// Checks the kubeadm-certs is ownen by a time lived token // 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) gomega.Expect(s.OwnerReferences).To(gomega.HaveLen(1), "%s should have one owner reference", kubeadmCertsSecretName)
ownRef := s.OwnerReferences[0] 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) gomega.Expect(*ownRef.BlockOwnerDeletion).To(gomega.BeTrue(), "%s should be deleted on owner deletion", kubeadmCertsSecretName)
o := GetSecret(f.ClientSet, kubeSystemNamespace, ownRef.Name) 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) 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 // gets the ClusterConfiguration from the kubeadm kubeadm-config ConfigMap as a untyped map

2
test/e2e_kubeadm/kubeadm_config_test.go
View File

@ -19,7 +19,7 @@ package kubeadm
import ( import (
"context" "context"
yaml "gopkg.in/yaml.v2" "gopkg.in/yaml.v2"
authv1 "k8s.io/api/authorization/v1" authv1 "k8s.io/api/authorization/v1"
rbacv1 "k8s.io/api/rbac/v1" rbacv1 "k8s.io/api/rbac/v1"
clientset "k8s.io/client-go/kubernetes" clientset "k8s.io/client-go/kubernetes"

2
test/e2e_kubeadm/proxy_addon_test.go
View File

@ -100,7 +100,7 @@ var _ = Describe("proxy addon", func() {
ginkgo.It("should exist and be properly configured", func(ctx context.Context) { ginkgo.It("should exist and be properly configured", func(ctx context.Context) {
ds := GetDaemonSet(f.ClientSet, kubeSystemNamespace, kubeProxyDaemonSetName) 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))
}) })
}) })
}) })