Moved custom mysql server image from operator spec to cluster spec

Author: bcurrerb

docs/development.md

@@ -20,6 +20,10 @@ in the format of `$USER-TIMESTAMP`. This will need to be remembered as this is
 needed for a latter step or can be exported as the `$MYSQL_AGENT_VERSION`
 envrionment variable.
 
+```bash
+$ export MYSQL_AGENT_VERSION=$(cat dist/version.txt)
+```
+
 ## Create a namespace
 
 Create the namespace that the operator will reside in. By default this is
@@ -38,11 +42,13 @@ ServiceAccounts, ClusterRoles, and ClusterRoleBindings for the operator to
 function.
 
 ```bash
-$ kubectl -n $USER apply \
-    -f contrib/manifests/custom-resource-definitions.yaml \
-    -f contrib/manifests/rbac.yaml
-$ sed -e "s/<NAMESPACE>/${USER}/g" \
-    contrib/manifests/role-binding-template.yaml | kubectl -n $USER apply -f -
+$ kubectl -n $USER apply -f contrib/manifests/custom-resource-definitions.yaml 
+```
+```bash
+$ sed -e "s/<NAMESPACE>/${USER}/g" contrib/manifests/rbac.yaml | kubectl -n $USER apply -f -
+```
+```bash
+$ sed -e "s/<NAMESPACE>/${USER}/g" contrib/manifests/role-binding-template.yaml | kubectl -n $USER apply -f -
 ```
 
 ### Run the MySQL Operator
@@ -54,9 +60,6 @@ development purposes.
 $ make run-dev
 ```
 
-If you did not set an envrionment variable previously, prefix this command with
-`MYSQL_AGENT_VERSION=` followed by the $USER-TIMESTAMP fortmatted version.
-
 ## Creating an InnoDB cluster
 
 For the purpose of this document, we will create a cluster with 3 members with

docs/enterprise-edition-example.md

@@ -2,61 +2,53 @@
 This tutorial will explain how to create a mysqlcluster that runs the enterprise version of mysql.
 
 ## Prerequisites
-- A Kubernetes Cluster running on Kubernetes 1.7.0+.
+
 - The mysql-operator repository checked out locally.
 - Access to a Docker registry that contains the enterprise version of mysql.
 
-## Create the Operator
-This file bundles the creation of various resources:
+## 01 - Create the Operator
+You will need to create the following:
 
 1. Custom resources 
 2. RBAC configuration <sup>*</sup>
 3. The Operator 
-4. The Agent
+4. The Agent ServiceAccount & RoleBinding
 
-Section 3 of the file pulls the sql enterprise image from the docker store: `store/oracle/mysql-enterprise-server`. If you wish to pull the image from somewhere else you will need to swap out this address.
-```
-kubectl apply -f examples/example-enterprise-deployment.yaml
-```
+The creation of these resources can be achieved by following the [introductory tutorial][1]; return here before creating a MySQL Cluster.
 
-## Create a secret with registry credentials
+## 02 - Create a secret with registry credentials
 To be able to pull the mysql enterprise edition from docker it is necessary to provide credentials, these credentials must be supplied in the form of a Kubernetes secret.
 
-- The name of the secret `myregistrykey` must match the name in the `imagepullsecrets` which is found in Section 3 of the `example-enterprise-deployment.yaml`.
-- The secret must be created in the same namespace as the mysqlcluster which we will make in the next step.
+- The name of the secret `myregistrykey` must match the name in the `imagepullsecrets` which we will specify in the cluster config in step 03.
+- The secret must be created in the same namespace as the MySQL Cluster which we will make in step 03. It must also be in the same namespace as the RBAC permissions created in step 01.
 - If you are pulling the mysql enterprise image from a different registry then the secret must contain the relevant credentials for that registry.
 
 >For alternative ways to create Kubernetes secretes see their documentation on [creating secrets from docker configs](https://kubernetes.io/docs/concepts/containers/images/#specifying-imagepullsecrets-on-a-pod) or [creating secrets manually](https://kubernetes.io/docs/concepts/containers/images/#creating-a-secret-with-a-docker-config).
 
-Enter your credentials into the following command and execute it to create a Kubernetes secret that will enable pulling images from the Docker store.
+Enter your credentials into the following command and execute it to create a Kubernetes secret that will enable pulling images from the Docker store. add  the `-n` flag to specify a namespace if you do not want to use the default namespace. 
 ```
 kubectl create secret docker-registry myregistrykey \
 --docker-server=https://index.docker.io/v1/ \
 --docker-username= \
 --docker-password= \
 --docker-email=
 ```
-## Create your mysqlcluster
-Finally, create the mysqlcluster. 
+## 03 - Create your MySQL Cluster
+Finally, create your MySQL Cluster with the required specifications entered under `spec:` 
 
-- The version to be used has been specified in the file. Without this a default version is used which is **not** guaranteed to match an available image of mysql enterprise.
-- The lowest version supported by the mysql operator is **8.0.11**
-- The namespace of the cluster  must match the namespace of the secret we created in the previous step. This file omits namespace in the metadata so the cluster will be created in the default namespace.
+- The mysqlServer field should be the path to a registry containing the enterprise edition of MySQL.
+- The imagePullSecret: name: Should be the name of a Kubernetes secret in the same namespace that contains your credentials for the docker registry.
+- The version to be used must be specified, without this, a default version is used which is **not** guaranteed to match an available image of MySQL Enterprise.
+- The namespace of the cluster  must match the namespace of the secret we created in step 02.
 ```
-kubectl apply -f examples/cluster/cluster-with-3-members-enterprise-version.yaml
+kubectl apply -f examples/cluster/cluster-enterprise-version.yaml
 ```
-You can now run the following command to see the newly created mysql cluster
+### Check that it is running
+You can now run the following command to access the sql prompt in your MySQL Cluster, just replace `<NAMESPACE>` with the namespace you created your cluster in.
 ```
-kubectl describe mysqlcluster mysql
+sh hack/mysql.sh <NAMESPACE>/mysql-0
 ```
 
-## Clean up
-
-To remove the mysqlcluster and each of the components created in this tutorial, execute the following:
-```
-kubectl delete -f examples/cluster/cluster-with-3-members-enterprise-version.yaml
-kubectl delete secret myregistrykey
-kubectl delete -f examples/example-enterprise-deployment.yaml 
-```
+><sup>*</sup>If you run into issues when creating RBAC roles see [Access controls](https://docs.cloud.oracle.com/iaas/Content/ContEng/Concepts/contengabouta]ccesscontrol.htm?) for more information.
 
-><sup>*</sup>If you run into issues when creating RBAC roles see [Access controls](https://docs.cloud.oracle.com/iaas/Content/ContEng/Concepts/contengabouta]ccesscontrol.htm?) for more information.
+[1]: docs/tutorial.md

examples/cluster/cluster-enterprise-version.yaml

@@ -0,0 +1,10 @@
+apiVersion: mysql.oracle.com/v1alpha1
+kind: Cluster
+metadata:
+  name: mysql
+  namespace: default
+spec:
+  version: "8.0.11"
+  mysqlServer: store/oracle/mysql-enterprise-server
+  imagePullSecret: 
+    name: myregistrykey