Merge branch 'devfile:main' into podman-implementation

.github/workflows/ci.yaml

@@ -39,7 +39,7 @@ jobs:
         uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
         with:
           # The Go version to download (if necessary) and use. Supports semver spec and ranges.
-          go-version: 1.18
+          go-version: 1.19
 
       - name: Generate Go sources, CRDs and schemas
         run: |

generator/crds/gen.go

@@ -31,7 +31,7 @@ import (
 	"sigs.k8s.io/controller-tools/pkg/markers"
 )
 
-//go:generate go run sigs.k8s.io/controller-tools/cmd/helpgen generate:headerFile=../header.go.txt,year=2020 paths=.
+//go:generate go run -mod=mod sigs.k8s.io/controller-tools/cmd/helpgen@v0.6.2 generate:headerFile=../header.go.txt,year=2020 paths=.
 
 // +controllertools:marker:generateHelp
 

generator/getters/gen.go

@@ -19,16 +19,17 @@ package getters
 import (
 	"bytes"
 	"fmt"
+	"go/ast"
+	"strconv"
+
 	"github.com/devfile/api/generator/genutils"
 	"github.com/elliotchance/orderedmap"
-	"go/ast"
 	"sigs.k8s.io/controller-tools/pkg/genall"
 	"sigs.k8s.io/controller-tools/pkg/loader"
 	"sigs.k8s.io/controller-tools/pkg/markers"
-	"strconv"
 )
 
-//go:generate go run sigs.k8s.io/controller-tools/cmd/helpgen generate:headerFile=../header.go.txt,year=2021 paths=.
+//go:generate go run -mod=mod sigs.k8s.io/controller-tools/cmd/helpgen@v0.6.2 generate:headerFile=../header.go.txt,year=2021 paths=.
 
 var (
 	// GetterTypeMarker is associated with a type that's used as the pointer receiver of the getter method

generator/go.mod

@@ -1,16 +1,42 @@
 module github.com/devfile/api/generator
 
-go 1.13
+go 1.19
 
 require (
 	github.com/coreos/go-semver v0.3.0
 	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.2.1
-	golang.org/x/tools v0.1.5
+	github.com/spf13/cobra v1.6.1
+	golang.org/x/tools v0.6.0
 	gomodules.xyz/orderedmap v0.1.0
-	k8s.io/apiextensions-apiserver v0.21.3
-	k8s.io/apimachinery v0.21.3
+	k8s.io/apiextensions-apiserver v0.26.10
+	k8s.io/apimachinery v0.26.10
 	sigs.k8s.io/controller-tools v0.6.2
 )
+
+require (
+	github.com/fatih/color v1.12.0 // indirect
+	github.com/go-logr/logr v1.2.3 // indirect
+	github.com/gobuffalo/flect v0.2.3 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/google/gofuzz v1.1.0 // indirect
+	github.com/inconshreveable/mousetrap v1.0.1 // 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/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.9.0 // indirect
+	golang.org/x/net v0.17.0 // indirect
+	golang.org/x/sys v0.13.0 // indirect
+	golang.org/x/text v0.13.0 // indirect
+	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	k8s.io/klog/v2 v2.80.1 // indirect
+	k8s.io/utils v0.0.0-20221107191617-1a15be271d1d // indirect
+	sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
+	sigs.k8s.io/yaml v1.3.0 // indirect
+)

generator/interfaces/gen.go

@@ -20,17 +20,18 @@ import (
 	"bytes"
 	"go/ast"
 	"go/printer"
-	"sigs.k8s.io/controller-tools/pkg/loader"
 	"strings"
 
+	"sigs.k8s.io/controller-tools/pkg/loader"
+
 	"github.com/devfile/api/generator/genutils"
 	"sigs.k8s.io/controller-tools/pkg/genall"
 	"sigs.k8s.io/controller-tools/pkg/markers"
 
 	"github.com/elliotchance/orderedmap"
 )
 
-//go:generate go run sigs.k8s.io/controller-tools/cmd/helpgen generate:headerFile=../header.go.txt,year=2020 paths=.
+//go:generate go run -mod=mod sigs.k8s.io/controller-tools/cmd/helpgen@v0.6.2 generate:headerFile=../header.go.txt,year=2020 paths=.
 
 var (
 	toplevelListMarker = markers.Must(markers.MakeDefinition("devfile:toplevellist", markers.DescribesField, struct{}{}))

generator/overrides/gen.go

@@ -38,7 +38,7 @@ import (
 	"github.com/elliotchance/orderedmap"
 )
 
-//go:generate go run sigs.k8s.io/controller-tools/cmd/helpgen generate:headerFile=../header.go.txt,year=2020 paths=.
+//go:generate go run -mod=mod sigs.k8s.io/controller-tools/cmd/helpgen@v0.6.2 generate:headerFile=../header.go.txt,year=2020 paths=.
 
 // +controllertools:marker:generateHelp:category=Overrides
 

generator/schemas/gen.go

@@ -43,7 +43,7 @@ import (
 	"gomodules.xyz/orderedmap"
 )
 
-//go:generate go run sigs.k8s.io/controller-tools/cmd/helpgen generate:headerFile=../header.go.txt,year=2020 paths=.
+//go:generate go run -mod=mod sigs.k8s.io/controller-tools/cmd/helpgen@v0.6.2 generate:headerFile=../header.go.txt,year=2020 paths=.
 
 // +controllertools:marker:generateHelp:category=Devfile
 

generator/validate/gen.go

@@ -29,7 +29,7 @@ import (
 	"sigs.k8s.io/controller-tools/pkg/markers"
 )
 
-//go:generate go run sigs.k8s.io/controller-tools/cmd/helpgen generate:headerFile=../header.go.txt,year=2020 paths=.
+//go:generate go run -mod=mod sigs.k8s.io/controller-tools/cmd/helpgen@v0.6.2 generate:headerFile=../header.go.txt,year=2020 paths=.
 
 // +controllertools:marker:generateHelp