chore (deps) : Update Controller runtime to latest available version v0.21.1-0.20250617162058-15c5d6129278

- Update sigs.k8s.io/controller-runtime to latest available version
- Update sigs.k8s.io/controller-tools to v0.18.0
  - support for v1beta1 CRDs has been removed
- Update Go version to 1.24 (required for controller runtime)

Signed-off-by: Rohan Kumar <rohaan@redhat.com>

Author: rohanKanojia

crds/workspace.devfile.io_devworkspaces.yaml

@@ -19,6 +19,8 @@ package crds
 import (
 	"fmt"
 	"go/ast"
+	"os"
+	"strings"
 
 	"github.com/devfile/api/generator/genutils"
 
@@ -61,6 +63,7 @@ func (g Generator) Generate(ctx *genall.GenerationContext) error {
 		Checker:             ctx.Checker,
 		AllowDangerousTypes: false,
 	}
+	headerText := extractLicenseHeaderContent()
 
 	crd.AddKnownTypes(parser)
 	for _, root := range ctx.Roots {
@@ -118,9 +121,9 @@ func (g Generator) Generate(ctx *genall.GenerationContext) error {
 		unionDiscriminatorsByGV[groupVersion] = unionDiscriminators
 	}
 
-	crdVersions := []string{"v1", "v1beta1"}
+	crdVersions := []string{"v1"}
 
-	for groupKind := range kubeKinds {
+	for _, groupKind := range kubeKinds {
 		parser.NeedCRDFor(groupKind, nil)
 		crdRaw := parser.CustomResourceDefinitions[groupKind]
 		apiVersions := []string{}
@@ -183,11 +186,27 @@ func (g Generator) Generate(ctx *genall.GenerationContext) error {
 			} else {
 				fileName = fmt.Sprintf("%s_%s.%s.yaml", crdRaw.Spec.Group, crdRaw.Spec.Names.Plural, crdVersions[i])
 			}
-			if err := ctx.WriteYAML(fileName, extCrd); err != nil {
+			if err := ctx.WriteYAML(fileName, headerText, []interface{}{extCrd}); err != nil {
 				return err
 			}
 		}
 	}
 
 	return nil
 }
+
+func extractLicenseHeaderContent() string {
+	content, err := os.ReadFile("license_header.txt")
+	if err != nil {
+		fmt.Println("Error reading file:", err)
+	}
+
+	headerText := string(content)
+	lines := strings.Split(headerText, "\n")
+	for i, line := range lines {
+		lines[i] = "# " + line
+	}
+	headerText = strings.Join(lines, "\n")
+	headerText = headerText + "\n"
+	return headerText
+}

crds/workspace.devfile.io_devworkspacetemplates.yaml

@@ -1,43 +1,47 @@
 module github.com/devfile/api/generator
 
-go 1.22
+go 1.24.0
+
+toolchain go1.24.4
 
 require (
 	github.com/coreos/go-semver v0.3.1
 	github.com/elliotchance/orderedmap v1.3.0
 	github.com/go-toolsmith/astcopy v1.0.0
 	github.com/iancoleman/strcase v0.1.2
-	github.com/spf13/cobra v1.7.0
-	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d
+	github.com/spf13/cobra v1.9.1
+	golang.org/x/tools v0.32.0
 	gomodules.xyz/orderedmap v0.1.0
-	k8s.io/apiextensions-apiserver v0.29.2
-	k8s.io/apimachinery v0.29.2
-	sigs.k8s.io/controller-tools v0.6.2
+	k8s.io/apiextensions-apiserver v0.34.0-alpha.1
+	k8s.io/apimachinery v0.34.0-alpha.1
+	sigs.k8s.io/controller-tools v0.18.0
 )
 
 require (
-	github.com/fatih/color v1.12.0 // indirect
-	github.com/go-logr/logr v1.3.0 // indirect
-	github.com/gobuffalo/flect v0.2.3 // indirect
+	github.com/fatih/color v1.18.0 // indirect
+	github.com/fxamacker/cbor/v2 v2.8.0 // indirect
+	github.com/go-logr/logr v1.4.2 // indirect
+	github.com/gobuffalo/flect v1.0.3 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/mattn/go-colorable v0.1.8 // indirect
-	github.com/mattn/go-isatty v0.0.12 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
-	golang.org/x/mod v0.17.0 // indirect
-	golang.org/x/net v0.33.0 // indirect
-	golang.org/x/sync v0.10.0 // indirect
-	golang.org/x/sys v0.28.0 // indirect
-	golang.org/x/text v0.21.0 // indirect
+	github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
+	github.com/spf13/pflag v1.0.6 // indirect
+	github.com/x448/float16 v0.8.4 // indirect
+	golang.org/x/mod v0.24.0 // indirect
+	golang.org/x/net v0.39.0 // indirect
+	golang.org/x/sync v0.13.0 // indirect
+	golang.org/x/sys v0.32.0 // indirect
+	golang.org/x/text v0.24.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
-	k8s.io/klog/v2 v2.110.1 // indirect
-	k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
-	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
-	sigs.k8s.io/yaml v1.3.0 // indirect
+	k8s.io/klog/v2 v2.130.1 // indirect
+	k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
+	sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
+	sigs.k8s.io/randfill v1.0.0 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
+	sigs.k8s.io/yaml v1.4.0 // indirect
 )

generator/crds/gen.go

@@ -1,48 +1,75 @@
 module github.com/devfile/api/v2
 
-go 1.22.0
+go 1.24.0
+
+toolchain go1.24.4
 
 require (
 	github.com/ghodss/yaml v1.0.0
-	github.com/google/go-cmp v0.6.0
+	github.com/google/go-cmp v0.7.0
 	github.com/google/gofuzz v1.2.0
 	github.com/hashicorp/go-multierror v1.1.0
 	github.com/lucasjones/reggen v0.0.0-20200904144131-37ba4fa293bb
 	github.com/mitchellh/reflectwalk v1.0.1
 	github.com/santhosh-tekuri/jsonschema v1.2.4
-	github.com/stretchr/testify v1.8.4
-	k8s.io/api v0.30.1
-	k8s.io/apiextensions-apiserver v0.30.1
-	k8s.io/apimachinery v0.30.1
-	sigs.k8s.io/controller-runtime v0.18.7
-	sigs.k8s.io/yaml v1.3.0
+	github.com/stretchr/testify v1.10.0
+	k8s.io/api v0.34.0-alpha.1
+	k8s.io/apiextensions-apiserver v0.34.0-alpha.1
+	k8s.io/apimachinery v0.34.0-alpha.1
+	sigs.k8s.io/controller-runtime v0.21.1-0.20250617162058-15c5d6129278
+	sigs.k8s.io/yaml v1.4.0
 )
 
 require (
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
+	github.com/evanphx/json-patch/v5 v5.9.11 // indirect
+	github.com/fsnotify/fsnotify v1.9.0 // indirect
+	github.com/fxamacker/cbor/v2 v2.8.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
-	github.com/go-openapi/jsonpointer v0.19.6 // indirect
+	github.com/go-openapi/jsonpointer v0.21.0 // indirect
 	github.com/go-openapi/jsonreference v0.20.2 // indirect
-	github.com/go-openapi/swag v0.22.3 // indirect
+	github.com/go-openapi/swag v0.23.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
-	github.com/google/gnostic-models v0.6.8 // indirect
+	github.com/google/btree v1.1.3 // indirect
+	github.com/google/gnostic-models v0.6.9 // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/hashicorp/errwrap v1.0.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	golang.org/x/net v0.33.0 // indirect
-	golang.org/x/text v0.21.0 // indirect
-	google.golang.org/protobuf v1.33.0 // indirect
+	github.com/prometheus/client_golang v1.22.0 // indirect
+	github.com/prometheus/client_model v0.6.1 // indirect
+	github.com/prometheus/common v0.62.0 // indirect
+	github.com/prometheus/procfs v0.15.1 // indirect
+	github.com/spf13/pflag v1.0.6 // indirect
+	github.com/x448/float16 v0.8.4 // indirect
+	golang.org/x/net v0.38.0 // indirect
+	golang.org/x/oauth2 v0.27.0 // indirect
+	golang.org/x/sync v0.12.0 // indirect
+	golang.org/x/sys v0.31.0 // indirect
+	golang.org/x/term v0.30.0 // indirect
+	golang.org/x/text v0.23.0 // indirect
+	golang.org/x/time v0.9.0 // indirect
+	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
+	google.golang.org/protobuf v1.36.5 // indirect
+	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/klog/v2 v2.120.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
-	k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
-	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
+	k8s.io/client-go v0.34.0-alpha.1 // indirect
+	k8s.io/klog/v2 v2.130.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
+	k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
+	sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
+	sigs.k8s.io/randfill v1.0.0 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
 )