Skip to content

Commit 8f23ad2

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#77754 from atoato88/issue-77103-use-ExpectError-e2e-lifecycle-bootstrap
Use framework.ExpectNoError() for e2e/lifecycle/bootstrap
2 parents c54b664 + d358517 commit 8f23ad2

File tree

2 files changed

+25
-26
lines changed

2 files changed

+25
-26
lines changed

‎test/e2e/lifecycle/bootstrap/bootstrap_signer.go‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ var _ = lifecycle.SIGDescribe("[Feature:BootstrapTokens]", func() {
4141
if len(secretNeedClean) > 0 {
4242
By("delete the bootstrap token secret")
4343
err := c.CoreV1().Secrets(metav1.NamespaceSystem).Delete(secretNeedClean, &metav1.DeleteOptions{})
44-
Expect(err).NotTo(HaveOccurred())
44+
framework.ExpectNoError(err)
4545
secretNeedClean = ""
4646
}
4747
})
@@ -52,22 +52,22 @@ var _ = lifecycle.SIGDescribe("[Feature:BootstrapTokens]", func() {
5252
It("should sign the new added bootstrap tokens", func() {
5353
By("create a new bootstrap token secret")
5454
tokenId, err := GenerateTokenId()
55-
Expect(err).NotTo(HaveOccurred())
55+
framework.ExpectNoError(err)
5656
secret := newTokenSecret(tokenId, "tokenSecret")
5757
_, err = c.CoreV1().Secrets(metav1.NamespaceSystem).Create(secret)
5858
secretNeedClean = bootstrapapi.BootstrapTokenSecretPrefix + tokenId
5959

60-
Expect(err).NotTo(HaveOccurred())
60+
framework.ExpectNoError(err)
6161

6262
By("wait for the bootstrap token secret be signed")
6363
err = WaitforSignedClusterInfoByBootStrapToken(c, tokenId)
64-
Expect(err).NotTo(HaveOccurred())
64+
framework.ExpectNoError(err)
6565
})
6666

6767
It("should resign the bootstrap tokens when the clusterInfo ConfigMap updated [Serial][Disruptive]", func() {
6868
By("create a new bootstrap token secret")
6969
tokenId, err := GenerateTokenId()
70-
Expect(err).NotTo(HaveOccurred())
70+
framework.ExpectNoError(err)
7171
secret := newTokenSecret(tokenId, "tokenSecret")
7272
secret, err = c.CoreV1().Secrets(metav1.NamespaceSystem).Create(secret)
7373
secretNeedClean = bootstrapapi.BootstrapTokenSecretPrefix + tokenId
@@ -76,49 +76,49 @@ var _ = lifecycle.SIGDescribe("[Feature:BootstrapTokens]", func() {
7676
err = WaitforSignedClusterInfoByBootStrapToken(c, tokenId)
7777

7878
cfgMap, err := f.ClientSet.CoreV1().ConfigMaps(metav1.NamespacePublic).Get(bootstrapapi.ConfigMapClusterInfo, metav1.GetOptions{})
79-
Expect(err).NotTo(HaveOccurred())
79+
framework.ExpectNoError(err)
8080
signedToken, ok := cfgMap.Data[bootstrapapi.JWSSignatureKeyPrefix+tokenId]
8181
Expect(ok).Should(Equal(true))
8282

8383
By("update the cluster-info ConfigMap")
8484
originalData := cfgMap.Data[bootstrapapi.KubeConfigKey]
8585
updatedKubeConfig, err := randBytes(20)
86-
Expect(err).NotTo(HaveOccurred())
86+
framework.ExpectNoError(err)
8787
cfgMap.Data[bootstrapapi.KubeConfigKey] = updatedKubeConfig
8888
_, err = f.ClientSet.CoreV1().ConfigMaps(metav1.NamespacePublic).Update(cfgMap)
89-
Expect(err).NotTo(HaveOccurred())
89+
framework.ExpectNoError(err)
9090
defer func() {
9191
By("update back the cluster-info ConfigMap")
9292
cfgMap, err = f.ClientSet.CoreV1().ConfigMaps(metav1.NamespacePublic).Get(bootstrapapi.ConfigMapClusterInfo, metav1.GetOptions{})
93-
Expect(err).NotTo(HaveOccurred())
93+
framework.ExpectNoError(err)
9494
cfgMap.Data[bootstrapapi.KubeConfigKey] = originalData
9595
_, err = f.ClientSet.CoreV1().ConfigMaps(metav1.NamespacePublic).Update(cfgMap)
96-
Expect(err).NotTo(HaveOccurred())
96+
framework.ExpectNoError(err)
9797
}()
9898

9999
By("wait for signed bootstrap token updated")
100100
err = WaitForSignedClusterInfoGetUpdatedByBootstrapToken(c, tokenId, signedToken)
101-
Expect(err).NotTo(HaveOccurred())
101+
framework.ExpectNoError(err)
102102
})
103103

104104
It("should delete the signed bootstrap tokens from clusterInfo ConfigMap when bootstrap token is deleted", func() {
105105
By("create a new bootstrap token secret")
106106
tokenId, err := GenerateTokenId()
107-
Expect(err).NotTo(HaveOccurred())
107+
framework.ExpectNoError(err)
108108
secret := newTokenSecret(tokenId, "tokenSecret")
109109
_, err = c.CoreV1().Secrets(metav1.NamespaceSystem).Create(secret)
110-
Expect(err).NotTo(HaveOccurred())
110+
framework.ExpectNoError(err)
111111

112112
By("wait for the bootstrap secret be signed")
113113
err = WaitforSignedClusterInfoByBootStrapToken(c, tokenId)
114-
Expect(err).NotTo(HaveOccurred())
114+
framework.ExpectNoError(err)
115115

116116
By("delete the bootstrap token secret")
117117
err = c.CoreV1().Secrets(metav1.NamespaceSystem).Delete(bootstrapapi.BootstrapTokenSecretPrefix+tokenId, &metav1.DeleteOptions{})
118-
Expect(err).NotTo(HaveOccurred())
118+
framework.ExpectNoError(err)
119119

120120
By("wait for the bootstrap token removed from cluster-info ConfigMap")
121121
err = WaitForSignedClusterInfoByBootstrapTokenToDisappear(c, tokenId)
122-
Expect(err).NotTo(HaveOccurred())
122+
framework.ExpectNoError(err)
123123
})
124124
})

‎test/e2e/lifecycle/bootstrap/bootstrap_token_cleaner.go‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
"time"
2121

2222
. "github.com/onsi/ginkgo"
23-
. "github.com/onsi/gomega"
2423

2524
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2625
clientset "k8s.io/client-go/kubernetes"
@@ -45,41 +44,41 @@ var _ = lifecycle.SIGDescribe("[Feature:BootstrapTokens]", func() {
4544
By("delete the bootstrap token secret")
4645
err := c.CoreV1().Secrets(metav1.NamespaceSystem).Delete(secretNeedClean, &metav1.DeleteOptions{})
4746
secretNeedClean = ""
48-
Expect(err).NotTo(HaveOccurred())
47+
framework.ExpectNoError(err)
4948
}
5049
})
5150
It("should delete the token secret when the secret expired", func() {
5251
By("create a new expired bootstrap token secret")
5352
tokenId, err := GenerateTokenId()
54-
Expect(err).NotTo(HaveOccurred())
53+
framework.ExpectNoError(err)
5554
tokenSecret, err := GenerateTokenSecret()
56-
Expect(err).NotTo(HaveOccurred())
55+
framework.ExpectNoError(err)
5756

5857
secret := newTokenSecret(tokenId, tokenSecret)
5958
addSecretExpiration(secret, TimeStringFromNow(-time.Hour))
6059
_, err = c.CoreV1().Secrets(metav1.NamespaceSystem).Create(secret)
6160

62-
Expect(err).NotTo(HaveOccurred())
61+
framework.ExpectNoError(err)
6362

6463
By("wait for the bootstrap token secret be deleted")
6564
err = WaitForBootstrapTokenSecretToDisappear(c, tokenId)
66-
Expect(err).NotTo(HaveOccurred())
65+
framework.ExpectNoError(err)
6766
})
6867

6968
It("should not delete the token secret when the secret is not expired", func() {
7069
By("create a new expired bootstrap token secret")
7170
tokenId, err := GenerateTokenId()
72-
Expect(err).NotTo(HaveOccurred())
71+
framework.ExpectNoError(err)
7372
tokenSecret, err := GenerateTokenSecret()
74-
Expect(err).NotTo(HaveOccurred())
73+
framework.ExpectNoError(err)
7574
secret := newTokenSecret(tokenId, tokenSecret)
7675
addSecretExpiration(secret, TimeStringFromNow(time.Hour))
7776
_, err = c.CoreV1().Secrets(metav1.NamespaceSystem).Create(secret)
7877
secretNeedClean = bootstrapapi.BootstrapTokenSecretPrefix + tokenId
79-
Expect(err).NotTo(HaveOccurred())
78+
framework.ExpectNoError(err)
8079

8180
By("wait for the bootstrap token secret not be deleted")
8281
err = WaitForBootstrapTokenSecretNotDisappear(c, tokenId, 20*time.Second)
83-
Expect(err).NotTo(HaveOccurred())
82+
framework.ExpectNoError(err)
8483
})
8584
})

0 commit comments

Comments
 (0)