Merge pull request #168 from soltysh/crd-validation

Add CRD openapi definitions

Author: openshift-merge-robot

Gopkg.lock

@@ -1,4 +1,4 @@
-required = [ "k8s.io/code-generator/cmd/client-gen", "k8s.io/gengo/types" ]
+required = [ "k8s.io/code-generator/cmd/client-gen", "k8s.io/gengo/types", "github.com/openshift/library-go/cmd/crd-schema-gen" ]
 
 [prune]
   non-go = true
@@ -15,6 +15,11 @@ required = [ "k8s.io/code-generator/cmd/client-gen", "k8s.io/gengo/types" ]
   non-go = false
   unused-packages = false
 
+[[prune.project]]
+  name = "github.com/openshift/library-go"
+  non-go = false
+  unused-packages = false
+
 [[constraint]]
   name = "github.com/golang/glog"
   revision = "3c92600d7533018d216b534fe894ad60a1e6d5bf"
@@ -32,11 +37,11 @@ required = [ "k8s.io/code-generator/cmd/client-gen", "k8s.io/gengo/types" ]
   name = "k8s.io/client-go"
   version = "kubernetes-1.13.4"
 
-[[constraint]]
+[[override]]
   name = "k8s.io/apiextensions-apiserver"
   # use origin fork with nullable support.
   # TODO(sttts, sig-master): switch back to upstream version in 1.14
-  branch = "origin-4.0-kubernetes-1.12.4"
+  branch = "origin-4.1-kubernetes-1.13.4"
   source = "https://github.com/openshift/kubernetes-apiextensions-apiserver"
 
 [[constraint]]
@@ -70,3 +75,14 @@ required = [ "k8s.io/code-generator/cmd/client-gen", "k8s.io/gengo/types" ]
 [[constraint]]
   name = "github.com/openshift/client-go"
   branch = "master"
+
+[[override]]
+  name = "github.com/openshift/library-go"
+  branch = "master"
+
+[[override]]
+  name = "sigs.k8s.io/controller-tools"
+  # use origin fork with nullable support.
+  # TODO(soltysh, sig-master): switch back to upstream version in 1.14
+  branch = "origin-4.1-kubernetes-1.13.4"
+  source = "https://github.com/openshift/kubernetes-sigs-controller-tools"

Gopkg.toml

@@ -1,7 +1,23 @@
+all: build
+.PHONY: all
+
 build:
 	hack/build-go.sh
 .PHONY: build
 
 test:
 	go test ./...
 .PHONY: test
+
+clean:
+	rm -rf _output/
+.PHONY: clean
+
+update-codegen-crds:
+	go run ./vendor/github.com/openshift/library-go/cmd/crd-schema-gen/main.go --domain openshift.io --apis-dir vendor/github.com/openshift/api --manifests-dir install/
+update-codegen: update-codegen-crds
+verify-codegen-crds:
+	go run ./vendor/github.com/openshift/library-go/cmd/crd-schema-gen/main.go --domain openshift.io --apis-dir vendor/github.com/openshift/api --manifests-dir install/ --verify-only
+verify-codegen: verify-codegen-crds
+verify: verify-codegen
+.PHONY: update-codegen-crds update-codegen verify-codegen-crds verify-codegen verify

Makefile

@@ -40,3 +40,99 @@ spec:
   - name: v1
     served: true
     storage: true
+  validation:
+    openAPIV3Schema:
+      properties:
+        apiVersion:
+          description: 'APIVersion defines the versioned schema of this representation
+            of an object. Servers should convert recognized schemas to the latest
+            internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
+          type: string
+        kind:
+          description: 'Kind is a string value representing the REST resource this
+            object represents. Servers may infer this from the endpoint the client
+            submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
+          type: string
+        metadata:
+          type: object
+        spec:
+          description: spec hold the intent of how this operator should behave.
+          type: object
+        status:
+          description: status holds the information about the state of an operator.  It
+            is consistent with status information across the kube ecosystem.
+          properties:
+            conditions:
+              description: conditions describes the state of the operator's reconciliation
+                functionality. +patchMergeKey=type +patchStrategy=merge
+              items:
+                properties:
+                  lastTransitionTime:
+                    description: lastTransitionTime is the time of the last update
+                      to the current status object.
+                    format: date-time
+                    type: string
+                  message:
+                    description: message provides additional information about the
+                      current condition. This is only to be consumed by humans.
+                    type: string
+                  reason:
+                    description: reason is the reason for the condition's last transition.  Reasons
+                      are CamelCase
+                    type: string
+                  status:
+                    description: status of the condition, one of True, False, Unknown.
+                    type: string
+                  type:
+                    description: type specifies the state of the operator's reconciliation
+                      functionality.
+                    type: string
+                type: object
+              type: array
+            extension:
+              description: extension contains any additional status information specific
+                to the operator which owns this status object.
+              nullable: true
+              type: object
+            relatedObjects:
+              description: 'relatedObjects is a list of objects that are "interesting"
+                or related to this operator.  Common uses are: 1. the detailed resource
+                driving the operator 2. operator namespaces 3. operand namespaces'
+              items:
+                properties:
+                  group:
+                    description: group of the referent.
+                    type: string
+                  name:
+                    description: name of the referent.
+                    type: string
+                  namespace:
+                    description: namespace of the referent.
+                    type: string
+                  resource:
+                    description: resource of the referent.
+                    type: string
+                type: object
+              type: array
+            versions:
+              description: versions is a slice of operand version tuples.  Operators
+                which manage multiple operands will have multiple entries in the array.  If
+                an operator is Available, it must have at least one entry.  You must
+                report the version of the operator itself with the name "operator".
+              items:
+                properties:
+                  name:
+                    description: name is the name of the particular operand this version
+                      is for.  It usually matches container images, not operators.
+                    type: string
+                  version:
+                    description: version indicates which version of a particular operand
+                      is currently being manage.  It must always match the Available
+                      condition.  If 1.0.0 is Available, then this must indicate 1.0.0
+                      even if the operator is trying to rollout 1.1.0
+                    type: string
+                type: object
+              type: array
+          type: object
+      required:
+      - spec