Generate CRDs with structural schema (#1885)

* generating CRDs with controller-tools and embedding in binary

Signed-off-by: Adnan Abdulhussein <aadnan@vmware.com>

hack/build-image/Dockerfile

@@ -21,6 +21,8 @@ RUN mkdir -p /go/src/k8s.io && \
     git clone -b kubernetes-1.15.3 https://github.com/kubernetes/apimachinery && \
     # vendor code-generator go modules to be compatible with pre-1.15
     cd /go/src/k8s.io/code-generator && GO111MODULE=on go mod vendor && \
+    go get -d sigs.k8s.io/controller-tools/cmd/controller-gen && \
+    cd /go/src/sigs.k8s.io/controller-tools && GO111MODULE=on go mod vendor && \
     go get golang.org/x/tools/cmd/goimports && \
     cd /go/src/golang.org/x/tools && \
     git checkout 40a48ad93fbe707101afb2099b738471f70594ec && \

hack/crd-gen/main.go

@@ -0,0 +1,136 @@
+/*
+Copyright 2019 the Velero contributors.
+
+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.
+*/
+
+// This code embeds the CRD manifests in pkg/generated/crds/manifests in
+// pkg/generated/crds/crds.go.
+
+package main
+
+import (
+	"bytes"
+	"compress/gzip"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"log"
+	"os"
+	"text/template"
+)
+
+// This is relative to pkg/generated/crds
+const goHeaderFile = "../../../hack/boilerplate.go.txt"
+
+const tpl = `{{.GoHeader}}
+// Code generated by crds_generate.go; DO NOT EDIT.
+
+package crds
+
+import (
+	"bytes"
+	"compress/gzip"
+	"io/ioutil"
+
+	apiextinstall "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/install"
+	apiextv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
+	"k8s.io/client-go/kubernetes/scheme"
+)
+
+var rawCRDs = [][]byte{
+{{- range .RawCRDs }}
+	[]byte({{ . }}),
+{{- end }}
+}
+
+var CRDs = crds()
+
+func crds() []*apiextv1beta1.CustomResourceDefinition {
+	apiextinstall.Install(scheme.Scheme)
+	decode := scheme.Codecs.UniversalDeserializer().Decode
+	var objs []*apiextv1beta1.CustomResourceDefinition
+	for _, crd := range rawCRDs {
+		gzr, err := gzip.NewReader(bytes.NewReader(crd))
+		if err != nil {
+			panic(err)
+		}
+		bytes, err := ioutil.ReadAll(gzr)
+		if err != nil {
+			panic(err)
+		}
+		gzr.Close()
+
+		obj, _, err := decode(bytes, nil, nil)
+		if err != nil {
+			panic(err)
+		}
+		objs = append(objs, obj.(*apiextv1beta1.CustomResourceDefinition))
+	}
+	return objs
+}
+`
+
+type templateData struct {
+	GoHeader string
+	RawCRDs  []string
+}
+
+func main() {
+	headerBytes, err := ioutil.ReadFile(goHeaderFile)
+	if err != nil {
+		log.Fatalln(err)
+	}
+
+	data := templateData{
+		GoHeader: string(headerBytes),
+	}
+
+	// This is relative to pkg/generated/crds
+	manifests, err := ioutil.ReadDir("manifests")
+	if err != nil {
+		log.Fatalln(err)
+	}
+
+	for _, crd := range manifests {
+		file, err := os.Open("manifests/" + crd.Name())
+		if err != nil {
+			log.Fatalln(err)
+		}
+
+		// gzip compress manifest
+		var buf bytes.Buffer
+		gzw := gzip.NewWriter(&buf)
+		if _, err := io.Copy(gzw, file); err != nil {
+			log.Fatalln(err)
+		}
+		file.Close()
+		gzw.Close()
+
+		data.RawCRDs = append(data.RawCRDs, fmt.Sprintf("%q", buf.Bytes()))
+	}
+
+	t, err := template.New("crds").Parse(tpl)
+	if err != nil {
+		log.Fatalln(err)
+	}
+
+	out, err := os.Create("crds.go")
+	if err != nil {
+		log.Fatalln(err)
+	}
+
+	if err := t.Execute(out, data); err != nil {
+		log.Fatalln(err)
+	}
+}

hack/update-generated-crd-code.sh

@@ -28,12 +28,27 @@ if [[ ! -d "${GOPATH}/src/k8s.io/code-generator" ]]; then
   exit 1
 fi
 
-cd ${GOPATH}/src/k8s.io/code-generator
+if [[ ! -d "${GOPATH}/src/sigs.k8s.io/controller-tools" ]]; then
+  echo "sigs.k8s.io/controller-tools missing from GOPATH"
+  exit 1
+fi
 
-./generate-groups.sh \
+${GOPATH}/src/k8s.io/code-generator/generate-groups.sh \
   all \
   github.com/heptio/velero/pkg/generated \
   github.com/heptio/velero/pkg/apis \
   "velero:v1" \
   --go-header-file ${GOPATH}/src/github.com/heptio/velero/hack/boilerplate.go.txt \
   $@
+
+if [[ "$@" == "--verify-only" ]]; then
+  # skip generating CRD manifests
+  exit
+fi
+
+go run ${GOPATH}/src/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go \
+  crd \
+  output:dir=pkg/generated/crds/manifests \
+  paths=./pkg/apis/velero/v1/...
+
+go generate ./pkg/generated/crds