Feat: upgrade k8s.io to 0.26 and kubevela to 1.9.0 (#783)

Signed-off-by: wuzhongjian <wuzhongjian_yewu@cmss.chinamobile.com>
kubevela · Apr 23, 2023 · b0c407f · b0c407f
1 parent eca8d1d
commit b0c407f
Show file tree

Hide file tree

Showing 14 changed files with 273 additions and 234 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/Makefile b/Makefile
@@ -74,7 +74,7 @@ e2e-setup-core: install-vela install-core install-addon
 
 .PHONY: install-vela
 install-vela: 
-	curl -fsSl https://kubevela.io/script/install.sh | bash 
+	curl -fsSl https://kubevela.io/script/install.sh | bash -s v1.9.0-alpha.2
 install-core:
 	vela install -y
 install-addon:

diff --git a/addon/config-templates/image-registry.cue b/addon/config-templates/image-registry.cue
@@ -2,6 +2,7 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"strconv"
+	"vela/config"
 )
 
 metadata: {
@@ -52,6 +53,10 @@ template: {
 		}
 	}
 
+  validation: config.#ImageRegistry & {
+		$params: parameter
+	}
+
 	parameter: {
 		// +usage=Image registry FQDN, such as: index.docker.io
 		registry: *"index.docker.io" | string

diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git a/pkg/plugin/proxy/proxy_suite_test.go b/pkg/plugin/proxy/proxy_suite_test.go
@@ -53,7 +53,7 @@ var _ = BeforeSuite(func(done Done) {
 	testEnv = &envtest.Environment{
 		ControlPlaneStartTimeout: time.Minute * 3,
 		ControlPlaneStopTimeout:  time.Minute,
-		UseExistingCluster:       pointer.BoolPtr(false),
+		UseExistingCluster:       pointer.Bool(false),
 	}
 
 	By("start kube test env")

diff --git a/pkg/server/domain/repository/suite_test.go b/pkg/server/domain/repository/suite_test.go
@@ -59,7 +59,7 @@ var _ = BeforeSuite(func(done Done) {
 	testEnv = &envtest.Environment{
 		ControlPlaneStartTimeout: time.Minute * 3,
 		ControlPlaneStopTimeout:  time.Minute,
-		UseExistingCluster:       pointer.BoolPtr(false),
+		UseExistingCluster:       pointer.Bool(false),
 		CRDDirectoryPaths:        []string{"../../../../test/crds"},
 	}
 

diff --git a/pkg/server/domain/service/suite_test.go b/pkg/server/domain/service/suite_test.go
@@ -120,7 +120,7 @@ var _ = BeforeSuite(func(done Done) {
 	testEnv = &envtest.Environment{
 		ControlPlaneStartTimeout: time.Minute * 3,
 		ControlPlaneStopTimeout:  time.Minute,
-		UseExistingCluster:       pointer.BoolPtr(false),
+		UseExistingCluster:       pointer.Bool(false),
 		CRDDirectoryPaths:        []string{"../../../../test/crds", "./testdata/crds"},
 	}
 

diff --git a/pkg/server/event/collect/suit_test.go b/pkg/server/event/collect/suit_test.go
@@ -55,7 +55,7 @@ var _ = BeforeSuite(func(done Done) {
 	testEnv = &envtest.Environment{
 		ControlPlaneStartTimeout: time.Minute * 3,
 		ControlPlaneStopTimeout:  time.Minute,
-		UseExistingCluster:       pointer.BoolPtr(false),
+		UseExistingCluster:       pointer.Bool(false),
 		CRDDirectoryPaths:        []string{"../../../../test/crds"},
 	}
 

diff --git a/pkg/server/event/sync/suit_test.go b/pkg/server/event/sync/suit_test.go
@@ -54,7 +54,7 @@ var _ = BeforeSuite(func(done Done) {
 	testEnv = &envtest.Environment{
 		ControlPlaneStartTimeout: time.Minute * 3,
 		ControlPlaneStopTimeout:  time.Minute,
-		UseExistingCluster:       pointer.BoolPtr(false),
+		UseExistingCluster:       pointer.Bool(false),
 		CRDDirectoryPaths:        []string{"../../../../test/crds"},
 	}
 

diff --git a/pkg/server/event/sync/worker.go b/pkg/server/event/sync/worker.go
@@ -130,7 +130,10 @@ func (a *ApplicationSync) Start(ctx context.Context, errorChan chan error) {
 			klog.Infof("delete the application (%s/%s) metadata successfully", app.Namespace, app.Name)
 		},
 	}
-	informer.AddEventHandler(handlers)
+	_, err = informer.AddEventHandler(handlers)
+	if err != nil {
+		klog.ErrorS(err, "failed to add event handler for application sync")
+	}
 	klog.Info("app syncing started")
 	informer.Run(ctx.Done())
 }
diff --git a/pkg/server/infrastructure/datastore/kubeapi/kubeapi_suite_test.go b/pkg/server/infrastructure/datastore/kubeapi/kubeapi_suite_test.go
@@ -53,7 +53,7 @@ var _ = BeforeSuite(func(done Done) {
 	testEnv = &envtest.Environment{
 		ControlPlaneStartTimeout: time.Minute * 3,
 		ControlPlaneStopTimeout:  time.Minute,
-		UseExistingCluster:       pointer.BoolPtr(false),
+		UseExistingCluster:       pointer.Bool(false),
 	}
 
 	By("start kube test env")

diff --git a/pkg/server/interfaces/api/api_suite_test.go b/pkg/server/interfaces/api/api_suite_test.go
@@ -55,7 +55,7 @@ var _ = BeforeSuite(func(done Done) {
 	testEnv = &envtest.Environment{
 		ControlPlaneStartTimeout: time.Minute * 3,
 		ControlPlaneStopTimeout:  time.Minute,
-		UseExistingCluster:       pointer.BoolPtr(false),
+		UseExistingCluster:       pointer.Bool(false),
 		CRDDirectoryPaths:        []string{"../../../test/crds"},
 	}
 

diff --git a/pkg/server/utils/auth.go b/pkg/server/utils/auth.go
@@ -94,7 +94,7 @@ func (c *authClient) Status() client.StatusWriter {
 }
 
 // Get .
-func (c *authClient) Get(ctx context.Context, key client.ObjectKey, obj client.Object) error {
+func (c *authClient) Get(ctx context.Context, key client.ObjectKey, obj client.Object, _ ...client.GetOption) error {
 	ctx = ContextWithUserInfo(ctx)
 	return c.Client.Get(ctx, key, obj)
 }
@@ -141,13 +141,13 @@ type authAppStatusClient struct {
 }
 
 // Update .
-func (c *authAppStatusClient) Update(ctx context.Context, obj client.Object, opts ...client.UpdateOption) error {
+func (c *authAppStatusClient) Update(ctx context.Context, obj client.Object, opts ...client.SubResourceUpdateOption) error {
 	ctx = ContextWithUserInfo(ctx)
 	return c.StatusWriter.Update(ctx, obj, opts...)
 }
 
 // Patch .
-func (c *authAppStatusClient) Patch(ctx context.Context, obj client.Object, patch client.Patch, opts ...client.PatchOption) error {
+func (c *authAppStatusClient) Patch(ctx context.Context, obj client.Object, patch client.Patch, opts ...client.SubResourcePatchOption) error {
 	ctx = ContextWithUserInfo(ctx)
 	return c.StatusWriter.Patch(ctx, obj, patch, opts...)
 }