updated maintainer info with working tests

kudobuilder · Sep 11, 2019 · 20ddd7e · 20ddd7e
1 parent ab712e1
commit 20ddd7e
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 9 deletions.
diff --git a/config/crds/kudo_v1alpha1_operator.yaml b/config/crds/kudo_v1alpha1_operator.yaml
@@ -36,7 +36,12 @@ spec:
               type: string
             maintainers:
               items:
-                type: string
+                properties:
+                  name:
+                    type: string
+                  email:
+                    type: string
+                type: object
               type: array
             url:
               type: string

diff --git a/config/samples/first-operator/operator.yaml b/config/samples/first-operator/operator.yaml
@@ -1,7 +1,8 @@
 name: "first-operator"
 version: "0.1.0"
 maintainers:
-  - Your name <your@email.com>
+  - name: Your name
+    email: <your@email.com>
 url: https://kudo.dev
 tasks:
   app:

diff --git a/go.sum b/go.sum
@@ -444,6 +444,7 @@ sigs.k8s.io/controller-runtime v0.2.0 h1:5gL30PXOisGZl+Osi4CmLhvMUj77BO3wJeouKF2
 sigs.k8s.io/controller-runtime v0.2.0/go.mod h1:ZHqrRDZi3f6BzONcvlUxkqCKgwasGk5FZrnSv9TVZF4=
 sigs.k8s.io/controller-tools v0.2.0 h1:AmQ/0JKBJAjyAiPAkrAf9QW06jkx2lc5hpxMjamsFpw=
 sigs.k8s.io/controller-tools v0.2.0/go.mod h1:8t/X+FVWvk6TaBcsa+UKUBbn7GMtvyBKX30SGl4em6Y=
+sigs.k8s.io/controller-tools v0.2.1 h1:HoCik83vXOpPi7KSJWdPRmiGntyOzK0v0BTV4U+pl8o=
 sigs.k8s.io/kind v0.4.0 h1:C/QMxmF5Sp3yyKkTJ5+VJPcclZyu/JV8wLyihZbsHaI=
 sigs.k8s.io/kind v0.4.0/go.mod h1:bgGo2cWxKGQ7esVxtGp9H17Ttlexju92CTMjCg08HNQ=
 sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0=

diff --git a/pkg/kudoctl/cmd/init/crds.go b/pkg/kudoctl/cmd/init/crds.go
@@ -67,14 +67,22 @@ func operatorCrd() *apiextv1beta1.CustomResourceDefinition {
 }
 
 func generateOperator() *apiextv1beta1.CustomResourceDefinition {
+
+	maintainers := map[string]apiextv1beta1.JSONSchemaProps{
+		"name":  apiextv1beta1.JSONSchemaProps{Type: "string"},
+		"email": apiextv1beta1.JSONSchemaProps{Type: "string"},
+	}
+
 	crd := generateCrd("Operator", "operators")
 	specProps := map[string]apiextv1beta1.JSONSchemaProps{
 		"description":       apiextv1beta1.JSONSchemaProps{Type: "string"},
 		"kubernetesVersion": apiextv1beta1.JSONSchemaProps{Type: "string"},
 		"kudoVersion":       apiextv1beta1.JSONSchemaProps{Type: "string"},
 		"maintainers": apiextv1beta1.JSONSchemaProps{
-			Type:  "array",
-			Items: &apiextv1beta1.JSONSchemaPropsOrArray{Schema: &apiextv1beta1.JSONSchemaProps{Type: "string"}, JSONSchemas: []apiextv1beta1.JSONSchemaProps{}},
+			Items: &apiextv1beta1.JSONSchemaPropsOrArray{Schema: &apiextv1beta1.JSONSchemaProps{
+				Type:       "object",
+				Properties: maintainers,
+			}, JSONSchemas: []apiextv1beta1.JSONSchemaProps{}},
 		},
 		"url": apiextv1beta1.JSONSchemaProps{Type: "string"},
 	}

diff --git a/pkg/kudoctl/cmd/testdata/deploy-kudo.yaml.golden b/pkg/kudoctl/cmd/testdata/deploy-kudo.yaml.golden
@@ -78,8 +78,12 @@ spec:
               type: string
             maintainers:
               items:
-                type: string
-              type: array
+                properties:
+                  email:
+                    type: string
+                  name:
+                    type: string
+                type: object
             url:
               type: string
           type: object

diff --git a/test/integration/cli-install/cli-install-operator/operator.yaml b/test/integration/cli-install/cli-install-operator/operator.yaml
@@ -3,7 +3,8 @@ version: "0.1.0"
 kudoVersion: 0.3.0
 kubernetesVersion: 1.5.1
 maintainers:
-  - Justin Taylor-Barrick <jbarrick-mesosphere@mesosphere.com>
+  - name: Justin Taylor-Barrick
+    email: jbarrick-mesosphere@mesosphere.com
 tasks:
   infra:
     resources:

diff --git a/test/integration/upgrade-command/first-operator/operator.yaml b/test/integration/upgrade-command/first-operator/operator.yaml
@@ -1,7 +1,8 @@
 name: "upgrade-operator"
 version: "0.1.0"
 maintainers:
-  - Your name <your@email.com>
+  - name: Your name
+    email: <your@email.com>
 url: https://kudo.dev
 tasks:
   app:

diff --git a/test/integration/upgrade-command/second-operator/operator.yaml b/test/integration/upgrade-command/second-operator/operator.yaml
@@ -1,7 +1,8 @@
 name: "upgrade-operator"
 version: "0.2.0"
 maintainers:
-  - Your name <your@email.com>
+  - name: Your name
+    email: <your@email.com>
 url: https://kudo.dev
 tasks:
   app: