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

🌱 Refactor code to fix lint warning (#218)

Browse Source 
* Refactor code to fix lint warning

Signed-off-by: Jian Qiu <jqiu@redhat.com>

* enable lint for testing files

Signed-off-by: Jian Qiu <jqiu@redhat.com>

---------

Signed-off-by: Jian Qiu <jqiu@redhat.com>
This commit is contained in:
Jian Qiu
2023-07-25 13:12:34 +08:00
committed by GitHub
parent e22faa4545
commit e810520961
145 changed files with 1218 additions and 935 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
test/e2e/addon_lease_test.go
View File

@@ -5,8 +5,8 @@ import (
"fmt"
"time"
ginkgo "github.com/onsi/ginkgo/v2"
gomega "github.com/onsi/gomega"
"github.com/onsi/ginkgo/v2"
"github.com/onsi/gomega"
coordv1 "k8s.io/api/coordination/v1"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
@@ -19,6 +19,8 @@ import (
operatorapiv1 "open-cluster-management.io/api/operator/v1"
)
const availableLabelValue = "available"
var _ = ginkgo.Describe("Addon Health Check", func() {
ginkgo.Context("Checking addon lease on managed cluster to update addon status", func() {
var addOnName string
@@ -79,7 +81,7 @@ var _ = ginkgo.Describe("Addon Health Check", func() {
return false
}
key := fmt.Sprintf("feature.open-cluster-management.io/addon-%s", addOnName)
return cluster.Labels[key] == "available"
return cluster.Labels[key] == availableLabelValue
}, t.EventuallyTimeout*5, t.EventuallyInterval*5).Should(gomega.BeTrue())
})
@@ -117,7 +119,7 @@ var _ = ginkgo.Describe("Addon Health Check", func() {
return false
}
key := fmt.Sprintf("feature.open-cluster-management.io/addon-%s", addOnName)
return cluster.Labels[key] == "available"
return cluster.Labels[key] == availableLabelValue
}, t.EventuallyTimeout*5, t.EventuallyInterval*5).Should(gomega.BeTrue())
ginkgo.By(fmt.Sprintf("Updating lease %q with a past time", addOnName))
@@ -186,7 +188,7 @@ var _ = ginkgo.Describe("Addon Health Check", func() {
return false
}
key := fmt.Sprintf("feature.open-cluster-management.io/addon-%s", addOnName)
return cluster.Labels[key] == "available"
return cluster.Labels[key] == availableLabelValue
}, t.EventuallyTimeout*5, t.EventuallyInterval*5).Should(gomega.BeTrue())
ginkgo.By(fmt.Sprintf("Deleting lease %q", addOnName))
@@ -223,7 +225,7 @@ var _ = ginkgo.Describe("Addon Health Check", func() {
var klusterletName, clusterName, addOnName string
ginkgo.BeforeEach(func() {
if !deployKlusterlet {
ginkgo.Skip(fmt.Sprintf("skip if disabling deploy klusterlet"))
ginkgo.Skip("skip if disabling deploy klusterlet")
}
klusterletName = fmt.Sprintf("e2e-klusterlet-%s", rand.String(6))
clusterName = fmt.Sprintf("e2e-managedcluster-%s", rand.String(6))
@@ -284,7 +286,7 @@ var _ = ginkgo.Describe("Addon Health Check", func() {
}, t.EventuallyTimeout*5, t.EventuallyInterval*5).Should(gomega.Succeed())
// delete registration agent to stop agent update its status
ginkgo.By(fmt.Sprintf("Stoping klusterlet"))
ginkgo.By("Stoping klusterlet")
err = t.OperatorClient.OperatorV1().Klusterlets().Delete(context.TODO(), klusterletName, metav1.DeleteOptions{})
gomega.Expect(err).ToNot(gomega.HaveOccurred())

3
test/e2e/addonmanagement_test.go
View File

@@ -29,7 +29,8 @@ const (
originalImageValue = "quay.io/open-cluster-management/addon-examples:latest"
overrideImageValue = "quay.io/ocm/addon-examples:latest"
customSignerName = "example.com/signer-name"
customSignerSecretName = "addon-signer-secret"
//#nosec G101
customSignerSecretName = "addon-signer-secret"
)
var (

6
test/e2e/clusterset_test.go
View File

@@ -98,7 +98,8 @@ var _ = ginkgo.Describe("Create v1beta2 managedclusterset", func() {
if !reflect.DeepEqual(string(v1beta1ManagedClusterSet.Spec.ClusterSelector.SelectorType), string(managedClusterSet.Spec.ClusterSelector.SelectorType)) {
return false
}
if !reflect.DeepEqual(v1beta1ManagedClusterSet.Spec.ClusterSelector.LabelSelector.MatchLabels, managedClusterSet.Spec.ClusterSelector.LabelSelector.MatchLabels) {
if !reflect.DeepEqual(v1beta1ManagedClusterSet.Spec.ClusterSelector.LabelSelector.MatchLabels,
managedClusterSet.Spec.ClusterSelector.LabelSelector.MatchLabels) {
return false
}
return true
@@ -136,7 +137,8 @@ var _ = ginkgo.Describe("Create v1beta2 managedclusterset", func() {
})
ginkgo.It("Check if the v1beta1 storageversion is removed from clustersetbinding crd", func() {
gomega.Eventually(func() error {
clustersetBindingCrd, err := t.HubAPIExtensionClient.ApiextensionsV1().CustomResourceDefinitions().Get(context.Background(), clustersetBindingCrdName, metav1.GetOptions{})
clustersetBindingCrd, err := t.HubAPIExtensionClient.ApiextensionsV1().CustomResourceDefinitions().Get(
context.Background(), clustersetBindingCrdName, metav1.GetOptions{})
if err != nil {
return err
}

3
test/e2e/managedcluster_loopback_test.go
View File

@@ -9,6 +9,7 @@ import (
"github.com/onsi/ginkgo/v2"
"github.com/onsi/gomega"
certificatesv1 "k8s.io/api/certificates/v1"
certificates "k8s.io/api/certificates/v1beta1"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/meta"
@@ -245,7 +246,7 @@ var _ = ginkgo.Describe("Loopback registration [development]", func() {
created.Status = addonv1alpha1.ManagedClusterAddOnStatus{
Registrations: []addonv1alpha1.RegistrationConfig{
{
SignerName: "kubernetes.io/kube-apiserver-client",
SignerName: certificates.KubeAPIServerClientSignerName,
},
},
}

6
test/e2e/managedclusterset_test.go
View File

@@ -86,7 +86,8 @@ var _ = ginkgo.Describe("Create v1beta1 managedclusterset", func() {
if string(v1beta2ManagedClusterSet.Spec.ClusterSelector.SelectorType) != string(managedClusterSet.Spec.ClusterSelector.SelectorType) {
return fmt.Errorf("unexpected v1beta2 cluster set %v", v1beta2ManagedClusterSet)
}
if !reflect.DeepEqual(v1beta2ManagedClusterSet.Spec.ClusterSelector.LabelSelector.MatchLabels, managedClusterSet.Spec.ClusterSelector.LabelSelector.MatchLabels) {
if !reflect.DeepEqual(v1beta2ManagedClusterSet.Spec.ClusterSelector.LabelSelector.MatchLabels,
managedClusterSet.Spec.ClusterSelector.LabelSelector.MatchLabels) {
return fmt.Errorf("unexpected v1beta2 cluster set %v", v1beta2ManagedClusterSet)
}
return nil
@@ -216,7 +217,8 @@ var _ = ginkgo.Describe("Create v1beta2 managedclusterset", func() {
if string(v1beta1ManagedClusterSet.Spec.ClusterSelector.SelectorType) != string(managedClusterSet.Spec.ClusterSelector.SelectorType) {
return fmt.Errorf("unexpected v1beta1 cluster set %v", v1beta1ManagedClusterSet)
}
if !reflect.DeepEqual(v1beta1ManagedClusterSet.Spec.ClusterSelector.LabelSelector.MatchLabels, managedClusterSet.Spec.ClusterSelector.LabelSelector.MatchLabels) {
if !reflect.DeepEqual(v1beta1ManagedClusterSet.Spec.ClusterSelector.LabelSelector.MatchLabels,
managedClusterSet.Spec.ClusterSelector.LabelSelector.MatchLabels) {
return fmt.Errorf("unexpected v1beta1 cluster set %v", v1beta1ManagedClusterSet)
}
return nil

14
test/e2e/manifestworkreplicaset_test.go
View File

@@ -64,7 +64,8 @@ var _ = ginkgo.Describe("Test ManifestWorkReplicaSet", func() {
PlacementRefs: []workapiv1alpha1.LocalPlacementReference{placementRef},
},
}
manifestWorkReplicaSet, err = t.HubWorkClient.WorkV1alpha1().ManifestWorkReplicaSets(metav1.NamespaceDefault).Create(context.TODO(), manifestWorkReplicaSet, metav1.CreateOptions{})
manifestWorkReplicaSet, err = t.HubWorkClient.WorkV1alpha1().ManifestWorkReplicaSets(metav1.NamespaceDefault).Create(
context.TODO(), manifestWorkReplicaSet, metav1.CreateOptions{})
gomega.Expect(err).NotTo(gomega.HaveOccurred())
csb := &clusterapiv1beta2.ManagedClusterSetBinding{
@@ -76,7 +77,8 @@ var _ = ginkgo.Describe("Test ManifestWorkReplicaSet", func() {
ClusterSet: "default",
},
}
_, err = t.ClusterClient.ClusterV1beta2().ManagedClusterSetBindings(metav1.NamespaceDefault).Create(context.Background(), csb, metav1.CreateOptions{})
_, err = t.ClusterClient.ClusterV1beta2().ManagedClusterSetBindings(metav1.NamespaceDefault).Create(
context.Background(), csb, metav1.CreateOptions{})
gomega.Expect(err).ToNot(gomega.HaveOccurred())
placement := &clusterv1beta1.Placement{
@@ -107,7 +109,8 @@ var _ = ginkgo.Describe("Test ManifestWorkReplicaSet", func() {
ginkgo.By("check if manifestworkreplicaset status")
gomega.Eventually(func() error {
mwrs, err := t.HubWorkClient.WorkV1alpha1().ManifestWorkReplicaSets(metav1.NamespaceDefault).Get(context.TODO(), manifestWorkReplicaSet.Name, metav1.GetOptions{})
mwrs, err := t.HubWorkClient.WorkV1alpha1().ManifestWorkReplicaSets(metav1.NamespaceDefault).Get(
context.TODO(), manifestWorkReplicaSet.Name, metav1.GetOptions{})
if err != nil {
return err
}
@@ -131,7 +134,8 @@ var _ = ginkgo.Describe("Test ManifestWorkReplicaSet", func() {
// TODO we should also update manifestwork replicaset and test
err = t.HubWorkClient.WorkV1alpha1().ManifestWorkReplicaSets(metav1.NamespaceDefault).Delete(context.TODO(), manifestWorkReplicaSet.Name, metav1.DeleteOptions{})
err = t.HubWorkClient.WorkV1alpha1().ManifestWorkReplicaSets(metav1.NamespaceDefault).Delete(
context.TODO(), manifestWorkReplicaSet.Name, metav1.DeleteOptions{})
gomega.Expect(err).NotTo(gomega.HaveOccurred())
err = t.ClusterClient.ClusterV1beta1().Placements(placement.Namespace).Delete(context.TODO(), placement.Name, metav1.DeleteOptions{})
@@ -288,7 +292,7 @@ var _ = ginkgo.Describe("Test ManifestWorkReplicaSet", func() {
return false
}
return int(mwrSet.Status.Summary.Total) == numOfClusters
return mwrSet.Status.Summary.Total == numOfClusters
}, t.EventuallyTimeout*5, t.EventuallyInterval*5).Should(gomega.BeTrue())
ginkgo.By("Check manifestWorks are created")

2
test/e2e/placement_test.go
View File

@@ -24,7 +24,7 @@ const (
maxNumOfClusterDecisions = 100
)
// Test cases with lable "sanity-check" could be ran as sanity check on an existing enviroment with
// Test cases with lable "sanity-check" could be ran as sanity check on an existing environment with
// placement controller installed and well configured . Resource leftovers should be cleaned up on
// the hub cluster.
var _ = ginkgo.Describe("Placement", ginkgo.Label("sanity-check"), func() {

14
test/e2e/registration_webhook_test.go
View File

@@ -246,7 +246,7 @@ var _ = ginkgo.Describe("Admission webhook", func() {
_, err = authorizedClient.ClusterV1().ManagedClusters().Create(context.TODO(), managedCluster, metav1.CreateOptions{})
gomega.Expect(errors.IsForbidden(err)).Should(gomega.BeTrue())
// remove the finalizer to truely delete the namespace
// remove the finalizer to truly delete the namespace
ns, err := t.HubKubeClient.CoreV1().Namespaces().Get(context.TODO(), clusterName, metav1.GetOptions{})
gomega.Expect(err).ToNot(gomega.HaveOccurred())
ns.Finalizers = []string{}
@@ -763,13 +763,15 @@ var _ = ginkgo.Describe("Admission webhook", func() {
// create a cluster set binding
clusterSetName := fmt.Sprintf("clusterset-%s", rand.String(6))
managedClusterSetBinding := newManagedClusterSetBinding(namespace, clusterSetName, clusterSetName)
managedClusterSetBinding, err := t.ClusterClient.ClusterV1beta2().ManagedClusterSetBindings(namespace).Create(context.TODO(), managedClusterSetBinding, metav1.CreateOptions{})
managedClusterSetBinding, err := t.ClusterClient.ClusterV1beta2().ManagedClusterSetBindings(namespace).Create(
context.TODO(), managedClusterSetBinding, metav1.CreateOptions{})
gomega.Expect(err).NotTo(gomega.HaveOccurred())
// update the cluster set binding
clusterSetName = fmt.Sprintf("clusterset-%s", rand.String(6))
patch := fmt.Sprintf("{\"spec\": {\"clusterSet\": %q}}", clusterSetName)
_, err = t.ClusterClient.ClusterV1beta2().ManagedClusterSetBindings(namespace).Patch(context.TODO(), managedClusterSetBinding.Name, types.MergePatchType, []byte(patch), metav1.PatchOptions{})
_, err = t.ClusterClient.ClusterV1beta2().ManagedClusterSetBindings(namespace).Patch(
context.TODO(), managedClusterSetBinding.Name, types.MergePatchType, []byte(patch), metav1.PatchOptions{})
gomega.Expect(err).To(gomega.HaveOccurred())
gomega.Expect(errors.IsBadRequest(err)).Should(gomega.BeTrue())
})
@@ -870,13 +872,15 @@ var _ = ginkgo.Describe("Admission webhook", func() {
// create a cluster set binding
clusterSetName := fmt.Sprintf("clusterset-%s", rand.String(6))
managedClusterSetBinding := newManagedClusterSetBinding(namespace, clusterSetName, clusterSetName)
managedClusterSetBinding, err := t.ClusterClient.ClusterV1beta2().ManagedClusterSetBindings(namespace).Create(context.TODO(), managedClusterSetBinding, metav1.CreateOptions{})
managedClusterSetBinding, err := t.ClusterClient.ClusterV1beta2().ManagedClusterSetBindings(namespace).Create(
context.TODO(), managedClusterSetBinding, metav1.CreateOptions{})
gomega.Expect(err).NotTo(gomega.HaveOccurred())
// update the cluster set binding
clusterSetName = fmt.Sprintf("clusterset-%s", rand.String(6))
patch := fmt.Sprintf("{\"spec\": {\"clusterSet\": %q}}", clusterSetName)
_, err = t.ClusterClient.ClusterV1beta2().ManagedClusterSetBindings(namespace).Patch(context.TODO(), managedClusterSetBinding.Name, types.MergePatchType, []byte(patch), metav1.PatchOptions{})
_, err = t.ClusterClient.ClusterV1beta2().ManagedClusterSetBindings(namespace).Patch(
context.TODO(), managedClusterSetBinding.Name, types.MergePatchType, []byte(patch), metav1.PatchOptions{})
gomega.Expect(err).To(gomega.HaveOccurred())
gomega.Expect(errors.IsBadRequest(err)).Should(gomega.BeTrue())
})

2
test/e2e/work_webhook_test.go
View File

@@ -19,7 +19,7 @@ import (
"open-cluster-management.io/ocm/test/integration/util"
)
// Test cases with lable "sanity-check" could be ran on an existing enviroment with validating webhook installed
// Test cases with lable "sanity-check" could be ran on an existing environment with validating webhook installed
// and well configured as sanity check. Resource leftovers should be cleaned up on both hub and managed cluster.
var _ = ginkgo.Describe("ManifestWork admission webhook", ginkgo.Label("validating-webhook", "sanity-check"), func() {
var nameSuffix string

4
test/e2e/work_workload_test.go
View File

@@ -145,7 +145,7 @@ const (
}`
)
// Test cases with lable "sanity-check" could be ran on an existing enviroment with work agent installed
// Test cases with lable "sanity-check" could be ran on an existing environment with work agent installed
// and well configured as sanity check. Resource leftovers should be cleaned up on both hub and managed cluster.
var _ = ginkgo.Describe("Work agent", ginkgo.Label("work-agent", "sanity-check"), func() {
var workName string
@@ -249,7 +249,7 @@ var _ = ginkgo.Describe("Work agent", ginkgo.Label("work-agent", "sanity-check")
for _, item := range appliedManifestWorkList.Items {
if strings.HasSuffix(item.Name, workName) {
appliedManifestWork = &item
appliedManifestWork = item.DeepCopy()
return nil
}
}