Update dependencies and Go 1.25 (#173)

Author: yunussandikci

.github/workflows/lint.yaml

@@ -7,7 +7,8 @@ permissions:
   contents: read
 
 env:
-  GO_VERSION: "1.24"
+  GO_VERSION: "1.25"
+  GOLANGCI_LINT_VERSION: "v2.4.0"
 
 jobs:
   lint:
@@ -21,4 +22,6 @@ jobs:
       - name: Download Dependencies
         run: go mod download
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v8
+        with:
+          version: ${{ env.GOLANGCI_LINT_VERSION }}

.github/workflows/release.yaml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Collect Metadata
         id: meta
         uses: docker/metadata-action@v5

.github/workflows/test.yaml

@@ -9,7 +9,7 @@ permissions:
   contents: write
 
 env:
-  GO_VERSION: "1.24"
+  GO_VERSION: "1.25"
   GOPRIVATE: "github:com/NCCloud/*"
 
 jobs:
@@ -22,7 +22,7 @@ jobs:
         with:
           go-version: ${{ env.GO_VERSION }}
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Validate
         run: |
           ./devops.sh generate

.golangci.yaml

@@ -1,26 +1,29 @@
+version: "2"
+run:
+  go: "1.25"
+  tests: false
 linters:
-  enable-all: true
+  default: all
   disable:
-    - exhaustruct # Disallows to left unused fields in structs
-    - wrapcheck # Disallows to use non-wrapped errors
-    - gochecknoinits # Disallows to use init functions
-    - ireturn # Disallows to return Interfaces
-    - gci # Disable gci import ordering checker since its buggy
-    - forcetypeassert # Disallows to use type assertions without checking
-    - depguard # Disallows to use non-listed packages
-    - gochecknoglobals # We like global variables
-    - tagalign # Buggy
-    - lll
+    - contextcheck
+    - depguard
+    - exhaustruct
+    - forcetypeassert
     - funlen
+    - gochecknoglobals
+    - gochecknoinits
+    - ireturn
+    - lll
     - perfsprint
-    - contextcheck
-linters-settings:
-  cyclop:
-    max-complexity: 12
-run:
-  go: '1.24'
-  timeout: 10m
-  tests: false
-issues:
-  exclude-dirs:
-    - cmd/benchmark
+    - tagalign
+    - wrapcheck
+    - revive
+    - noinlineerr
+  settings:
+    cyclop:
+      max-complexity: 12
+formatters:
+  enable:
+    - gofmt
+    - gofumpt
+    - goimports

.mockery.yaml

@@ -1,14 +1,17 @@
+template: testify
+dir: "mocks"
+filename: "{{.SrcPackagePath}}/mock_{{.InterfaceName}}.go"
 packages:
-  sigs.k8s.io/controller-runtime/pkg/client:
+  github.com/NCCloud/mayfly/pkg/common:
     interfaces:
-      Client:
-      SubResourceClient:
+      Scheduler: {}
   sigs.k8s.io/controller-runtime/pkg/cache:
     interfaces:
-      Cache:
-  sigs.k8s.io/controller-runtime/pkg/manager:
+      Cache: {}
+  sigs.k8s.io/controller-runtime/pkg/client:
     interfaces:
-      Manager:
-  github.com/NCCloud/mayfly/pkg/common:
+      Client: {}
+      SubResourceClient: {}
+  sigs.k8s.io/controller-runtime/pkg/manager:
     interfaces:
-      Scheduler:
+      Manager: {}

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.24 as builder
+FROM golang:1.25 as builder
 WORKDIR /build
 
 COPY . .

cmd/benchmark/benchmark.go

@@ -3,6 +3,7 @@ package main
 import (
 	"context"
 	"fmt"
+	"log"
 	time "time"
 
 	"github.com/NCCloud/mayfly/pkg/common"
@@ -20,7 +21,7 @@ func (b *Benchmark) Start() {
 }
 
 func (b *Benchmark) CreateResources() {
-	fmt.Println("Creating resources")
+	log.Println("Creating resources")
 }
 
 func (b *Benchmark) Listener() Result {
@@ -29,21 +30,24 @@ func (b *Benchmark) Listener() Result {
 	for {
 		kind := make(map[string]int)
 		now := time.Now()
+
 		for _, resourceKind := range b.config.Resources {
 			resourceList := common.NewResourceInstanceList(resourceKind)
 
 			resourcesListErr := b.mgrClient.List(context.Background(), resourceList)
 			if resourcesListErr != nil {
 				panic(resourcesListErr)
 			}
+
 			for _, resource := range resourceList.Items {
 				if resource.GetAnnotations()[b.config.ExpirationLabel] == "" {
 					continue
 				}
+
 				kind[resourceKind]++
 			}
-
 		}
+
 		result.Points = append(result.Points, Point{
 			time: now,
 			kind: kind,
@@ -55,25 +59,28 @@ func (b *Benchmark) Listener() Result {
 		if time.Since(b.startedAt) > 60*time.Minute {
 			break
 		}
+
 		time.Sleep(b.granularity)
 	}
 
 	return result
 }
 
 func (b *Benchmark) createSecrets() {
-	for i := 0; i < b.count; i++ {
-		id := i + b.offset
-		secret := b.generateSecret(id)
+	for i := range b.count {
+		secretId := i + b.offset
+		secret := b.generateSecret(secretId)
+
 		createErr := mgrClient.Create(context.Background(), secret)
 		if createErr != nil {
-			fmt.Println(createErr)
+			log.Println(createErr)
 		}
 
-		fmt.Printf("\nSecret %d has been created.", id)
+		log.Printf("\nSecret %d has been created.", secretId)
 		time.Sleep(b.delay)
 	}
-	fmt.Printf("\n")
+
+	log.Printf("\n")
 }
 
 func (b *Benchmark) generateSecret(id int) *v1.Secret {

cmd/benchmark/main.go

@@ -26,63 +26,77 @@ var (
 )
 
 func init() {
-	scheme := runtime.NewScheme()
+	var (
+		scheme       = runtime.NewScheme()
+		mgrClientErr error
+	)
+
 	utilruntime.Must(clientgoscheme.AddToScheme(scheme))
 
 	config = common.NewConfig()
 
-	var mgrClientErr error
 	mgrClient, mgrClientErr = client.New(ctrl.GetConfigOrDie(), client.Options{Scheme: scheme})
 	if mgrClientErr != nil {
 		panic(mgrClientErr)
 	}
 }
 
 func main() {
-	benchmark := NewBenchmark(mgrClient, config, 10000).
-		Delay(0)
-
+	itemCount := 1000
+	benchmark := NewBenchmark(mgrClient, config, itemCount).Delay(0)
 	benchmark.Start()
 
-	f, _ := os.Create(benchmarkHtml)
-	_, writeStringErr := f.WriteString(" <meta http-equiv=\"refresh\" content=\"6\" />\nWaiting for Mayfly benchmark to start...")
+	benchmarkFile, _ := os.Create(benchmarkHtml)
+
+	_, writeStringErr := benchmarkFile.WriteString(" <meta http-equiv=\"refresh\" content=\"6\" />\nWaiting for Mayfly benchmark to start...")
 	if writeStringErr != nil {
 		panic(writeStringErr)
 	}
-	openFilErr := browser.OpenFile(f.Name())
+
+	openFilErr := browser.OpenFile(benchmarkFile.Name())
 	if openFilErr != nil {
 		panic(openFilErr)
 	}
 
 	for {
-		time.Sleep(5 * time.Second)
-		result := benchmark.GetResult()
-		var durations []string
-		data := map[string][]opts.LineData{}
+		var (
+			waitTimeSecond = 5
+			result         = benchmark.GetResult()
+			durations      []string
+			data           = map[string][]opts.LineData{}
+		)
+
+		time.Sleep(time.Duration(waitTimeSecond) * time.Second)
+
 		for _, point := range result.Points {
 			durations = append(durations, fmt.Sprintf("%.0fs", point.time.Sub(result.StartedAt).Seconds()))
+
 			for _, resource := range config.Resources {
 				data[resource] = append(data[resource], opts.LineData{Name: resource, Value: point.kind[resource]})
 			}
 		}
-		Render(CreateChart(durations, data))
 
+		Render(CreateChart(durations, data))
 	}
 }
 
 func Render(chart *charts.Line) {
-	f, _ := os.Create(benchmarkHtml)
-	_, writeStringErr := f.WriteString(" <meta http-equiv=\"refresh\" content=\"6\" />")
+	benchFile, _ := os.Create(benchmarkHtml)
+
+	_, writeStringErr := benchFile.WriteString(" <meta http-equiv=\"refresh\" content=\"6\" />")
 	if writeStringErr != nil {
 		panic(writeStringErr)
 	}
-	renderErr := chart.Render(f)
+
+	renderErr := chart.Render(benchFile)
 	if renderErr != nil {
 		panic(renderErr)
 	}
 }
 
 func CreateChart(xAxis []string, yzAxis map[string][]opts.LineData) *charts.Line {
+	var chartAreaOpacity float32 = 0.2
+
 	line := charts.NewLine()
 	line.SetGlobalOptions(charts.WithTitleOpts(opts.Title{
 		Title: pageTitle,
@@ -94,11 +108,13 @@ func CreateChart(xAxis []string, yzAxis map[string][]opts.LineData) *charts.Line
 		Height:    "800px",
 		Theme:     "infographic",
 	}))
+
 	line.SetXAxis(xAxis)
+
 	for kind, value := range yzAxis {
 		line.AddSeries(kind, value).SetSeriesOptions(
 			charts.WithAreaStyleOpts(opts.AreaStyle{
-				Opacity: 0.2,
+				Opacity: opts.Float(chartAreaOpacity),
 			}),
 			charts.WithLineChartOpts(opts.LineChart{
 				Smooth: opts.Bool(false),
@@ -107,5 +123,6 @@ func CreateChart(xAxis []string, yzAxis map[string][]opts.LineData) *charts.Line
 				opts.MarkPointStyle{Label: &opts.Label{Show: opts.Bool(true)}}),
 		)
 	}
+
 	return line
 }

cmd/benchmark/types.go

@@ -30,8 +30,10 @@ type Point struct {
 }
 
 func NewBenchmark(mgrClient client.Client, config *common.Config, count int) *Benchmark {
+	granularityInSeconds := 5
+
 	return &Benchmark{
-		granularity: 5 * time.Second,
+		granularity: time.Duration(granularityInSeconds) * time.Second,
 		config:      config,
 		mgrClient:   mgrClient,
 		count:       count,
@@ -42,15 +44,18 @@ func NewBenchmark(mgrClient client.Client, config *common.Config, count int) *Be
 
 func (b *Benchmark) Granularity(granularity time.Duration) *Benchmark {
 	b.granularity = granularity
+
 	return b
 }
 
 func (b *Benchmark) Offset(offset int) *Benchmark {
 	b.offset = offset
+
 	return b
 }
 
 func (b *Benchmark) Delay(delay time.Duration) *Benchmark {
 	b.delay = delay
+
 	return 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.17.2
+    controller-gen.kubebuilder.io/version: v0.18.0
   name: scheduledresources.cloud.namecheap.com
 spec:
   group: cloud.namecheap.com