Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

revert defaulter-gen #1288

Merged
merged 10 commits into from
Apr 15, 2019
Merged

revert defaulter-gen #1288

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b5af8b2
revert defaulter-gen
Apr 4, 2019
060a8da
update changelog
Apr 4, 2019
bea9cb0
Remove defaulter-gen from docs and scaffold
Apr 5, 2019
cb33f25
revert defaulter-gen
Apr 4, 2019
168c3cd
update changelog
Apr 4, 2019
504c664
Remove defaulter-gen from docs and scaffold
Apr 5, 2019
6e28170
changelog merge conflicts
Apr 8, 2019
5decfed
repair tests
Apr 8, 2019
4b4edf1
Merge remote-tracking branch 'upstream/master' into revert-defaultergen
Apr 15, 2019
dce0471
Update CHANGELOG.md
joelanford Apr 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

### Removed

- The SDK will no longer run `defaulter-gen` on running `operator-sdk generate k8s`. Defaulting for CRDs should be handled with mutating admission webhooks. ([#1288](https://github.com/operator-framework/operator-sdk/pull/1288))

### Bug Fixes

## v0.7.0
Expand Down
21 changes: 0 additions & 21 deletions cmd/operator-sdk/internal/genutil/k8s.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ func K8sCodegen(hf string) error {
binDir := filepath.Join(wd, scaffold.BuildBinDir)

genDirs := []string{
"./cmd/defaulter-gen",
"./cmd/client-gen",
"./cmd/lister-gen",
"./cmd/informer-gen",
Expand All @@ -63,10 +62,6 @@ func K8sCodegen(hf string) error {
if err = withHeaderFile(hf, fdc); err != nil {
return err
}
fd := func(a string) error { return defaulterGen(binDir, repoPkg, a, gvMap) }
if err = withHeaderFile(hf, fd); err != nil {
return err
}

log.Info("Code-generation complete.")
return nil
Expand All @@ -88,19 +83,3 @@ func deepcopyGen(binDir, repoPkg, hf string, gvMap map[string][]string) (err err
}
return nil
}

func defaulterGen(binDir, repoPkg, hf string, gvMap map[string][]string) (err error) {
apisPkg := filepath.Join(repoPkg, scaffold.ApisDir)
args := []string{
"--input-dirs", createFQApis(apisPkg, gvMap),
"--output-file-base", "zz_generated.defaults",
// defaulter-gen requires a boilerplate file. Either use header or an
// empty file if header is empty.
"--go-header-file", hf,
}
cmd := exec.Command(filepath.Join(binDir, "defaulter-gen"), args...)
if err = projutil.ExecCmd(cmd); err != nil {
return fmt.Errorf("failed to perform defaulter code-generation: %v", err)
}
return nil
}
1 change: 0 additions & 1 deletion doc/sdk-cli-reference.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ Prints the most recent Golang packages and versions required by operators. Print
```console
$ operator-sdk print-deps --as-file
required = [
"k8s.io/code-generator/cmd/defaulter-gen",
"k8s.io/code-generator/cmd/deepcopy-gen",
"k8s.io/code-generator/cmd/conversion-gen",
"k8s.io/code-generator/cmd/client-gen",
Expand Down
1 change: 0 additions & 1 deletion internal/pkg/scaffold/gopkgtoml.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ func (s *GopkgToml) GetInput() (input.Input, error) {

const gopkgTomlTmpl = `# Force dep to vendor the code generators, which aren't imported just used at dev time.
required = [
"k8s.io/code-generator/cmd/defaulter-gen",
"k8s.io/code-generator/cmd/deepcopy-gen",
"k8s.io/code-generator/cmd/conversion-gen",
"k8s.io/code-generator/cmd/client-gen",
Expand Down