Switch back to Zuul crd, short name is better

deploy/crds/zuul-ci_v1alpha1_zuul_cr.yaml

@@ -1,5 +1,5 @@
 apiVersion: operator.zuul-ci.org/v1alpha1
-kind: ZuulService
+kind: Zuul
 metadata:
   name: example-zuul
 spec:

deploy/crds/zuul-ci_v1alpha1_zuul_crd.yaml

@@ -1,14 +1,14 @@
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
-  name: zuulservices.operator.zuul-ci.org
+  name: zuul.operator.zuul-ci.org
 spec:
   group: operator.zuul-ci.org
   names:
-    kind: ZuulService
-    listKind: ZuulServiceList
-    plural: zuulservices
-    singular: zuulservice
+    kind: Zuul
+    listKind: ZuulList
+    plural: zuuls
+    singular: zuul
     shortNames:
       - zuul
   scope: Namespaced

watches.yaml

@@ -1,5 +1,5 @@
 ---
 - version: v1alpha1
   group: operator.zuul-ci.org
-  kind: ZuulService
+  kind: Zuul
   playbook: /opt/ansible/zuul.yaml