Skip to content

Commit adb72c3

Browse files
thepetkthepetk
authored
Upgrade go version to 1.19 to mitigate rapid reset CVE (#1345)
* Upgrade generator to 1.19 Signed-off-by: thepetk <thepetk@gmail.com> * Apply go mod version and fmt for generator upgrade Signed-off-by: thepetk <thepetk@gmail.com> * Upgrade api to 1.19 Signed-off-by: thepetk <thepetk@gmail.com> * Apply vendor and fmt for api upgrade Signed-off-by: thepetk <thepetk@gmail.com> * Fix build generator Signed-off-by: thepetk <thepetk@gmail.com> * Update workflows for 1.19 Signed-off-by: thepetk <thepetk@gmail.com> * Fix generator issue Signed-off-by: thepetk <thepetk@gmail.com> * Replace go run with executable Signed-off-by: thepetk <thepetk@gmail.com> * Fix version of helpgen used for generation Signed-off-by: thepetk <thepetk@gmail.com> --------- Signed-off-by: thepetk <thepetk@gmail.com>
1 parent 447aa00 commit adb72c3

File tree

651 files changed

+101995
-31419
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

651 files changed

+101995
-31419
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
4040
with:
4141
# The Go version to download (if necessary) and use. Supports semver spec and ranges.
42-
go-version: 1.18
42+
go-version: 1.19
4343

4444
- name: Generate Go sources, CRDs and schemas
4545
run: |

‎generator/crds/gen.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131
"sigs.k8s.io/controller-tools/pkg/markers"
3232
)
3333

34-
//go:generate go run sigs.k8s.io/controller-tools/cmd/helpgen generate:headerFile=../header.go.txt,year=2020 paths=.
34+
//go:generate go run -mod=mod sigs.k8s.io/controller-tools/cmd/helpgen@v0.6.2 generate:headerFile=../header.go.txt,year=2020 paths=.
3535

3636
// +controllertools:marker:generateHelp
3737

‎generator/getters/gen.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,17 @@ package getters
1919
import (
2020
"bytes"
2121
"fmt"
22+
"go/ast"
23+
"strconv"
24+
2225
"github.com/devfile/api/generator/genutils"
2326
"github.com/elliotchance/orderedmap"
24-
"go/ast"
2527
"sigs.k8s.io/controller-tools/pkg/genall"
2628
"sigs.k8s.io/controller-tools/pkg/loader"
2729
"sigs.k8s.io/controller-tools/pkg/markers"
28-
"strconv"
2930
)
3031

31-
//go:generate go run sigs.k8s.io/controller-tools/cmd/helpgen generate:headerFile=../header.go.txt,year=2021 paths=.
32+
//go:generate go run -mod=mod sigs.k8s.io/controller-tools/cmd/helpgen@v0.6.2 generate:headerFile=../header.go.txt,year=2021 paths=.
3233

3334
var (
3435
// GetterTypeMarker is associated with a type that's used as the pointer receiver of the getter method

‎generator/go.mod‎

Lines changed: 31 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,42 @@
11
module github.com/devfile/api/generator
22

3-
go 1.13
3+
go 1.19
44

55
require (
66
github.com/coreos/go-semver v0.3.0
77
github.com/elliotchance/orderedmap v1.3.0
88
github.com/go-toolsmith/astcopy v1.0.0
99
github.com/iancoleman/strcase v0.1.2
10-
github.com/spf13/cobra v1.2.1
11-
golang.org/x/tools v0.1.5
10+
github.com/spf13/cobra v1.6.1
11+
golang.org/x/tools v0.6.0
1212
gomodules.xyz/orderedmap v0.1.0
13-
k8s.io/apiextensions-apiserver v0.21.3
14-
k8s.io/apimachinery v0.21.3
13+
k8s.io/apiextensions-apiserver v0.26.10
14+
k8s.io/apimachinery v0.26.10
1515
sigs.k8s.io/controller-tools v0.6.2
1616
)
17+
18+
require (
19+
github.com/fatih/color v1.12.0 // indirect
20+
github.com/go-logr/logr v1.2.3 // indirect
21+
github.com/gobuffalo/flect v0.2.3 // indirect
22+
github.com/gogo/protobuf v1.3.2 // indirect
23+
github.com/google/gofuzz v1.1.0 // indirect
24+
github.com/inconshreveable/mousetrap v1.0.1 // indirect
25+
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/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.9.0 // indirect
32+
golang.org/x/net v0.17.0 // indirect
33+
golang.org/x/sys v0.13.0 // indirect
34+
golang.org/x/text v0.13.0 // indirect
35+
gopkg.in/inf.v0 v0.9.1 // indirect
36+
gopkg.in/yaml.v2 v2.4.0 // indirect
37+
k8s.io/klog/v2 v2.80.1 // indirect
38+
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d // indirect
39+
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
40+
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
41+
sigs.k8s.io/yaml v1.3.0 // indirect
42+
)

‎generator/go.sum‎

Lines changed: 44 additions & 24 deletions
Large diffs are not rendered by default.

‎generator/interfaces/gen.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,18 @@ import (
2020
"bytes"
2121
"go/ast"
2222
"go/printer"
23-
"sigs.k8s.io/controller-tools/pkg/loader"
2423
"strings"
2524

25+
"sigs.k8s.io/controller-tools/pkg/loader"
26+
2627
"github.com/devfile/api/generator/genutils"
2728
"sigs.k8s.io/controller-tools/pkg/genall"
2829
"sigs.k8s.io/controller-tools/pkg/markers"
2930

3031
"github.com/elliotchance/orderedmap"
3132
)
3233

33-
//go:generate go run sigs.k8s.io/controller-tools/cmd/helpgen generate:headerFile=../header.go.txt,year=2020 paths=.
34+
//go:generate go run -mod=mod sigs.k8s.io/controller-tools/cmd/helpgen@v0.6.2 generate:headerFile=../header.go.txt,year=2020 paths=.
3435

3536
var (
3637
toplevelListMarker = markers.Must(markers.MakeDefinition("devfile:toplevellist", markers.DescribesField, struct{}{}))

‎generator/overrides/gen.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import (
3838
"github.com/elliotchance/orderedmap"
3939
)
4040

41-
//go:generate go run sigs.k8s.io/controller-tools/cmd/helpgen generate:headerFile=../header.go.txt,year=2020 paths=.
41+
//go:generate go run -mod=mod sigs.k8s.io/controller-tools/cmd/helpgen@v0.6.2 generate:headerFile=../header.go.txt,year=2020 paths=.
4242

4343
// +controllertools:marker:generateHelp:category=Overrides
4444

‎generator/schemas/gen.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ import (
4343
"gomodules.xyz/orderedmap"
4444
)
4545

46-
//go:generate go run sigs.k8s.io/controller-tools/cmd/helpgen generate:headerFile=../header.go.txt,year=2020 paths=.
46+
//go:generate go run -mod=mod sigs.k8s.io/controller-tools/cmd/helpgen@v0.6.2 generate:headerFile=../header.go.txt,year=2020 paths=.
4747

4848
// +controllertools:marker:generateHelp:category=Devfile
4949

‎generator/validate/gen.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"sigs.k8s.io/controller-tools/pkg/markers"
3030
)
3131

32-
//go:generate go run sigs.k8s.io/controller-tools/cmd/helpgen generate:headerFile=../header.go.txt,year=2020 paths=.
32+
//go:generate go run -mod=mod sigs.k8s.io/controller-tools/cmd/helpgen@v0.6.2 generate:headerFile=../header.go.txt,year=2020 paths=.
3333

3434
// +controllertools:marker:generateHelp
3535

‎generator/vendor/github.com/elliotchance/orderedmap/go.mod‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)