github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-09 12:07:47 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #117960 from SataQiu/fix-e2e-20230512

Browse Source 
e2e_kubeadm: stop using deprecated framework.ExpectEqual
This commit is contained in:
Kubernetes Prow Robot 2023-05-12 00:04:48 -07:00 committed by GitHub
commit ac7e5cbf69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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)
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))
})
})
})

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
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

2
test/e2e_kubeadm/kubeadm_config_test.go
View File

@ -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"

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) {
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))
})
})
})