revert defaulter-gen

CHANGELOG.md

@@ -10,6 +10,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

cmd/operator-sdk/internal/genutil/k8s.go

@@ -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",
@@ -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
@@ -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
-}

doc/sdk-cli-reference.md

@@ -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",

internal/pkg/scaffold/gopkgtoml.go

@@ -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",

internal/pkg/scaffold/gopkgtoml_test.go

@@ -35,7 +35,6 @@ func TestGopkgtoml(t *testing.T) {
 
 const gopkgtomlExp = `# 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",