Skip to content

Commit d495eab

Browse files
committed
Isolate go.mod
1 parent 93d70b5 commit d495eab

File tree

4 files changed

+708
-17
lines changed

4 files changed

+708
-17
lines changed

pkg/applyconfigurations/gen.go

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -61,16 +61,16 @@ func (Generator) CheckFilter() loader.NodeFilter {
6161
}
6262

6363
func (Generator) RegisterMarkers(into *markers.Registry) error {
64-
// if err := markers.RegisterAll(into,
65-
// enablePkgMarker, enableTypeMarker, isObjectMarker); err != nil {
66-
// return err
67-
// }
68-
// into.AddHelp(enablePkgMarker,
69-
// markers.SimpleHelp("apply", "enables or disables object apply configuration generation for this package"))
70-
// into.AddHelp(
71-
// enableTypeMarker, markers.SimpleHelp("apply", "overrides enabling or disabling apply configuration generation for this type"))
72-
// into.AddHelp(isObjectMarker,
73-
// markers.SimpleHelp("apply", "enables apply configuration generation for this type"))
64+
if err := markers.RegisterAll(into,
65+
enablePkgMarker, enableTypeMarker, isObjectMarker); err != nil {
66+
return err
67+
}
68+
into.AddHelp(enablePkgMarker,
69+
markers.SimpleHelp("apply", "enables or disables object apply configuration generation for this package"))
70+
into.AddHelp(
71+
enableTypeMarker, markers.SimpleHelp("apply", "overrides enabling or disabling apply configuration generation for this type"))
72+
into.AddHelp(isObjectMarker,
73+
markers.SimpleHelp("apply", "enables apply configuration generation for this type"))
7474
return nil
7575
}
7676

@@ -178,6 +178,8 @@ func (d Generator) Generate(ctx *genall.GenerationContext) error {
178178
baseFilePath: filepath.Dir(crdRoot.CompiledGoFiles[0]),
179179
}
180180

181+
// universe.baseImportPath = "k8s.io/client-go/applyconfigurations"
182+
181183
for _, pkg := range visited {
182184
outContents := objGenCtx.generateForPackage(universe, pkg)
183185
if outContents == nil {
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
module sigs.k8s.io/controller-tools/pkg/applyconfigurations/testdata
2+
3+
go 1.15
4+
5+
require (
6+
github.com/fatih/color v1.9.0
7+
github.com/gobuffalo/flect v0.2.2
8+
github.com/google/go-cmp v0.5.2
9+
github.com/mattn/go-colorable v0.1.8 // indirect
10+
github.com/onsi/ginkgo v1.14.1
11+
github.com/onsi/gomega v1.10.2
12+
github.com/spf13/cobra v1.1.1
13+
github.com/spf13/pflag v1.0.5
14+
golang.org/x/tools v0.0.0-20200616133436-c1934b75d054
15+
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776
16+
k8s.io/api v0.20.2
17+
k8s.io/apiextensions-apiserver v0.20.2
18+
k8s.io/apimachinery v0.20.2
19+
sigs.k8s.io/controller-tools v0.5.0 // indirect
20+
sigs.k8s.io/yaml v1.2.0
21+
)
22+
23+
replace sigs.k8s.io/controller-tools => ../../../

0 commit comments

Comments
 (0)