From 28f025201d5a050fe2e6f7709b7289e4fc9dccd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yunus=20Sand=C4=B1kc=C4=B1?= Date: Tue, 18 Feb 2025 20:23:24 +0300 Subject: [PATCH] . --- .github/workflows/lint.yaml | 2 +- .github/workflows/test.yaml | 2 +- .golangci.yaml | 2 +- Dockerfile | 2 +- ...loud.namecheap.com_scheduledresources.yaml | 2 +- devops.sh | 6 ++--- go.mod | 10 +++---- go.sum | 8 ++++++ .../mayfly/pkg/common/mock_Scheduler.go | 2 +- .../pkg/cache/mock_Cache.go | 2 +- .../pkg/client/mock_Client.go | 8 +++--- .../pkg/client/mock_SubResourceClient.go | 2 +- .../pkg/manager/mock_Manager.go | 26 +++++++++---------- 13 files changed, 41 insertions(+), 33 deletions(-) diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 89adeb1..e659fee 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -7,7 +7,7 @@ permissions: contents: read env: - GO_VERSION: "1.23" + GO_VERSION: "1.24" jobs: lint: diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 3b5e902..1b9399e 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -9,7 +9,7 @@ permissions: contents: write env: - GO_VERSION: "1.23" + GO_VERSION: "1.24" GOPRIVATE: "github:com/NCCloud/*" jobs: diff --git a/.golangci.yaml b/.golangci.yaml index a458f1b..c8be40a 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -18,7 +18,7 @@ linters-settings: cyclop: max-complexity: 12 run: - go: '1.22' + go: '1.24' timeout: 10m tests: false issues: diff --git a/Dockerfile b/Dockerfile index d2d3998..2e8b9d3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.23 as builder +FROM golang:1.24 as builder WORKDIR /build COPY . . diff --git a/deploy/crds/cloud.namecheap.com_scheduledresources.yaml b/deploy/crds/cloud.namecheap.com_scheduledresources.yaml index b86743c..0833015 100644 --- a/deploy/crds/cloud.namecheap.com_scheduledresources.yaml +++ b/deploy/crds/cloud.namecheap.com_scheduledresources.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.1 + controller-gen.kubebuilder.io/version: v0.17.2 name: scheduledresources.cloud.namecheap.com spec: group: cloud.namecheap.com diff --git a/devops.sh b/devops.sh index 04b5d6d..d13ac6f 100755 --- a/devops.sh +++ b/devops.sh @@ -1,8 +1,8 @@ #!/usr/bin/env bash -export CONTROLLER_GEN_VERSION="v0.16.1" -export GOLANGCI_LINT_VERSION="v1.60.1" -export MOCKERY_GEN_VERSION="v2.44.2" +export CONTROLLER_GEN_VERSION="v0.17.2" +export GOLANGCI_LINT_VERSION="v1.64.5" +export MOCKERY_GEN_VERSION="v2.52.2" export GOFUMPT_VERSION="v0.7.0" export TESTENV_VERSION="1.25.x!" diff --git a/go.mod b/go.mod index bb7e456..f0ff61a 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/NCCloud/mayfly -go 1.23.0 +go 1.24.0 require ( github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de @@ -8,7 +8,7 @@ require ( github.com/caarlos0/env/v10 v10.0.0 github.com/elliotchance/pie/v2 v2.9.1 github.com/go-co-op/gocron/v2 v2.15.0 - github.com/go-echarts/go-echarts/v2 v2.5.0 + github.com/go-echarts/go-echarts/v2 v2.5.1 github.com/go-logr/logr v1.4.2 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c github.com/prometheus/client_golang v1.20.5 @@ -16,7 +16,7 @@ require ( k8s.io/api v0.32.2 k8s.io/apimachinery v0.32.2 k8s.io/client-go v0.32.2 - sigs.k8s.io/controller-runtime v0.20.1 + sigs.k8s.io/controller-runtime v0.20.2 ) require ( @@ -24,7 +24,7 @@ require ( github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/emicklei/go-restful/v3 v3.11.0 // indirect - github.com/evanphx/json-patch/v5 v5.9.0 // indirect + github.com/evanphx/json-patch/v5 v5.9.11 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/fxamacker/cbor/v2 v2.7.0 // indirect github.com/go-logr/zapr v1.3.0 // indirect @@ -70,7 +70,7 @@ require ( gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/apiextensions-apiserver v0.32.0 // indirect + k8s.io/apiextensions-apiserver v0.32.1 // indirect k8s.io/klog/v2 v2.130.1 // indirect k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect diff --git a/go.sum b/go.sum index e01385f..f80cc25 100644 --- a/go.sum +++ b/go.sum @@ -21,6 +21,8 @@ github.com/evanphx/json-patch v0.5.2 h1:xVCHIVMUu1wtM/VkR9jVZ45N3FhZfYMMYGorLCR8 github.com/evanphx/json-patch v0.5.2/go.mod h1:ZWS5hhDbVDyob71nXKNL0+PWn6ToqBHMikGIFbs31qQ= github.com/evanphx/json-patch/v5 v5.9.0 h1:kcBlZQbplgElYIlo/n1hJbls2z/1awpXxpRi0/FOJfg= github.com/evanphx/json-patch/v5 v5.9.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ= +github.com/evanphx/json-patch/v5 v5.9.11 h1:/8HVnzMq13/3x9TPvjG08wUGqBTmZBsCWzjTM0wiaDU= +github.com/evanphx/json-patch/v5 v5.9.11/go.mod h1:3j+LviiESTElxA4p3EMKAB9HXj3/XEtnUf6OZxqIQTM= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E= @@ -29,6 +31,8 @@ github.com/go-co-op/gocron/v2 v2.15.0 h1:Kpvo71VSihE+RImmpA+3ta5CcMhoRzMGw4dJawr github.com/go-co-op/gocron/v2 v2.15.0/go.mod h1:ZF70ZwEqz0OO4RBXE1sNxnANy/zvwLcattWEFsqpKig= github.com/go-echarts/go-echarts/v2 v2.5.0 h1:P/JGanoIrpOOC4K9sRFeKSIUTIpPQwGHQJ/ELWre19Y= github.com/go-echarts/go-echarts/v2 v2.5.0/go.mod h1:56YlvzhW/a+du15f3S2qUGNDfKnFOeJSThBIrVFHDtI= +github.com/go-echarts/go-echarts/v2 v2.5.1 h1:kFVNaS3IsszKOQmUyCi95D2IhipE5twfvaBhFLOfPrs= +github.com/go-echarts/go-echarts/v2 v2.5.1/go.mod h1:56YlvzhW/a+du15f3S2qUGNDfKnFOeJSThBIrVFHDtI= github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ= @@ -201,6 +205,8 @@ k8s.io/api v0.32.2 h1:bZrMLEkgizC24G9eViHGOPbW+aRo9duEISRIJKfdJuw= k8s.io/api v0.32.2/go.mod h1:hKlhk4x1sJyYnHENsrdCWw31FEmCijNGPJO5WzHiJ6Y= k8s.io/apiextensions-apiserver v0.32.0 h1:S0Xlqt51qzzqjKPxfgX1xh4HBZE+p8KKBq+k2SWNOE0= k8s.io/apiextensions-apiserver v0.32.0/go.mod h1:86hblMvN5yxMvZrZFX2OhIHAuFIMJIZ19bTvzkP+Fmw= +k8s.io/apiextensions-apiserver v0.32.1 h1:hjkALhRUeCariC8DiVmb5jj0VjIc1N0DREP32+6UXZw= +k8s.io/apiextensions-apiserver v0.32.1/go.mod h1:sxWIGuGiYov7Io1fAS2X06NjMIk5CbRHc2StSmbaQto= k8s.io/apimachinery v0.32.2 h1:yoQBR9ZGkA6Rgmhbp/yuT9/g+4lxtsGYwW6dR6BDPLQ= k8s.io/apimachinery v0.32.2/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE= k8s.io/client-go v0.32.2 h1:4dYCD4Nz+9RApM2b/3BtVvBHw54QjMFUl1OLcJG5yOA= @@ -213,6 +219,8 @@ k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6J k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= sigs.k8s.io/controller-runtime v0.20.1 h1:JbGMAG/X94NeM3xvjenVUaBjy6Ui4Ogd/J5ZtjZnHaE= sigs.k8s.io/controller-runtime v0.20.1/go.mod h1:BrP3w158MwvB3ZbNpaAcIKkHQ7YGpYnzpoSTZ8E14WU= +sigs.k8s.io/controller-runtime v0.20.2 h1:/439OZVxoEc02psi1h4QO3bHzTgu49bb347Xp4gW1pc= +sigs.k8s.io/controller-runtime v0.20.2/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY= sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8= sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo= sigs.k8s.io/structured-merge-diff/v4 v4.4.2 h1:MdmvkGuXi/8io6ixD5wud3vOLwc1rj0aNqRlpuvjmwA= diff --git a/mocks/github.com/NCCloud/mayfly/pkg/common/mock_Scheduler.go b/mocks/github.com/NCCloud/mayfly/pkg/common/mock_Scheduler.go index ec91df0..0ec8688 100644 --- a/mocks/github.com/NCCloud/mayfly/pkg/common/mock_Scheduler.go +++ b/mocks/github.com/NCCloud/mayfly/pkg/common/mock_Scheduler.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.44.2. DO NOT EDIT. +// Code generated by mockery v2.52.2. DO NOT EDIT. package common diff --git a/mocks/sigs.k8s.io/controller-runtime/pkg/cache/mock_Cache.go b/mocks/sigs.k8s.io/controller-runtime/pkg/cache/mock_Cache.go index 07a1253..55a6b07 100644 --- a/mocks/sigs.k8s.io/controller-runtime/pkg/cache/mock_Cache.go +++ b/mocks/sigs.k8s.io/controller-runtime/pkg/cache/mock_Cache.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.44.2. DO NOT EDIT. +// Code generated by mockery v2.52.2. DO NOT EDIT. package cache diff --git a/mocks/sigs.k8s.io/controller-runtime/pkg/client/mock_Client.go b/mocks/sigs.k8s.io/controller-runtime/pkg/client/mock_Client.go index 3b7a9c2..a1d8ba4 100644 --- a/mocks/sigs.k8s.io/controller-runtime/pkg/client/mock_Client.go +++ b/mocks/sigs.k8s.io/controller-runtime/pkg/client/mock_Client.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.44.2. DO NOT EDIT. +// Code generated by mockery v2.52.2. DO NOT EDIT. package client @@ -517,7 +517,7 @@ func (_c *MockClient_Patch_Call) RunAndReturn(run func(context.Context, client.O return _c } -// RESTMapper provides a mock function with given fields: +// RESTMapper provides a mock function with no fields func (_m *MockClient) RESTMapper() meta.RESTMapper { ret := _m.Called() @@ -564,7 +564,7 @@ func (_c *MockClient_RESTMapper_Call) RunAndReturn(run func() meta.RESTMapper) * return _c } -// Scheme provides a mock function with given fields: +// Scheme provides a mock function with no fields func (_m *MockClient) Scheme() *runtime.Scheme { ret := _m.Called() @@ -611,7 +611,7 @@ func (_c *MockClient_Scheme_Call) RunAndReturn(run func() *runtime.Scheme) *Mock return _c } -// Status provides a mock function with given fields: +// Status provides a mock function with no fields func (_m *MockClient) Status() client.SubResourceWriter { ret := _m.Called() diff --git a/mocks/sigs.k8s.io/controller-runtime/pkg/client/mock_SubResourceClient.go b/mocks/sigs.k8s.io/controller-runtime/pkg/client/mock_SubResourceClient.go index 5a09e6a..b797ec6 100644 --- a/mocks/sigs.k8s.io/controller-runtime/pkg/client/mock_SubResourceClient.go +++ b/mocks/sigs.k8s.io/controller-runtime/pkg/client/mock_SubResourceClient.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.44.2. DO NOT EDIT. +// Code generated by mockery v2.52.2. DO NOT EDIT. package client diff --git a/mocks/sigs.k8s.io/controller-runtime/pkg/manager/mock_Manager.go b/mocks/sigs.k8s.io/controller-runtime/pkg/manager/mock_Manager.go index fabad62..6d16cd5 100644 --- a/mocks/sigs.k8s.io/controller-runtime/pkg/manager/mock_Manager.go +++ b/mocks/sigs.k8s.io/controller-runtime/pkg/manager/mock_Manager.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.44.2. DO NOT EDIT. +// Code generated by mockery v2.52.2. DO NOT EDIT. package manager @@ -231,7 +231,7 @@ func (_c *MockManager_AddReadyzCheck_Call) RunAndReturn(run func(string, healthz return _c } -// Elected provides a mock function with given fields: +// Elected provides a mock function with no fields func (_m *MockManager) Elected() <-chan struct{} { ret := _m.Called() @@ -278,7 +278,7 @@ func (_c *MockManager_Elected_Call) RunAndReturn(run func() <-chan struct{}) *Mo return _c } -// GetAPIReader provides a mock function with given fields: +// GetAPIReader provides a mock function with no fields func (_m *MockManager) GetAPIReader() client.Reader { ret := _m.Called() @@ -325,7 +325,7 @@ func (_c *MockManager_GetAPIReader_Call) RunAndReturn(run func() client.Reader) return _c } -// GetCache provides a mock function with given fields: +// GetCache provides a mock function with no fields func (_m *MockManager) GetCache() cache.Cache { ret := _m.Called() @@ -372,7 +372,7 @@ func (_c *MockManager_GetCache_Call) RunAndReturn(run func() cache.Cache) *MockM return _c } -// GetClient provides a mock function with given fields: +// GetClient provides a mock function with no fields func (_m *MockManager) GetClient() client.Client { ret := _m.Called() @@ -419,7 +419,7 @@ func (_c *MockManager_GetClient_Call) RunAndReturn(run func() client.Client) *Mo return _c } -// GetConfig provides a mock function with given fields: +// GetConfig provides a mock function with no fields func (_m *MockManager) GetConfig() *rest.Config { ret := _m.Called() @@ -466,7 +466,7 @@ func (_c *MockManager_GetConfig_Call) RunAndReturn(run func() *rest.Config) *Moc return _c } -// GetControllerOptions provides a mock function with given fields: +// GetControllerOptions provides a mock function with no fields func (_m *MockManager) GetControllerOptions() config.Controller { ret := _m.Called() @@ -559,7 +559,7 @@ func (_c *MockManager_GetEventRecorderFor_Call) RunAndReturn(run func(string) re return _c } -// GetFieldIndexer provides a mock function with given fields: +// GetFieldIndexer provides a mock function with no fields func (_m *MockManager) GetFieldIndexer() client.FieldIndexer { ret := _m.Called() @@ -606,7 +606,7 @@ func (_c *MockManager_GetFieldIndexer_Call) RunAndReturn(run func() client.Field return _c } -// GetHTTPClient provides a mock function with given fields: +// GetHTTPClient provides a mock function with no fields func (_m *MockManager) GetHTTPClient() *http.Client { ret := _m.Called() @@ -653,7 +653,7 @@ func (_c *MockManager_GetHTTPClient_Call) RunAndReturn(run func() *http.Client) return _c } -// GetLogger provides a mock function with given fields: +// GetLogger provides a mock function with no fields func (_m *MockManager) GetLogger() logr.Logger { ret := _m.Called() @@ -698,7 +698,7 @@ func (_c *MockManager_GetLogger_Call) RunAndReturn(run func() logr.Logger) *Mock return _c } -// GetRESTMapper provides a mock function with given fields: +// GetRESTMapper provides a mock function with no fields func (_m *MockManager) GetRESTMapper() meta.RESTMapper { ret := _m.Called() @@ -745,7 +745,7 @@ func (_c *MockManager_GetRESTMapper_Call) RunAndReturn(run func() meta.RESTMappe return _c } -// GetScheme provides a mock function with given fields: +// GetScheme provides a mock function with no fields func (_m *MockManager) GetScheme() *runtime.Scheme { ret := _m.Called() @@ -792,7 +792,7 @@ func (_c *MockManager_GetScheme_Call) RunAndReturn(run func() *runtime.Scheme) * return _c } -// GetWebhookServer provides a mock function with given fields: +// GetWebhookServer provides a mock function with no fields func (_m *MockManager) GetWebhookServer() webhook.Server { ret := _m.Called()