update deployment plan and add makefile

Author: timjohncurtis

.gitignore

@@ -81,3 +81,7 @@ kubeconfig.yaml
 ./deployment.yaml
 ./tarantool-operator
 helm_values.yaml
+deploy/*
+
+ci/helm-chart/templates/crds/tarantool.io_*s_crd.yaml
+ci/helm-chart/templates/crds/tarantool_*_cr.yaml

Makefile

@@ -0,0 +1,6 @@
+docker:
+	docker build -f build/Dockerfile -t tarantool-operator .
+
+crds:
+	operator-sdk generate crds
+	cp -r deploy/* ./ci/helm-chart/templates/

README.md

@@ -233,15 +233,24 @@ Tarantool Operator is up and running.
 
     This will add one more replica to each Storages Role replica set. View the new cluster topology via the cluster web UI.
 
+## Development
+
+### Regenerate the Custom Resource Definitions
+
+```shell
+make crds
+```
+
 ### Building tarantool-operator docker image
 
 ```shell
-docker build -f build/Dockerfile -t tarantool-operator .
+make docker
 ```
 
 ### Running tests
 
 ```shell
+# In the examples/kv directory
 make build
 make start
 ./bootstrap.sh

ci/helm-chart/.helmignore

@@ -21,3 +21,9 @@
 .idea/
 *.tmproj
 .vscode/
+# ignore the custom resource examples
+templates/crds/tarantool_*cr.yaml
+# Ignore plural definitions, not required
+templates/crds/tarantool.io_replicasettemplates_crd.yaml
+templates/crds/tarantool.io_roles_crd.yaml
+templates/crds/tarantool.io_clusters_crd.yaml

ci/helm-chart/templates/crds/tarantool_v1alpha1_replicasettemplate_crd.yaml

@@ -1,4 +1,3 @@
----
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
@@ -39,4 +38,3 @@ spec:
     - name: v1alpha1
       served: true
       storage: true
----

ci/helm-chart/templates/crds/tarantool_v1alpha1_role_crd.yaml

@@ -1,4 +1,3 @@
----
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
@@ -77,4 +76,3 @@ spec:
     - name: v1alpha1
       served: true
       storage: true
----

ci/helm-chart/templates/role.yaml

@@ -1,10 +1,8 @@
----
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   creationTimestamp: null
   name: tarantool-operator
-  namespace: {{ .Values.namespace }}
 rules:
 - apiGroups:
   - ""
@@ -52,4 +50,3 @@ rules:
   - replicasettemplates
   verbs:
   - '*'
----

ci/helm-chart/templates/role_binding.yaml

@@ -1,14 +1,11 @@
----
 kind: RoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: tarantool-operator
-  namespace: {{ .Values.namespace }}
 subjects:
 - kind: ServiceAccount
   name: tarantool-operator
 roleRef:
   kind: Role
   name: tarantool-operator
   apiGroup: rbac.authorization.k8s.io
----

ci/helm-chart/templates/service_account.yaml

@@ -1,7 +1,4 @@
----
 apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: tarantool-operator
-  namespace: {{ .Values.namespace }}
----