Create CRD validation specs in CRD manifests and as Go code

commands/operator-sdk/cmd/add.go

@@ -29,6 +29,6 @@ func NewAddCmd() *cobra.Command {
 
 	upCmd.AddCommand(add.NewApiCmd())
 	upCmd.AddCommand(add.NewControllerCmd())
-	upCmd.AddCommand(add.NewAddCrdCmd())
+	upCmd.AddCommand(add.NewAddCRDCmd())
 	return upCmd
 }

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

@@ -36,8 +36,17 @@ func NewApiCmd() *cobra.Command {
 		Use:   "api",
 		Short: "Adds a new api definition under pkg/apis",
 		Long: `operator-sdk add api --kind=<kind> --api-version=<group/version> creates the
-api definition for a new custom resource under pkg/apis. This command must be run from the project root directory.
-If the api already exists at pkg/apis/<group>/<version> then the command will not overwrite and return an error.
+api definition for a new custom resource under pkg/apis. This command must be
+run from the project root directory. If the api already exists at
+pkg/apis/<group>/<version> then the command will not overwrite and return an
+error.
+
+This command runs Kubernetes deepcopy and OpenAPI V3 generators on tagged
+types in all paths under pkg/apis. Go code is generated under
+pkg/apis/<group>/<version>/zz_generated.{deepcopy,openapi}.go. CRD's are
+generated, or updated if they exist for a particular group + version + kind,
+under deploy/crds/<group>_<version>_<kind>_crd.yaml; OpenAPI V3 validation YAML
+is generated as a 'validation' object.
 
 Example:
 	$ operator-sdk add api --api-version=app.example.com/v1alpha1 --kind=AppService
@@ -49,8 +58,12 @@ Example:
 		└── v1alpha1
 			├── doc.go
 			├── register.go
-			├── types.go
-
+			├── appservice_types.go
+			├── zz_generated.deepcopy.go
+			├── zz_generated.openapi.go
+	$ tree deploy/crds
+	├── deploy/crds/app_v1alpha1_appservice_cr.yaml
+	├── deploy/crds/app_v1alpha1_appservice_crd.yaml
 `,
 		RunE: apiRun,
 	}
@@ -96,8 +109,8 @@ func apiRun(cmd *cobra.Command, args []string) error {
 		&scaffold.AddToScheme{Resource: r},
 		&scaffold.Register{Resource: r},
 		&scaffold.Doc{Resource: r},
-		&scaffold.Cr{Resource: r},
-		&scaffold.Crd{Resource: r},
+		&scaffold.CR{Resource: r},
+		&scaffold.CRD{Resource: r, IsOperatorGo: projutil.IsOperatorGo()},
 	)
 	if err != nil {
 		return fmt.Errorf("api scaffold failed: (%v)", err)
@@ -113,6 +126,11 @@ func apiRun(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
+	// Generate a validation spec for the new CRD.
+	if err := generate.OpenAPIGen(); err != nil {
+		return err
+	}
+
 	log.Info("API generation complete.")
 	return nil
 }

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

@@ -28,8 +28,8 @@ import (
 	"github.com/spf13/cobra"
 )
 
-// NewAddCrdCmd - add crd command
-func NewAddCrdCmd() *cobra.Command {
+// NewAddCRDCmd - add crd command
+func NewAddCRDCmd() *cobra.Command {
 	crdCmd := &cobra.Command{
 		Use:   "crd",
 		Short: "Adds a Custom Resource Definition (CRD) and the Custom Resource (CR) files",
@@ -78,8 +78,8 @@ func crdFunc(cmd *cobra.Command, args []string) error {
 
 	s := scaffold.Scaffold{}
 	err = s.Execute(cfg,
-		&scaffold.Crd{Resource: resource},
-		&scaffold.Cr{Resource: resource},
+		&scaffold.CRD{Resource: resource, IsOperatorGo: projutil.IsOperatorGo()},
+		&scaffold.CR{Resource: resource},
 	)
 	if err != nil {
 		return fmt.Errorf("crd scaffold failed: (%v)", err)

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()
+}