Skip to content

Commit 7dad4d2

Browse files
rohanKanojiarohanKanojia
committed
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 <[email protected]>
1 parent 5c3d7b9 commit 7dad4d2

File tree

9 files changed

+5658
-6168
lines changed

9 files changed

+5658
-6168
lines changed

‎crds/workspace.devfile.io_devworkspaces.yaml‎

Lines changed: 2857 additions & 2896 deletions
Large diffs are not rendered by default.

‎crds/workspace.devfile.io_devworkspacetemplates.yaml‎

Lines changed: 2544 additions & 2391 deletions
Large diffs are not rendered by default.

‎generator/crds/gen.go‎

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ package crds
1919
import (
2020
"fmt"
2121
"go/ast"
22+
"os"
23+
"strings"
2224

2325
"github.com/devfile/api/generator/genutils"
2426

@@ -61,6 +63,7 @@ func (g Generator) Generate(ctx *genall.GenerationContext) error {
6163
Checker: ctx.Checker,
6264
AllowDangerousTypes: false,
6365
}
66+
headerText := extractLicenseHeaderContent()
6467

6568
crd.AddKnownTypes(parser)
6669
for _, root := range ctx.Roots {
@@ -118,9 +121,9 @@ func (g Generator) Generate(ctx *genall.GenerationContext) error {
118121
unionDiscriminatorsByGV[groupVersion] = unionDiscriminators
119122
}
120123

121-
crdVersions := []string{"v1", "v1beta1"}
124+
crdVersions := []string{"v1"}
122125

123-
for groupKind := range kubeKinds {
126+
for _, groupKind := range kubeKinds {
124127
parser.NeedCRDFor(groupKind, nil)
125128
crdRaw := parser.CustomResourceDefinitions[groupKind]
126129
apiVersions := []string{}
@@ -183,11 +186,27 @@ func (g Generator) Generate(ctx *genall.GenerationContext) error {
183186
} else {
184187
fileName = fmt.Sprintf("%s_%s.%s.yaml", crdRaw.Spec.Group, crdRaw.Spec.Names.Plural, crdVersions[i])
185188
}
186-
if err := ctx.WriteYAML(fileName, extCrd); err != nil {
189+
if err := ctx.WriteYAML(fileName, headerText, []interface{}{extCrd}); err != nil {
187190
return err
188191
}
189192
}
190193
}
191194

192195
return nil
193196
}
197+
198+
func extractLicenseHeaderContent() string {
199+
content, err := os.ReadFile("license_header.txt")
200+
if err != nil {
201+
fmt.Println("Error reading file:", err)
202+
}
203+
204+
headerText := string(content)
205+
lines := strings.Split(headerText, "\n")
206+
for i, line := range lines {
207+
lines[i] = "# " + line
208+
}
209+
headerText = strings.Join(lines, "\n")
210+
headerText = headerText + "\n"
211+
return headerText
212+
}

‎generator/go.mod‎

Lines changed: 28 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,47 @@
11
module github.com/devfile/api/generator
22

3-
go 1.22
3+
go 1.24.0
4+
5+
toolchain go1.24.4
46

57
require (
68
github.com/coreos/go-semver v0.3.1
79
github.com/elliotchance/orderedmap v1.3.0
810
github.com/go-toolsmith/astcopy v1.0.0
911
github.com/iancoleman/strcase v0.1.2
10-
github.com/spf13/cobra v1.7.0
11-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d
12+
github.com/spf13/cobra v1.9.1
13+
golang.org/x/tools v0.32.0
1214
gomodules.xyz/orderedmap v0.1.0
13-
k8s.io/apiextensions-apiserver v0.29.2
14-
k8s.io/apimachinery v0.29.2
15-
sigs.k8s.io/controller-tools v0.6.2
15+
k8s.io/apiextensions-apiserver v0.34.0-alpha.1
16+
k8s.io/apimachinery v0.34.0-alpha.1
17+
sigs.k8s.io/controller-tools v0.18.0
1618
)
1719

1820
require (
19-
github.com/fatih/color v1.12.0 // indirect
20-
github.com/go-logr/logr v1.3.0 // indirect
21-
github.com/gobuffalo/flect v0.2.3 // indirect
21+
github.com/fatih/color v1.18.0 // indirect
22+
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
23+
github.com/go-logr/logr v1.4.2 // indirect
24+
github.com/gobuffalo/flect v1.0.3 // indirect
2225
github.com/gogo/protobuf v1.3.2 // indirect
23-
github.com/google/gofuzz v1.2.0 // indirect
2426
github.com/inconshreveable/mousetrap v1.1.0 // indirect
2527
github.com/json-iterator/go v1.1.12 // indirect
26-
github.com/mattn/go-colorable v0.1.8 // indirect
27-
github.com/mattn/go-isatty v0.0.12 // indirect
28+
github.com/mattn/go-colorable v0.1.13 // indirect
29+
github.com/mattn/go-isatty v0.0.20 // indirect
2830
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
29-
github.com/modern-go/reflect2 v1.0.2 // indirect
30-
github.com/spf13/pflag v1.0.5 // indirect
31-
golang.org/x/mod v0.17.0 // indirect
32-
golang.org/x/net v0.33.0 // indirect
33-
golang.org/x/sync v0.10.0 // indirect
34-
golang.org/x/sys v0.28.0 // indirect
35-
golang.org/x/text v0.21.0 // indirect
31+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
32+
github.com/spf13/pflag v1.0.6 // indirect
33+
github.com/x448/float16 v0.8.4 // indirect
34+
golang.org/x/mod v0.24.0 // indirect
35+
golang.org/x/net v0.39.0 // indirect
36+
golang.org/x/sync v0.13.0 // indirect
37+
golang.org/x/sys v0.32.0 // indirect
38+
golang.org/x/text v0.24.0 // indirect
3639
gopkg.in/inf.v0 v0.9.1 // indirect
3740
gopkg.in/yaml.v2 v2.4.0 // indirect
38-
k8s.io/klog/v2 v2.110.1 // indirect
39-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
40-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
41-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
42-
sigs.k8s.io/yaml v1.3.0 // indirect
41+
k8s.io/klog/v2 v2.130.1 // indirect
42+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
43+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
44+
sigs.k8s.io/randfill v1.0.0 // indirect
45+
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
46+
sigs.k8s.io/yaml v1.4.0 // indirect
4347
)

‎generator/go.sum‎

Lines changed: 71 additions & 832 deletions
Large diffs are not rendered by default.

‎go.mod‎

Lines changed: 47 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,75 @@
11
module github.com/devfile/api/v2
22

3-
go 1.22.0
3+
go 1.24.0
4+
5+
toolchain go1.24.4
46

57
require (
68
github.com/ghodss/yaml v1.0.0
7-
github.com/google/go-cmp v0.6.0
9+
github.com/google/go-cmp v0.7.0
810
github.com/google/gofuzz v1.2.0
911
github.com/hashicorp/go-multierror v1.1.0
1012
github.com/lucasjones/reggen v0.0.0-20200904144131-37ba4fa293bb
1113
github.com/mitchellh/reflectwalk v1.0.1
1214
github.com/santhosh-tekuri/jsonschema v1.2.4
13-
github.com/stretchr/testify v1.8.4
14-
k8s.io/api v0.30.1
15-
k8s.io/apiextensions-apiserver v0.30.1
16-
k8s.io/apimachinery v0.30.1
17-
sigs.k8s.io/controller-runtime v0.18.7
18-
sigs.k8s.io/yaml v1.3.0
15+
github.com/stretchr/testify v1.10.0
16+
k8s.io/api v0.34.0-alpha.1
17+
k8s.io/apiextensions-apiserver v0.34.0-alpha.1
18+
k8s.io/apimachinery v0.34.0-alpha.1
19+
sigs.k8s.io/controller-runtime v0.21.1-0.20250617162058-15c5d6129278
20+
sigs.k8s.io/yaml v1.4.0
1921
)
2022

2123
require (
24+
github.com/beorn7/perks v1.0.1 // indirect
25+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2226
github.com/davecgh/go-spew v1.1.1 // indirect
27+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
28+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
29+
github.com/fsnotify/fsnotify v1.9.0 // indirect
30+
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
2331
github.com/go-logr/logr v1.4.2 // indirect
24-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
32+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
2533
github.com/go-openapi/jsonreference v0.20.2 // indirect
26-
github.com/go-openapi/swag v0.22.3 // indirect
34+
github.com/go-openapi/swag v0.23.0 // indirect
2735
github.com/gogo/protobuf v1.3.2 // indirect
2836
github.com/golang/protobuf v1.5.4 // indirect
29-
github.com/google/gnostic-models v0.6.8 // indirect
37+
github.com/google/btree v1.1.3 // indirect
38+
github.com/google/gnostic-models v0.6.9 // indirect
39+
github.com/google/uuid v1.6.0 // indirect
3040
github.com/hashicorp/errwrap v1.0.0 // indirect
3141
github.com/josharian/intern v1.0.0 // indirect
3242
github.com/json-iterator/go v1.1.12 // indirect
3343
github.com/mailru/easyjson v0.7.7 // indirect
3444
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
35-
github.com/modern-go/reflect2 v1.0.2 // indirect
45+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
46+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
47+
github.com/pkg/errors v0.9.1 // indirect
3648
github.com/pmezard/go-difflib v1.0.0 // indirect
37-
golang.org/x/net v0.33.0 // indirect
38-
golang.org/x/text v0.21.0 // indirect
39-
google.golang.org/protobuf v1.33.0 // indirect
49+
github.com/prometheus/client_golang v1.22.0 // indirect
50+
github.com/prometheus/client_model v0.6.1 // indirect
51+
github.com/prometheus/common v0.62.0 // indirect
52+
github.com/prometheus/procfs v0.15.1 // indirect
53+
github.com/spf13/pflag v1.0.6 // indirect
54+
github.com/x448/float16 v0.8.4 // indirect
55+
golang.org/x/net v0.38.0 // indirect
56+
golang.org/x/oauth2 v0.27.0 // indirect
57+
golang.org/x/sync v0.12.0 // indirect
58+
golang.org/x/sys v0.31.0 // indirect
59+
golang.org/x/term v0.30.0 // indirect
60+
golang.org/x/text v0.23.0 // indirect
61+
golang.org/x/time v0.9.0 // indirect
62+
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
63+
google.golang.org/protobuf v1.36.5 // indirect
64+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
4065
gopkg.in/inf.v0 v0.9.1 // indirect
4166
gopkg.in/yaml.v2 v2.4.0 // indirect
4267
gopkg.in/yaml.v3 v3.0.1 // indirect
43-
k8s.io/klog/v2 v2.120.1 // indirect
44-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
45-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
46-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
47-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
68+
k8s.io/client-go v0.34.0-alpha.1 // indirect
69+
k8s.io/klog/v2 v2.130.1 // indirect
70+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
71+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
72+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
73+
sigs.k8s.io/randfill v1.0.0 // indirect
74+
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
4875
)

0 commit comments

Comments
 (0)