Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ jobs:
- name: Run Gosec Security Scanner
run: |
export PATH=$PATH:$(go env GOPATH)/bin
go install github.com/securego/gosec/v2/cmd/gosec@v2.22.7
go install github.com/securego/gosec/v2/cmd/gosec@v2.22.8
bash ./run_gosec.sh
if [[ $? != 0 ]]
then
Expand Down
5,753 changes: 2,857 additions & 2,896 deletions crds/workspace.devfile.io_devworkspaces.yaml

Large diffs are not rendered by default.

4,935 changes: 2,544 additions & 2,391 deletions crds/workspace.devfile.io_devworkspacetemplates.yaml

Large diffs are not rendered by default.

25 changes: 22 additions & 3 deletions generator/crds/gen.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ package crds
import (
"fmt"
"go/ast"
"os"
"strings"

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

Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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{}
Expand Down Expand Up @@ -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
}
50 changes: 26 additions & 24 deletions generator/go.mod
Original file line number Diff line number Diff line change
@@ -1,43 +1,45 @@
module github.com/devfile/api/generator

go 1.24
go 1.24.0

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.36.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
k8s.io/apimachinery v0.34.0
sigs.k8s.io/controller-tools v0.19.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.9.0 // indirect
github.com/go-logr/logr v1.4.3 // 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.38.0 // indirect
golang.org/x/sync v0.12.0 // indirect
golang.org/x/sys v0.31.0 // indirect
golang.org/x/text v0.23.0 // indirect
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
github.com/spf13/pflag v1.0.7 // indirect
github.com/x448/float16 v0.8.4 // indirect
go.yaml.in/yaml/v2 v2.4.2 // indirect
golang.org/x/mod v0.27.0 // indirect
golang.org/x/net v0.43.0 // indirect
golang.org/x/sync v0.16.0 // indirect
golang.org/x/sys v0.35.0 // indirect
golang.org/x/text v0.28.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-20241014173422-cfa47c3a1cc8 // indirect
sigs.k8s.io/randfill v1.0.0 // indirect
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
)
Loading
Loading