Create CRD validation specs in CRD manifests and as Go code

commands/operator-sdk/cmd/add/api.go

@@ -89,7 +89,7 @@ func apiRun(cmd *cobra.Command, args []string) {
 		&scaffold.Register{Resource: r},
 		&scaffold.Doc{Resource: r},
 		&scaffold.Cr{Resource: r},
-		&scaffold.Crd{Resource: r},
+		&scaffold.Crd{Resource: r, IsOperatorGo: projutil.IsOperatorGo()},
 	)
 	if err != nil {
 		log.Fatalf("add scaffold failed: (%v)", err)
@@ -103,5 +103,8 @@ func apiRun(cmd *cobra.Command, args []string) {
 	// Run k8s codegen for deepcopy
 	generate.K8sCodegen()
 
+	// Generate a validation spec for the new CRD.
+	generate.OpenAPIGen()
+
 	log.Info("Api generation complete.")
 }

commands/operator-sdk/cmd/add/crd.go

@@ -69,7 +69,7 @@ func crdFunc(cmd *cobra.Command, args []string) {
 
 	s := scaffold.Scaffold{}
 	err = s.Execute(cfg,
-		&scaffold.Crd{Resource: resource},
+		&scaffold.Crd{Resource: resource, IsOperatorGo: projutil.IsOperatorGo()},
 		&scaffold.Cr{Resource: resource},
 	)
 	if err != nil {

commands/operator-sdk/cmd/generate.go

@@ -27,5 +27,6 @@ func NewGenerateCmd() *cobra.Command {
 		Long:  `The operator-sdk generate command invokes specific generator to generate code as needed.`,
 	}
 	cmd.AddCommand(generate.NewGenerateK8SCmd())
+	cmd.AddCommand(generate.NewGenerateOpenAPICmd())
 	return cmd
 }

commands/operator-sdk/cmd/generate/internal/genutil.go

@@ -0,0 +1,110 @@
+// Copyright 2018 The Operator-SDK Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package genutil
+
+import (
+	"fmt"
+	"io/ioutil"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"strings"
+
+	"github.com/operator-framework/operator-sdk/pkg/scaffold"
+)
+
+func BuildCodegenBinaries(genDirs []string, binDir, codegenSrcDir string) error {
+	for _, gd := range genDirs {
+		err := runGoBuildCodegen(binDir, codegenSrcDir, gd)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func runGoBuildCodegen(binDir, repoDir, genDir string) error {
+	binPath := filepath.Join(binDir, filepath.Base(genDir))
+	installCmd := exec.Command("go", "build", "-o", binPath, genDir)
+	installCmd.Dir = repoDir
+	isVerbose := false
+	if gf, ok := os.LookupEnv("GOFLAGS"); ok && len(gf) != 0 {
+		installCmd.Env = append(os.Environ(), "GOFLAGS="+gf)
+		if strings.Contains(gf, "-v") {
+			isVerbose = true
+		}
+	}
+	if isVerbose {
+		installCmd.Stdout = os.Stdout
+		installCmd.Stderr = os.Stderr
+	} else {
+		installCmd.Stdout = ioutil.Discard
+		installCmd.Stderr = ioutil.Discard
+	}
+	return installCmd.Run()
+}
+
+// ParseGroupVersions parses the layout of pkg/apis to return a map of
+// API groups to versions.
+func ParseGroupVersions() (map[string][]string, error) {
+	gvs := make(map[string][]string)
+	groups, err := ioutil.ReadDir(scaffold.ApisDir)
+	if err != nil {
+		return nil, fmt.Errorf("could not read pkg/apis directory to find api Versions: %v", err)
+	}
+
+	for _, g := range groups {
+		if g.IsDir() {
+			groupDir := filepath.Join(scaffold.ApisDir, g.Name())
+			versions, err := ioutil.ReadDir(groupDir)
+			if err != nil {
+				return nil, fmt.Errorf("could not read %s directory to find api Versions: %v", groupDir, err)
+			}
+
+			gvs[g.Name()] = make([]string, 0)
+			for _, v := range versions {
+				if v.IsDir() && scaffold.ResourceVersionRegexp.MatchString(v.Name()) {
+					gvs[g.Name()] = append(gvs[g.Name()], v.Name())
+				}
+			}
+		}
+	}
+
+	if len(gvs) == 0 {
+		return nil, fmt.Errorf("no groups or versions found in %s", scaffold.ApisDir)
+	}
+	return gvs, nil
+}
+
+// CreateFQApis return a string of all fully qualified pkg + groups + versions
+// of pkg and gvs in the format:
+// "pkg/groupA/v1,pkg/groupA/v2,pkg/groupB/v1"
+func CreateFQApis(pkg string, gvs map[string][]string) string {
+	gn := 0
+	fqb := &strings.Builder{}
+	for g, vs := range gvs {
+		for vn, v := range vs {
+			fqb.WriteString(filepath.Join(pkg, g, v))
+			if vn < len(vs)-1 {
+				fqb.WriteString(",")
+			}
+		}
+		if gn < len(gvs)-1 {
+			fqb.WriteString(",")
+		}
+		gn++
+	}
+	return fqb.String()
+}

commands/operator-sdk/cmd/generate/k8s.go

@@ -16,12 +16,11 @@ package generate
 
 import (
 	"fmt"
-	"io/ioutil"
-	"os"
 	"os/exec"
 	"path/filepath"
 	"strings"
 
+	genutil "github.com/operator-framework/operator-sdk/commands/operator-sdk/cmd/generate/internal"
 	"github.com/operator-framework/operator-sdk/internal/util/projutil"
 	"github.com/operator-framework/operator-sdk/pkg/scaffold"
 
@@ -62,7 +61,7 @@ func K8sCodegen() {
 
 	buildCodegenBinaries(binDir, srcDir)
 
-	gvMap, err := parseGroupVersions()
+	gvMap, err := genutil.ParseGroupVersions()
 	if err != nil {
 		log.Fatalf("failed to parse group versions: (%v)", err)
 	}
@@ -71,7 +70,7 @@ func K8sCodegen() {
 		gvb.WriteString(fmt.Sprintf("%s:%v, ", g, vs))
 	}
 
-	log.Infof("Running code-generation for Custom Resource group versions: [%v]\n", gvb.String())
+	log.Infof("Running deepcopy code-generation for Custom Resource group versions: [%v]\n", gvb.String())
 
 	deepcopyGen(binDir, repoPkg, gvMap)
 
@@ -86,93 +85,17 @@ func buildCodegenBinaries(binDir, codegenSrcDir string) {
 		"./cmd/informer-gen",
 		"./cmd/deepcopy-gen",
 	}
-	for _, gd := range genDirs {
-		err := runGoBuildCodegen(binDir, codegenSrcDir, gd)
-		if err != nil {
-			log.Fatal(err)
-		}
-	}
-}
-
-func runGoBuildCodegen(binDir, repoDir, genDir string) error {
-	binPath := filepath.Join(binDir, filepath.Base(genDir))
-	installCmd := exec.Command("go", "build", "-o", binPath, genDir)
-	installCmd.Dir = repoDir
-	isVerbose := false
-	if gf, ok := os.LookupEnv("GOFLAGS"); ok && len(gf) != 0 {
-		installCmd.Env = append(os.Environ(), "GOFLAGS="+gf)
-		if strings.Contains(gf, "-v") {
-			isVerbose = true
-		}
-	}
-	if isVerbose {
-		installCmd.Stdout = os.Stdout
-		installCmd.Stderr = os.Stderr
-	} else {
-		installCmd.Stdout = ioutil.Discard
-		installCmd.Stderr = ioutil.Discard
-	}
-	return installCmd.Run()
-}
-
-// parseGroupVersions parses the layout of pkg/apis to return a map of
-// API groups to versions.
-func parseGroupVersions() (map[string][]string, error) {
-	gvs := make(map[string][]string)
-	groups, err := ioutil.ReadDir(scaffold.ApisDir)
+	err := genutil.BuildCodegenBinaries(genDirs, binDir, codegenSrcDir)
 	if err != nil {
-		return nil, fmt.Errorf("could not read pkg/apis directory to find api Versions: %v", err)
-	}
-
-	for _, g := range groups {
-		if g.IsDir() {
-			groupDir := filepath.Join(scaffold.ApisDir, g.Name())
-			versions, err := ioutil.ReadDir(groupDir)
-			if err != nil {
-				return nil, fmt.Errorf("could not read %s directory to find api Versions: %v", groupDir, err)
-			}
-
-			gvs[g.Name()] = make([]string, 0)
-			for _, v := range versions {
-				if v.IsDir() && scaffold.ResourceVersionRegexp.MatchString(v.Name()) {
-					gvs[g.Name()] = append(gvs[g.Name()], v.Name())
-				}
-			}
-		}
-	}
-
-	if len(gvs) == 0 {
-		return nil, fmt.Errorf("no groups or versions found in %s", scaffold.ApisDir)
-	}
-	return gvs, nil
-}
-
-// createFQApis return a string of all fully qualified pkg + groups + versions
-// of pkg and gvs in the format:
-// "pkg/groupA/v1,pkg/groupA/v2,pkg/groupB/v1"
-func createFQApis(pkg string, gvs map[string][]string) string {
-	gn := 0
-	sb := &strings.Builder{}
-	for g, vs := range gvs {
-		for vn, v := range vs {
-			sb.WriteString(filepath.Join(pkg, g, v))
-			if vn < len(vs)-1 {
-				sb.WriteString(",")
-			}
-		}
-		if gn < len(gvs)-1 {
-			sb.WriteString(",")
-		}
-		gn++
+		log.Fatal(err)
 	}
-	return sb.String()
 }
 
 func deepcopyGen(binDir, repoPkg string, gvMap map[string][]string) {
 	apisPkg := filepath.Join(repoPkg, scaffold.ApisDir)
 	args := []string{
-		"--input-dirs", createFQApis(apisPkg, gvMap),
-		"-O", "zz_generated.deepcopy",
+		"--input-dirs", genutil.CreateFQApis(apisPkg, gvMap),
+		"--output-file-base", "zz_generated.deepcopy",
 		"--bounding-dirs", apisPkg,
 	}
 	cgPath := filepath.Join(binDir, "deepcopy-gen")