From 8cae78ab2b9d31a8c58511b5f5b9cb20578521c3 Mon Sep 17 00:00:00 2001 From: vie-serendipity <2733147505@qq.com> Date: Thu, 7 Nov 2024 11:37:14 +0800 Subject: [PATCH] chore: go mod tidy and resolve conflicts --- go.mod | 3 ++- go.sum | 2 ++ .../controller/platformadmin/platform_admin_controller.go | 8 ++++---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 8a00f349081..eb3495e5308 100644 --- a/go.mod +++ b/go.mod @@ -4,10 +4,12 @@ go 1.22.3 require ( github.com/aliyun/alibaba-cloud-sdk-go v1.62.156 + github.com/coreos/go-iptables v0.8.0 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc github.com/edgexfoundry/go-mod-core-contracts/v3 v3.0.0 github.com/evanphx/json-patch v5.6.0+incompatible github.com/go-jose/go-jose/v3 v3.0.3 + github.com/go-logr/logr v1.4.2 github.com/go-resty/resty/v2 v2.12.0 github.com/golang-jwt/jwt v3.2.2+incompatible github.com/google/go-cmp v0.6.0 @@ -82,7 +84,6 @@ require ( github.com/fvbommel/sortorder v1.1.0 // indirect github.com/fxamacker/cbor/v2 v2.7.0 // indirect github.com/go-errors/errors v1.4.2 // indirect - github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-openapi/jsonpointer v0.19.6 // indirect github.com/go-openapi/jsonreference v0.20.2 // indirect diff --git a/go.sum b/go.sum index 6bdd06972b7..c22120f6562 100644 --- a/go.sum +++ b/go.sum @@ -837,6 +837,8 @@ github.com/cncf/xds/go v0.0.0-20230428030218-4003588d1b74/go.mod h1:eXthEFrGJvWH github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20240423153145-555b57ec207b h1:ga8SEFjZ60pxLcmhnThWgvH2wg8376yUJmPhEH4H3kw= github.com/cncf/xds/go v0.0.0-20240423153145-555b57ec207b/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8= +github.com/coreos/go-iptables v0.8.0 h1:MPc2P89IhuVpLI7ETL/2tx3XZ61VeICZjYqDEgNsPRc= +github.com/coreos/go-iptables v0.8.0/go.mod h1:Qe8Bv2Xik5FyTXwgIbLAnv2sWSBmvWdFETJConOQ//Q= github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4= github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec= github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs= diff --git a/pkg/yurtmanager/controller/platformadmin/platform_admin_controller.go b/pkg/yurtmanager/controller/platformadmin/platform_admin_controller.go index 245a272be8c..e01393da44a 100644 --- a/pkg/yurtmanager/controller/platformadmin/platform_admin_controller.go +++ b/pkg/yurtmanager/controller/platformadmin/platform_admin_controller.go @@ -144,25 +144,25 @@ func add(mgr manager.Manager, cfg *appconfig.CompletedConfig, r reconcile.Reconc } // Watch for changes to PlatformAdmin - err = c.Watch(source.Kind[client.Object](mgr.GetCache(), &iotv1alpha2.PlatformAdmin{}, &handler.EnqueueRequestForObject{})) + err = c.Watch(source.Kind[client.Object](mgr.GetCache(), &iotv1beta1.PlatformAdmin{}, &handler.EnqueueRequestForObject{})) if err != nil { return err } err = c.Watch(source.Kind[client.Object](mgr.GetCache(), &corev1.ConfigMap{}, - handler.EnqueueRequestForOwner(mgr.GetScheme(), mgr.GetRESTMapper(), &iotv1alpha2.PlatformAdmin{}, handler.OnlyControllerOwner()))) + handler.EnqueueRequestForOwner(mgr.GetScheme(), mgr.GetRESTMapper(), &iotv1beta1.PlatformAdmin{}, handler.OnlyControllerOwner()))) if err != nil { return err } err = c.Watch(source.Kind[client.Object](mgr.GetCache(), &corev1.Service{}, - handler.EnqueueRequestForOwner(mgr.GetScheme(), mgr.GetRESTMapper(), &iotv1alpha2.PlatformAdmin{}, handler.OnlyControllerOwner()))) + handler.EnqueueRequestForOwner(mgr.GetScheme(), mgr.GetRESTMapper(), &iotv1beta1.PlatformAdmin{}, handler.OnlyControllerOwner()))) if err != nil { return err } err = c.Watch(source.Kind[client.Object](mgr.GetCache(), &appsv1beta1.YurtAppSet{}, - handler.EnqueueRequestForOwner(mgr.GetScheme(), mgr.GetRESTMapper(), &iotv1alpha2.PlatformAdmin{}, handler.OnlyControllerOwner()))) + handler.EnqueueRequestForOwner(mgr.GetScheme(), mgr.GetRESTMapper(), &iotv1beta1.PlatformAdmin{}, handler.OnlyControllerOwner()))) if err != nil { return err }