Skip to content
This repository was archived by the owner on May 28, 2021. It is now read-only.

Commit eb5daf6

Browse files
author
bcurrerb
committed
Fixed formating and test
1 parent e8328a6 commit eb5daf6

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

docs/enterprise-edition-example.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ To be able to pull the MySQL Enterprise Edition from Docker it is necessary to p
2424

2525
>For alternative ways to create Kubernetes secrets 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).
2626
27-
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.
27+
Enter your credentials into the following command and execute it to create a Kubernetes secret that will enable pulling images from the Docker store.
2828
```
2929
kubectl create secret docker-registry myregistrykey \
3030
--docker-server=https://index.docker.io/v1/ \
@@ -35,19 +35,19 @@ kubectl create secret docker-registry myregistrykey \
3535
## 03 - Create your MySQL Cluster
3636
Finally, create your MySQL Cluster with the required specifications entered under `spec:`
3737

38-
- The `repository:` field should be the path to a Docker registry containing the enterprise edition of MySQL. If this is ommited, the default is taken from the MySQL operator field `defaultMysqlServer:` which you can also specify.
39-
- The `imagePullSecrets`: field allows you to specify a list of Kubernetes secret names. These secret(s) should contains your credentials for the Docker registry.
38+
- The `repository:` field should be the path to a Docker registry containing the enterprise edition of MySQL. If this is omitted, the default is taken from the MySQL operator field `defaultMysqlServer:` which you can also specify.
39+
- The `imagePullSecrets`: field allows you to specify a list of Kubernetes secret names. These secret(s) should contain your credentials for the Docker registry.
4040
- The version to be used should be specified, without this, a default version is used which is **not** guaranteed to match an available image of MySQL Enterprise.
4141
- The namespace of the cluster must match the namespace of the RBAC permissions created in step 01.
4242
```
4343
kubectl apply -f examples/cluster/cluster-enterprise-version.yaml
4444
```
4545
### Check that it is running
46-
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.
46+
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.
4747
```
4848
sh hack/mysql.sh <NAMESPACE>/mysql-0
4949
```
5050

5151
><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.
5252
53-
[1]: docs/tutorial.md
53+
[1]: docs/tutorial.md

pkg/options/operator/options_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ func mockMySQLOperatorOpts() MySQLOperatorOpts {
6363
Master: "some-master",
6464
Hostname: "some-hostname",
6565
Images: Images{
66-
MySQLAgentImage: "some-agent-img",
66+
MySQLAgentImage: "some-agent-img",
67+
DefaultMySQLServerImage: "mysql/mysql-server",
6768
},
6869
MinResyncPeriod: v1.Duration{Duration: 42},
6970
}

0 commit comments

Comments
 (0)