Merge pull request openshift#48 from deads2k/operator

add alpha common operator types

Makefile

@@ -9,6 +9,7 @@ build:
 	go build github.com/openshift/api/image/...
 	go build github.com/openshift/api/network/...
 	go build github.com/openshift/api/oauth/...
+	go build github.com/openshift/api/operator/...
 	go build github.com/openshift/api/project/...
 	go build github.com/openshift/api/quota/...
 	go build github.com/openshift/api/route/...

hack/lib/init.sh

@@ -17,6 +17,7 @@ config/v1 \
 image/v1 \
 network/v1 \
 oauth/v1 \
+operator/v1alpha1 \
 project/v1 \
 quota/v1 \
 route/v1 \
@@ -33,6 +34,7 @@ github.com/openshift/api/config/v1,\
 github.com/openshift/api/image/v1,\
 github.com/openshift/api/network/v1,\
 github.com/openshift/api/oauth/v1,\
+github.com/openshift/api/operator/v1alpha1,\
 github.com/openshift/api/project/v1,\
 github.com/openshift/api/quota/v1,\
 github.com/openshift/api/route/v1,\

hack/update-deepcopy.sh

@@ -10,6 +10,6 @@ verify="${VERIFY:-}"
 ${CODEGEN_PKG}/generate-groups.sh "deepcopy" \
   github.com/openshift/api/generated \
   github.com/openshift/api \
-  "apps:v1 authorization:v1 build:v1 config:v1 image:v1,docker10,dockerpre012 network:v1 oauth:v1 project:v1 quota:v1 route:v1 security:v1 template:v1 user:v1 webconsole:v1" \
+  "apps:v1 authorization:v1 build:v1 config:v1 image:v1,docker10,dockerpre012 network:v1 oauth:v1 operator:v1alpha1 project:v1 quota:v1 route:v1 security:v1 template:v1 user:v1 webconsole:v1" \
   --go-header-file ${SCRIPT_ROOT}/hack/empty.txt \
   ${verify}

operator/v1alpha1/doc.go

@@ -0,0 +1,6 @@
+// +k8s:deepcopy-gen=package,register
+// +k8s:defaulter-gen=TypeMeta
+// +k8s:openapi-gen=true
+
+// +groupName=operator.openshift.io
+package v1alpha1