github/open-cluster-management
1
0
Fork 0
mirror of https://github.com/open-cluster-management-io/ocm.git synced 2026-05-11 03:39:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #46 from zhiweiyin318/fix-conflict

Browse Source 
fix fails when retry on conflict
This commit is contained in:
OpenShift Merge Robot
2020-06-23 18:04:54 +02:00
committed by GitHub
parent cf4f96310b 0a74648f0f
commit 47720cd026
2 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
test/e2e/loopback_test.go
View File

@@ -184,20 +184,20 @@ var _ = ginkgo.Describe("Loopback registration [development]", func() {
var csr *certificatesv1beta1.CertificateSigningRequest
for i := range csrs.Items {
csr = &csrs.Items[i]
csr, err = csrClient.Get(context.TODO(), csr.Name, metav1.GetOptions{})
gomega.Expect(err).ToNot(gomega.HaveOccurred())
if helpers.IsCSRInTerminalState(&csr.Status) {
continue
}
csr.Status.Conditions = append(csr.Status.Conditions, certificatesv1beta1.CertificateSigningRequestCondition{
Type: certificatesv1beta1.CertificateApproved,
Reason: "Approved by E2E",
Message: "Approved as part of Loopback e2e",
})
err = retry.RetryOnConflict(retry.DefaultRetry, func() error {
csr, err = csrClient.Get(context.TODO(), csr.Name, metav1.GetOptions{})
gomega.Expect(err).ToNot(gomega.HaveOccurred())
if helpers.IsCSRInTerminalState(&csr.Status) {
return nil
}
csr.Status.Conditions = append(csr.Status.Conditions, certificatesv1beta1.CertificateSigningRequestCondition{
Type: certificatesv1beta1.CertificateApproved,
Reason: "Approved by E2E",
Message: "Approved as part of Loopback e2e",
})
_, err := csrClient.UpdateApproval(context.TODO(), csr, metav1.UpdateOptions{})
return err
})

18
test/e2e/webhook_test.go
View File

@@ -113,12 +113,11 @@ var _ = ginkgo.Describe("Managed cluster admission hook", func() {
ginkgo.It("Should respond bad request when updating a managed cluster with invalid external server URLs", func() {
ginkgo.By(fmt.Sprintf("update managed cluster %q with an invalid external server URL %q", clusterName, invalidURL))
managedCluster, err := clusterClient.ClusterV1().ManagedClusters().Get(context.TODO(), clusterName, metav1.GetOptions{})
gomega.Expect(err).NotTo(gomega.HaveOccurred())
err := retry.RetryOnConflict(retry.DefaultRetry, func() error {
managedCluster, err := clusterClient.ClusterV1().ManagedClusters().Get(context.TODO(), clusterName, metav1.GetOptions{})
gomega.Expect(err).NotTo(gomega.HaveOccurred())
managedCluster.Spec.ManagedClusterClientConfigs[0].URL = invalidURL
err = retry.RetryOnConflict(retry.DefaultRetry, func() error {
managedCluster.Spec.ManagedClusterClientConfigs[0].URL = invalidURL
_, err = clusterClient.ClusterV1().ManagedClusters().Update(context.TODO(), managedCluster, metav1.UpdateOptions{})
return err
})
@@ -140,12 +139,11 @@ var _ = ginkgo.Describe("Managed cluster admission hook", func() {
unauthorizedClient, err := buildUnauthorizedClusterClient(sa)
gomega.Expect(err).ToNot(gomega.HaveOccurred())
spokeCluster, err := unauthorizedClient.ClusterV1().ManagedClusters().Get(context.TODO(), clusterName, metav1.GetOptions{})
gomega.Expect(err).NotTo(gomega.HaveOccurred())
spokeCluster.Spec.HubAcceptsClient = true
err = retry.RetryOnConflict(retry.DefaultRetry, func() error {
spokeCluster, err := unauthorizedClient.ClusterV1().ManagedClusters().Get(context.TODO(), clusterName, metav1.GetOptions{})
gomega.Expect(err).NotTo(gomega.HaveOccurred())
spokeCluster.Spec.HubAcceptsClient = true
_, err = unauthorizedClient.ClusterV1().ManagedClusters().Update(context.TODO(), spokeCluster, metav1.UpdateOptions{})
return err
})