schemapatcher testdata for multi-CRD-version

This updates the schemapatcher testdata to work with the previous
commit, which introduced multi-CRD-version support.

Author: DirectXMan12

pkg/schemapatcher/testdata/Makefile

@@ -1,6 +1,7 @@
 all:
-	go run -v sigs.k8s.io/controller-tools/cmd/controller-gen schemapatch:manifests=./manifests output:dir=./expected paths=./apis/...
+	../../../.run-controller-gen.sh schemapatch:manifests=./manifests output:dir=./expected paths=./apis/...
 	egrep -v -- "- foo" < expected/kubebuilder-example-crd.yaml > manifests/kubebuilder-example-crd.yaml
+	egrep -v -- "- foo" < expected/kubebuilder-example-crd.v1.yaml > manifests/kubebuilder-example-crd.v1.yaml
 	egrep -v -- "- foo" < expected/legacy-example-crd.yaml > manifests/legacy-example-crd.yaml
 
 .PHONY: all

pkg/schemapatcher/testdata/expected/kubebuilder-example-crd.v1.yaml

@@ -0,0 +1,45 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: example.kubebuilder.schemapatcher.controller-tools.sigs.k8s.io
+spec:
+  group: kubebuilder.schemapatcher.controller-tools.sigs.k8s.io
+  scope: Cluster
+  names:
+    kind: Example
+    singular: example
+    plural: examples
+    listKind: ExampleList
+  versions:
+  - name: v1
+    schema:
+      openAPIV3Schema:
+        description: Example is a kind with schema changes.
+        type: object
+        required:
+        - spec
+        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/sig-architecture/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/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            type: object
+            required:
+            - bar
+            - foo
+            properties:
+              bar:
+                description: foo contains foo.
+                type: string
+              foo:
+                description: foo contains foo.
+                type: string

pkg/schemapatcher/testdata/expected/kubebuilder-unchanged-crd.v1beta1.yaml

@@ -0,0 +1,44 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: unchanged.kubebuilder.schemapatcher.controller-tools.sigs.k8s.io
+spec:
+  group: kubebuilder.schemapatcher.controller-tools.sigs.k8s.io
+  scope: Cluster
+  names:
+    kind: Unchanged
+    singular: unchanged
+    plural: unchangeds
+    listKind: UnchangedList
+  version: v1
+  validation:
+    openAPIV3Schema:
+      description: Unchanged is a kind without schema changes.
+      type: object
+      required:
+      - spec
+      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/sig-architecture/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/sig-architecture/api-conventions.md#types-kinds'
+          type: string
+        metadata:
+          type: object
+        spec:
+          type: object
+          required:
+          - bar
+          - foo
+          properties:
+            bar:
+              description: foo contains foo.
+              type: string
+            foo:
+              description: foo contains foo.
+              type: string

pkg/schemapatcher/testdata/expected/kubebuilder-unchanged-crd.yaml

@@ -1,4 +1,4 @@
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: unchanged.kubebuilder.schemapatcher.controller-tools.sigs.k8s.io
@@ -10,35 +10,36 @@ spec:
     singular: unchanged
     plural: unchangeds
     listKind: UnchangedList
-  version: v1
-  validation:
-    openAPIV3Schema:
-      description: Unchanged is a kind without schema changes.
-      type: object
-      required:
-      - spec
-      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/sig-architecture/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/sig-architecture/api-conventions.md#types-kinds'
-          type: string
-        metadata:
-          type: object
-        spec:
-          type: object
-          required:
-          - bar
-          - foo
-          properties:
-            bar:
-              description: foo contains foo.
-              type: string
-            foo:
-              description: foo contains foo.
-              type: string
+  versions:
+  - name: v1
+    schema:
+      openAPIV3Schema:
+        description: Unchanged is a kind without schema changes.
+        type: object
+        required:
+        - spec
+        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/sig-architecture/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/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          spec:
+            type: object
+            required:
+            - bar
+            - foo
+            properties:
+              bar:
+                description: foo contains foo.
+                type: string
+              foo:
+                description: foo contains foo.
+                type: string

pkg/schemapatcher/testdata/go.mod

@@ -2,10 +2,4 @@ module testdata.kubebuilder.io/inplaceschema
 
 go 1.12
 
-require (
-	k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655
-	sigs.k8s.io/controller-tools v0.0.0-00010101000000-000000000000 // indirect
-)
-
-// use the current copy of controller-tools
-replace sigs.k8s.io/controller-tools => ../../..
+require k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655