Update for release [email protected] (#72)

ProductLine: ACE
Release: v2025.12.15
Signed-off-by: 1gtm <[email protected]>
Signed-off-by: Tamal Saha <[email protected]>

Author: 1gtm

.golangci.yml

@@ -0,0 +1,28 @@
+version: "2"
+linters:
+  default: standard
+  enable:
+    - unparam
+
+formatters:
+  enable:
+    - gofmt
+    - goimports
+  settings:
+    gofmt:
+      rewrite-rules:
+        - pattern: 'interface{}'
+          replacement: 'any'
+
+issues:
+  max-same-issues: 100
+
+  exclude-files:
+    - generated.*\\.go
+
+  exclude-dirs:
+    - client
+    - vendor
+
+run:
+  timeout: 10m

Makefile

@@ -199,8 +199,6 @@ unit-tests: $(BUILD_DIRS)
 	        ./hack/test.sh $(SRC_PKGS)                          \
 	    "
 
-ADDTL_LINTERS   := gofmt,goimports,unparam
-
 .PHONY: lint
 lint: $(BUILD_DIRS)
 	@echo "running linter"
@@ -218,7 +216,7 @@ lint: $(BUILD_DIRS)
 	    --env GO111MODULE=on                                    \
 	    --env GOFLAGS="-mod=vendor"                             \
 	    $(BUILD_IMAGE)                                          \
-	    golangci-lint run --enable $(ADDTL_LINTERS) --timeout=10m --exclude-files="generated.*\.go$\" --exclude-dirs-use-default
+	    golangci-lint run
 
 $(BUILD_DIRS):
 	@mkdir -p $@

go.mod

@@ -15,10 +15,10 @@ require (
 	k8s.io/component-base v0.32.8
 	k8s.io/klog/v2 v2.130.1
 	k8s.io/kubectl v0.29.2
-	kmodules.xyz/client-go v0.32.10
-	kmodules.xyz/resource-metadata v0.39.0
+	kmodules.xyz/client-go v0.32.11
+	kmodules.xyz/resource-metadata v0.40.0
 	kmodules.xyz/resource-validator v0.29.1
-	kubedb.dev/installer v0.17.2-0.20251209111747-44a50f5c5b61
+	kubedb.dev/installer v0.17.2-0.20251214180945-b48a74dab69c
 	kubevault.dev/installer v0.4.0-beta.0.0.20251015172606-30118eb2655f
 	sigs.k8s.io/controller-runtime v0.20.4
 	stash.appscode.dev/installer v0.12.2-0.20251204172259-c724502d3955
@@ -173,5 +173,3 @@ require (
 )
 
 replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.6
-
-replace k8s.io/kubernetes => github.com/kmodules/kubernetes v1.30.0-alpha.0.0.20231224075822-3bd9a13c86db

go.sum

@@ -821,20 +821,20 @@ k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJ
 k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 kmodules.xyz/apiversion v0.2.0 h1:vAQYqZFm4xu4pbB1cAdHbFEPES6EQkcR4wc06xdTOWk=
 kmodules.xyz/apiversion v0.2.0/go.mod h1:oPX8g8LvlPdPX3Yc5YvCzJHQnw3YF/X4/jdW0b1am80=
-kmodules.xyz/client-go v0.32.10 h1:O/UKeU6Xc4scQG80DYw1HI8DYskyp1KsCEShIx3+T54=
-kmodules.xyz/client-go v0.32.10/go.mod h1:4k+da95l/Idg7k0+qc5qZCJJoAF6IQK5x0Fa+hBVD+Q=
+kmodules.xyz/client-go v0.32.11 h1:AbvsutYyCfCGgreMOx5ghdZto0ltKfhS/6n98TkXTGc=
+kmodules.xyz/client-go v0.32.11/go.mod h1:4k+da95l/Idg7k0+qc5qZCJJoAF6IQK5x0Fa+hBVD+Q=
 kmodules.xyz/go-containerregistry v0.0.14 h1:8MgLFa74HymAJEyjH7fyQJn5u2Ok6qPPFQX8ARfcXp0=
 kmodules.xyz/go-containerregistry v0.0.14/go.mod h1:xz0iGC3noyMi5NNAzXWTH6KqfiIgFWZAomw+U2zVOXs=
 kmodules.xyz/offshoot-api v0.32.0 h1:gogc5scSZe2JoXtZof72UGRl3Tit0kFaFRMkLLT1D8o=
 kmodules.xyz/offshoot-api v0.32.0/go.mod h1:tled7OxYZ3SkUJcrVFVVYyd+zXjsRSEm1R6Q3k4gcx0=
-kmodules.xyz/resource-metadata v0.39.0 h1:/UPaZFTN7x0cKzR6YUZ8RaouY/YSIekGbHlZsjzlsDg=
-kmodules.xyz/resource-metadata v0.39.0/go.mod h1:rwXNC2Byb0m0XJv9PxSxPJwMM6OdU+6uOidUCHu74zU=
+kmodules.xyz/resource-metadata v0.40.0 h1:OjPj9yXwf0nE536GQleOzv2LrnZp3ubykq8pGCiee6U=
+kmodules.xyz/resource-metadata v0.40.0/go.mod h1:jbB6cZBUFm4GGAn1q812/YSod4EwVOqzJH7DEpea4+Y=
 kmodules.xyz/resource-metrics v0.30.11 h1:dzxFhgpcDQFZ1wzy82j+22vo9MSqoVAtIGcutTRYgDo=
 kmodules.xyz/resource-metrics v0.30.11/go.mod h1:5K+0A0iU+4JBFPZEuj716/oSgI9xUTnVTANS+cwhHIs=
 kmodules.xyz/resource-validator v0.29.1 h1:URCzZ/SPtMcHmeS2iXF3bJ/Z1lzD6eldO2xZ7xoP2xU=
 kmodules.xyz/resource-validator v0.29.1/go.mod h1:g5Xysfd0tf8mJd1TJy3r1msbA95i1PC2tUAWlMzfiVE=
-kubedb.dev/installer v0.17.2-0.20251209111747-44a50f5c5b61 h1:DTXFtrFMrrwClYgHWGi3iViga5K0+QC1kAlr9/sQ0CE=
-kubedb.dev/installer v0.17.2-0.20251209111747-44a50f5c5b61/go.mod h1:yOBGU4/DyQJIMkWy1ImpB1TyZ9tqktMneXzzT9fLHQw=
+kubedb.dev/installer v0.17.2-0.20251214180945-b48a74dab69c h1:pP7kycOp5Z7Hy0h0ZCsxywdjX+NRURfNXzbBCZbuILM=
+kubedb.dev/installer v0.17.2-0.20251214180945-b48a74dab69c/go.mod h1:tmyy7oLgwrNrOEy7UluZVhaGWkVwNYUrAJd/2NOgKJI=
 kubevault.dev/installer v0.4.0-beta.0.0.20251015172606-30118eb2655f h1:x/ip0crnqPE/aq3EFHcShswXHSlVDMh30z9kJqh0aAY=
 kubevault.dev/installer v0.4.0-beta.0.0.20251015172606-30118eb2655f/go.mod h1:9pw0YFMZs5IyJf24D+LIh2PBoDnuLW3IOyE4BqUfgoU=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=

main.go

@@ -35,7 +35,6 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/yuin/goldmark"
 	"github.com/yuin/goldmark/ast"
-	gast "github.com/yuin/goldmark/ast"
 	"github.com/yuin/goldmark/extension"
 	"github.com/yuin/goldmark/parser"
 	"github.com/yuin/goldmark/renderer"
@@ -207,7 +206,7 @@ func (r *CodeExtractor) RegisterFuncs(reg renderer.NodeRendererFuncRegisterer) {
 	reg.Register(ast.KindFencedCodeBlock, r.extractCode)
 }
 
-func (r *CodeExtractor) extractCode(_ util.BufWriter, source []byte, n gast.Node, entering bool) (gast.WalkStatus, error) {
+func (r *CodeExtractor) extractCode(_ util.BufWriter, source []byte, n ast.Node, entering bool) (ast.WalkStatus, error) {
 	if entering {
 		var buf bytes.Buffer
 		l := n.Lines().Len()
@@ -332,7 +331,8 @@ func checkObject(ri p.ResourceInfo) error {
 		}
 	}
 
-	if gvr.Group == "kubedb.com" {
+	switch gvr.Group {
+	case "kubedb.com":
 		dbVersion, _, err := unstructured.NestedString(obj.Object, "spec", "version")
 		if err != nil {
 			logger.Log(err)
@@ -346,7 +346,7 @@ func checkObject(ri p.ResourceInfo) error {
 			logger.Log(fmt.Errorf("using unknown %s version %s", obj.GetKind(), dbVersion))
 			return nil
 		}
-	} else if gvr.Group == "catalog.kubedb.com" {
+	case "catalog.kubedb.com":
 		if !sets.NewString(kubedbcatalog.ActiveDBVersions()[strings.TrimSuffix(obj.GetKind(), "Version")]...).Has(obj.GetName()) {
 			logger.Log(fmt.Errorf("using unknown %s version %s", obj.GetKind(), obj.GetName()))
 			return nil
@@ -361,7 +361,7 @@ func checkObject(ri p.ResourceInfo) error {
 			logger.Log(err)
 			return nil
 		}
-	} else if gvr.Group == "stash.appscode.com" {
+	case "stash.appscode.com":
 		taskName, _, err := unstructured.NestedString(obj.Object, "spec", "task", "name")
 		if err != nil {
 			logger.Log(err)
@@ -371,7 +371,7 @@ func checkObject(ri p.ResourceInfo) error {
 			logger.Log(err)
 			return nil
 		}
-	} else if gvr.Group == "kubevault.com" {
+	case "kubevault.com":
 		appVersion, _, err := unstructured.NestedString(obj.Object, "spec", "version")
 		if err != nil {
 			logger.Log(err)
@@ -381,7 +381,7 @@ func checkObject(ri p.ResourceInfo) error {
 			logger.Log(fmt.Errorf("using unknown %s version %s", obj.GetKind(), appVersion))
 			return nil
 		}
-	} else if gvr.Group == "catalog.kubevault.com" {
+	case "catalog.kubevault.com":
 		if !sets.NewString(kubevaultcatalog.ActiveVersions()[strings.TrimSuffix(obj.GetKind(), "Version")]...).Has(obj.GetName()) {
 			logger.Log(fmt.Errorf("using unknown %s version %s", obj.GetKind(), obj.GetName()))
 			return nil

vendor/kmodules.xyz/client-go/.golangci.yml

@@ -0,0 +1,27 @@
+version: "2"
+linters:
+  default: standard
+  enable:
+    - unparam
+
+formatters:
+  enable:
+    - gofmt
+    - goimports
+  settings:
+    gofmt:
+      rewrite-rules:
+        - pattern: 'interface{}'
+          replacement: 'any'
+
+issues:
+  max-same-issues: 100
+
+  exclude-files:
+    - generated.*\\.go
+
+  exclude-dirs:
+    - vendor
+
+run:
+  timeout: 10m

vendor/kmodules.xyz/client-go/Makefile

@@ -242,8 +242,6 @@ test: $(BUILD_DIRS)
 	        ./hack/test.sh $(SRC_PKGS)                          \
 	    "
 
-ADDTL_LINTERS   := gofmt,goimports,unparam
-
 .PHONY: lint
 lint: $(BUILD_DIRS)
 	@echo "running linter"
@@ -261,7 +259,7 @@ lint: $(BUILD_DIRS)
 	    --env GO111MODULE=on                                    \
 	    --env GOFLAGS="-mod=vendor"                             \
 	    $(BUILD_IMAGE)                                          \
-	    golangci-lint run --enable $(ADDTL_LINTERS) --timeout=10m --exclude-files="generated.*\.go$\" --exclude-dirs-use-default
+	    golangci-lint run
 
 $(BUILD_DIRS):
 	@mkdir -p $@

vendor/kmodules.xyz/client-go/api/v1/object.go

@@ -158,8 +158,8 @@ func MustParseObjectID(key OID) *ObjectID {
 	return oid
 }
 
-func ObjectIDMap(key OID) (map[string]interface{}, error) {
-	id := map[string]interface{}{
+func ObjectIDMap(key OID) (map[string]any, error) {
+	id := map[string]any{
 		"group":     "",
 		"kind":      "",
 		"namespace": "",

vendor/kmodules.xyz/client-go/api/v1/timeofday.go

@@ -164,7 +164,7 @@ func (t TimeOfDay) MarshalJSON() ([]byte, error) {
 }
 
 // ToUnstructured implements the value.UnstructuredConverter interface.
-func (t TimeOfDay) ToUnstructured() interface{} {
+func (t TimeOfDay) ToUnstructured() any {
 	if t.IsZero() {
 		return nil
 	}
@@ -177,11 +177,11 @@ func (t TimeOfDay) ToUnstructured() interface{} {
 // the OpenAPI spec of this type.
 //
 // See: https://github.com/kubernetes/kube-openapi/tree/master/pkg/generators
-func (_ TimeOfDay) OpenAPISchemaType() []string { return []string{"string"} }
+func (TimeOfDay) OpenAPISchemaType() []string { return []string{"string"} }
 
 // OpenAPISchemaFormat is used by the kube-openapi generator when constructing
 // the OpenAPI spec of this type.
-func (_ TimeOfDay) OpenAPISchemaFormat() string { return "time" }
+func (TimeOfDay) OpenAPISchemaFormat() string { return "time" }
 
 // MarshalQueryParameter converts to a URL query parameter value
 func (t TimeOfDay) MarshalQueryParameter() (string, error) {
@@ -201,7 +201,7 @@ func (t *TimeOfDay) Fuzz(c fuzz.Continue) {
 	// Allow for about 1000 years of randomness.  Leave off nanoseconds
 	// because JSON doesn't represent them so they can't round-trip
 	// properly.
-	t.Time = time.Unix(c.Rand.Int63n(1000*365*24*60*60), 0)
+	t.Time = time.Unix(c.Int63n(1000*365*24*60*60), 0)
 }
 
 // ensure Time implements fuzz.Interface

vendor/kmodules.xyz/client-go/meta/annotations.go

@@ -23,7 +23,7 @@ import (
 	kutil "kmodules.xyz/client-go"
 )
 
-type ParserFunc func(map[string]string, string) (interface{}, error)
+type ParserFunc func(map[string]string, string) (any, error)
 
 var (
 	_ ParserFunc = GetBool
@@ -35,7 +35,7 @@ var (
 	_ ParserFunc = GetDuration
 )
 
-func GetBool(m map[string]string, key string) (interface{}, error) {
+func GetBool(m map[string]string, key string) (any, error) {
 	if m == nil {
 		return false, kutil.ErrNotFound
 	}
@@ -51,7 +51,7 @@ func GetBoolValue(m map[string]string, key string) (bool, error) {
 	return v.(bool), err
 }
 
-func GetInt(m map[string]string, key string) (interface{}, error) {
+func GetInt(m map[string]string, key string) (any, error) {
 	if m == nil {
 		return 0, kutil.ErrNotFound
 	}
@@ -67,7 +67,7 @@ func GetIntValue(m map[string]string, key string) (int, error) {
 	return v.(int), err
 }
 
-func GetString(m map[string]string, key string) (interface{}, error) {
+func GetString(m map[string]string, key string) (any, error) {
 	if m == nil {
 		return "", kutil.ErrNotFound
 	}
@@ -99,7 +99,7 @@ func RemoveKey(m map[string]string, key string) map[string]string {
 	return m
 }
 
-func GetList(m map[string]string, key string) (interface{}, error) {
+func GetList(m map[string]string, key string) (any, error) {
 	if m == nil {
 		return []string{}, kutil.ErrNotFound
 	}
@@ -117,7 +117,7 @@ func GetListValue(m map[string]string, key string) ([]string, error) {
 	return v.([]string), err
 }
 
-func GetMap(m map[string]string, key string) (interface{}, error) {
+func GetMap(m map[string]string, key string) (any, error) {
 	if m == nil {
 		return map[string]string{}, kutil.ErrNotFound
 	}
@@ -135,7 +135,7 @@ func GetMapValue(m map[string]string, key string) (map[string]string, error) {
 	return v.(map[string]string), err
 }
 
-func GetFloat(m map[string]string, key string) (interface{}, error) {
+func GetFloat(m map[string]string, key string) (any, error) {
 	if m == nil {
 		return 0.0, kutil.ErrNotFound
 	}
@@ -152,7 +152,7 @@ func GetFloatValue(m map[string]string, key string) (float64, error) {
 	return v.(float64), err
 }
 
-func GetDuration(m map[string]string, key string) (interface{}, error) {
+func GetDuration(m map[string]string, key string) (any, error) {
 	if m == nil {
 		return time.Duration(0), kutil.ErrNotFound
 	}
@@ -169,10 +169,10 @@ func GetDurationValue(m map[string]string, key string) (time.Duration, error) {
 	return v.(time.Duration), err
 }
 
-type GetFunc func(map[string]string) (interface{}, error)
+type GetFunc func(map[string]string) (any, error)
 
 func ParseFor(key string, fn ParserFunc) GetFunc {
-	return func(m map[string]string) (interface{}, error) {
+	return func(m map[string]string) (any, error) {
 		return fn(m, key)
 	}
 }