Skip to content

Commit 6cf0f79

Browse files
zhiweiyin318zhiweiyin318
committed
update e2e for gc
Signed-off-by: Zhiwei Yin <[email protected]>
1 parent ffdcc06 commit 6cf0f79

File tree

194 files changed

+19230
-14152
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

194 files changed

+19230
-14152
lines changed

‎go.mod‎

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,23 @@ require (
1616
github.com/pkg/errors v0.9.1
1717
github.com/spf13/cobra v1.8.1
1818
github.com/spf13/pflag v1.0.5
19-
google.golang.org/grpc v1.67.0
19+
google.golang.org/grpc v1.68.1
2020
gopkg.in/yaml.v2 v2.4.0
2121
helm.sh/helm/v3 v3.17.3
22-
k8s.io/api v0.32.3
22+
k8s.io/api v0.32.4
2323
k8s.io/apiextensions-apiserver v0.32.2
24-
k8s.io/apimachinery v0.32.3
24+
k8s.io/apimachinery v0.32.4
2525
k8s.io/cli-runtime v0.32.2
26-
k8s.io/client-go v0.32.3
27-
k8s.io/component-base v0.32.3
26+
k8s.io/client-go v0.32.4
27+
k8s.io/component-base v0.32.4
2828
k8s.io/klog/v2 v2.130.1
2929
k8s.io/kubectl v0.32.2
3030
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
31-
open-cluster-management.io/api v0.16.2-0.20250422072120-cadf714c3055
31+
open-cluster-management.io/api v1.0.0
3232
open-cluster-management.io/cluster-proxy v0.7.0
3333
open-cluster-management.io/managed-serviceaccount v0.8.0
34-
open-cluster-management.io/ocm v0.16.1-0.20250422150056-f4b6dcb15929
35-
open-cluster-management.io/sdk-go v0.16.1-0.20250411154302-3a424961ead4
34+
open-cluster-management.io/ocm v1.0.0
35+
open-cluster-management.io/sdk-go v1.0.0
3636
sigs.k8s.io/apiserver-network-proxy v0.29.0
3737
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0
3838
sigs.k8s.io/controller-runtime v0.20.2
@@ -87,13 +87,13 @@ require (
8787
github.com/gogo/protobuf v1.3.2 // indirect
8888
github.com/golang/protobuf v1.5.4 // indirect
8989
github.com/google/btree v1.1.3 // indirect
90-
github.com/google/gnostic-models v0.6.8 // indirect
90+
github.com/google/gnostic-models v0.6.9 // indirect
9191
github.com/google/go-cmp v0.7.0 // indirect
9292
github.com/google/gofuzz v1.2.0 // indirect
9393
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
9494
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
9595
github.com/gorilla/mux v1.8.1 // indirect
96-
github.com/gorilla/websocket v1.5.1 // indirect
96+
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
9797
github.com/gosuri/uitable v0.0.4 // indirect
9898
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
9999
github.com/hashicorp/errwrap v1.1.0 // indirect
@@ -141,32 +141,34 @@ require (
141141
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
142142
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
143143
github.com/xlab/treeprint v1.2.0 // indirect
144-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
145-
go.opentelemetry.io/otel v1.28.0 // indirect
146-
go.opentelemetry.io/otel/metric v1.28.0 // indirect
147-
go.opentelemetry.io/otel/trace v1.28.0 // indirect
144+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
145+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
146+
go.opentelemetry.io/otel v1.33.0 // indirect
147+
go.opentelemetry.io/otel/metric v1.33.0 // indirect
148+
go.opentelemetry.io/otel/trace v1.33.0 // indirect
148149
go.uber.org/automaxprocs v1.6.0 // indirect
149-
golang.org/x/crypto v0.36.0 // indirect
150-
golang.org/x/net v0.37.0 // indirect
150+
golang.org/x/crypto v0.37.0 // indirect
151+
golang.org/x/net v0.38.0 // indirect
151152
golang.org/x/oauth2 v0.28.0 // indirect
152-
golang.org/x/sync v0.12.0 // indirect
153+
golang.org/x/sync v0.13.0 // indirect
153154
golang.org/x/sys v0.32.0 // indirect
154-
golang.org/x/term v0.30.0 // indirect
155-
golang.org/x/text v0.23.0 // indirect
156-
golang.org/x/time v0.7.0 // indirect
155+
golang.org/x/term v0.31.0 // indirect
156+
golang.org/x/text v0.24.0 // indirect
157+
golang.org/x/time v0.9.0 // indirect
157158
golang.org/x/tools v0.31.0 // indirect
158-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
159+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
159160
google.golang.org/protobuf v1.36.5 // indirect
160161
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
161162
gopkg.in/inf.v0 v0.9.1 // indirect
162163
gopkg.in/yaml.v3 v3.0.1 // indirect
163164
k8s.io/apiserver v0.32.3 // indirect
164165
k8s.io/kube-aggregator v0.32.1 // indirect
165-
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
166+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
166167
oras.land/oras-go v1.2.5 // indirect
167168
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
168169
sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96 // indirect
169170
sigs.k8s.io/kustomize/api v0.18.0 // indirect
170-
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
171+
sigs.k8s.io/randfill v1.0.0 // indirect
172+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
171173
sigs.k8s.io/yaml v1.4.0 // indirect
172174
)

‎go.sum‎

Lines changed: 53 additions & 48 deletions
Large diffs are not rendered by default.

‎test/e2e/clusteradm/init_test.go‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ var _ = ginkgo.Describe("test clusteradm with bootstrap token in singleton mode"
3232

3333
cm, err := operatorClient.OperatorV1().ClusterManagers().Get(context.TODO(), "cluster-manager", metav1.GetOptions{})
3434
gomega.Expect(err).NotTo(gomega.HaveOccurred())
35-
gomega.Expect(len(cm.Spec.RegistrationConfiguration.FeatureGates)).Should(gomega.Equal(1))
35+
36+
// 2 featureGates: DefaultClusterSet and ResourceCleanup
37+
gomega.Expect(len(cm.Spec.RegistrationConfiguration.FeatureGates)).Should(gomega.Equal(2))
3638

3739
err = e2e.Clusteradm().Init(
3840
"--use-bootstrap-token",
@@ -113,7 +115,8 @@ var _ = ginkgo.Describe("test clusteradm with bootstrap token in singleton mode"
113115
gomega.Expect(err).NotTo(gomega.HaveOccurred(), "clusteradm init error")
114116
cm, err = operatorClient.OperatorV1().ClusterManagers().Get(context.TODO(), "cluster-manager", metav1.GetOptions{})
115117
gomega.Expect(err).NotTo(gomega.HaveOccurred())
116-
gomega.Expect(len(cm.Spec.RegistrationConfiguration.FeatureGates)).Should(gomega.Equal(2))
118+
// 3 featureGates: ManagedClusterAutoApproval, DefaultClusterSet and ResourceCleanup
119+
gomega.Expect(len(cm.Spec.RegistrationConfiguration.FeatureGates)).Should(gomega.Equal(3))
117120

118121
gomega.Eventually(func() error {
119122
return util.ValidateImagePullSecret(kubeClient, "e30=",

‎test/e2e/util/helper.go‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,30 @@ func DeleteClusterFinalizers(restcfg *rest.Config) error {
9898
return nil
9999
}
100100

101+
func WaitClustersDeleted(restcfg *rest.Config) error {
102+
clientset, err := clusterclient.NewForConfig(restcfg)
103+
if err != nil {
104+
return err
105+
}
106+
107+
return wait.PollUntilContextCancel(context.TODO(), 1*time.Second, true, func(ctx context.Context) (bool, error) {
108+
clusterList, err := clientset.ClusterV1().ManagedClusters().List(context.TODO(), metav1.ListOptions{})
109+
if errors.IsNotFound(err) || len(clusterList.Items) == 0 {
110+
return true, nil
111+
}
112+
if err != nil {
113+
return false, err
114+
}
115+
for _, mcl := range clusterList.Items {
116+
err = clientset.ClusterV1().ManagedClusters().Delete(context.TODO(), mcl.Name, metav1.DeleteOptions{})
117+
if err != nil {
118+
return false, err
119+
}
120+
}
121+
return false, nil
122+
})
123+
}
124+
101125
// buildConfigFromFlags build rest config for specified context in the kubeconfigfile.
102126
func buildConfigFromFlags(context, kubeconfigPath string) (*rest.Config, error) {
103127
return clientcmd.NewNonInteractiveDeferredLoadingClientConfig(

‎test/e2e/util/util.go‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,14 @@ func initE2E() (*TestE2eConfig, error) {
6565
// clearenv set the e2e environment from initial state to empty
6666
clearenv := func() error {
6767
fmt.Println("cleaning hub...")
68+
69+
fmt.Println("deleting all clusters on the hub...")
70+
// delete all clusters
71+
err = WaitClustersDeleted(e2eConf.Cluster().Hub().KubeConfig())
72+
if err != nil {
73+
return err
74+
}
75+
6876
fmt.Println("unjoin managedcluster1...")
6977
err := e2eConf.Clusteradm().Unjoin(
7078
"--context", e2eConf.Cluster().ManagedCluster1().Context(),
@@ -79,17 +87,7 @@ func initE2E() (*TestE2eConfig, error) {
7987
return err
8088
}
8189

82-
// delete cluster finalizers
83-
err = DeleteClusterFinalizers(e2eConf.Cluster().Hub().KubeConfig())
84-
if err != nil {
85-
return err
86-
}
87-
88-
// wait for managed cluster Available status to be "False"
89-
err = WaitForManagedClusterAvailableStatusToChange(e2eConf.Cluster().Hub().KubeConfig(), e2eConf.Cluster().ManagedCluster1().Name())
90-
if err != nil {
91-
return err
92-
}
90+
fmt.Println("cleaning clusterManager CR...")
9391
err = e2eConf.Clusteradm().Clean(
9492
"--context", e2eConf.Cluster().Hub().Context(),
9593
"--purge-operator=false",

‎vendor/github.com/golang/protobuf/ptypes/any.go‎

Lines changed: 0 additions & 180 deletions
This file was deleted.

0 commit comments

Comments
 (0)