From e3a28ead310da3e682e073a7f2a6424a567a89e5 Mon Sep 17 00:00:00 2001 From: Lukas Kucharczyk Date: Fri, 22 Nov 2019 10:11:52 +0100 Subject: [PATCH] Use &mysql; entity more. Revert changing &mysql; to 'MariaDB'. --- xml/cap_admin_backup-restore.xml | 2 +- xml/cap_admin_service_broker.xml | 26 +++++++++++++------------- xml/cap_depl_eks.xml | 2 +- xml/cap_depl_gke.xml | 22 +++++++++++----------- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/xml/cap_admin_backup-restore.xml b/xml/cap_admin_backup-restore.xml index c9a8734c..a7622504 100644 --- a/xml/cap_admin_backup-restore.xml +++ b/xml/cap_admin_backup-restore.xml @@ -671,7 +671,7 @@ defined on the source cluster. This value is defined in /var/vcap/jobs/cloud_controller_ng/config/cloud_controller_ng.yml of the api-group-0 pod and also found in various - tables of the MySQL database. + tables of the &mysql; database. Begin by examining the configuration file for diff --git a/xml/cap_admin_service_broker.xml b/xml/cap_admin_service_broker.xml index e276153b..c8d0ef7a 100644 --- a/xml/cap_admin_service_broker.xml +++ b/xml/cap_admin_service_broker.xml @@ -85,7 +85,7 @@ Prerequisites - The following examples demonstrate how to deploy service brokers for MySQL + The following examples demonstrate how to deploy service brokers for &mysql; and &postgresql; with &helm;, using charts from the &suse; repository. You must have the following prerequisites: @@ -107,7 +107,7 @@ - An external &mariadb; or &postgresql; installation with account credentials that + An external &mysql; or &postgresql; installation with account credentials that allow creating and deleting databases and users. @@ -162,7 +162,7 @@ - Configuring the MySQL Deployment + Configuring the &mysql; Deployment Start by extracting the uaa namespace secrets name, and @@ -241,10 +241,10 @@ kube: password: "" - Deploying the MySQL Chart + Deploying the &mysql; Chart - &productname; includes charts for &mariadb; and &postgresql; (see + &productname; includes charts for &mysql; and &postgresql; (see for information on managing your &helm; repository): @@ -252,13 +252,13 @@ kube: &helm-search-suse; - Create a namespace for your MySQL sidecar: + Create a namespace for your &mysql; sidecar: &prompt.user;kubectl create namespace mysql-sidecar - Install the MySQL Helm chart: + Install the &mysql; Helm chart: &prompt.user;helm install suse/cf-usb-sidecar-mysql \ @@ -283,11 +283,11 @@ kube: &prompt.user;cf marketplace - MySQL Requires <literal>mysql_native_password</literal> + &mysql; Requires <literal>mysql_native_password</literal> - The MySQL sidecar works only with deployments that use + The &mysql; sidecar works only with deployments that use mysql_native_password as their authentication plugin. - This is the default for MySQL versions 8.0.3 and earlier, but later + This is the default for &mysql; versions 8.0.3 and earlier, but later versions must be started with --default-auth=mysql_native_password before any user creation. (See @@ -296,7 +296,7 @@ kube: - Create and Bind a MySQL Service + Create and Bind a &mysql; Service To create a new service instance, use the &cf; command line client: @@ -319,7 +319,7 @@ kube: Deploying the &postgresql; Chart - The &postgresql; configuration is slightly different from the MySQL + The &postgresql; configuration is slightly different from the &mysql; configuration. The database-specific keys are named differently, and it requires the SERVICE_POSTGRESQL_SSLMODE key. @@ -384,7 +384,7 @@ kube: --wait - Then follow the same steps as for the MySQL chart. + Then follow the same steps as for the &mysql; chart. diff --git a/xml/cap_depl_eks.xml b/xml/cap_depl_eks.xml index 9fb621b5..9ca892cb 100644 --- a/xml/cap_depl_eks.xml +++ b/xml/cap_depl_eks.xml @@ -740,7 +740,7 @@ suse https://kubernetes-charts.suse.com/ - Create a service instance. As an example, a custom MySQL instance can be + Create a service instance. As an example, a custom &mysql; instance can be created as: &prompt.user;cf create-service rdsmysql custom mysql-instance-name -c '{ diff --git a/xml/cap_depl_gke.xml b/xml/cap_depl_gke.xml index 4ab4937c..5e8de16a 100644 --- a/xml/cap_depl_gke.xml +++ b/xml/cap_depl_gke.xml @@ -783,7 +783,7 @@ tcp-router-tcp-router-public LoadBalancer 10.23.241.17 35.197 The GCP Service Broker requires a database to store information about the - resources it provisions. Any database that adheres to the MySQL protocol + resources it provisions. Any database that adheres to the &mysql; protocol may be used, but it is recommended to use a GCP Cloud SQL instance, as outlined in the following steps. @@ -806,13 +806,13 @@ tcp-router-tcp-router-public LoadBalancer 10.23.241.17 35.197 - Click Choose MySQL to select MySQL as the database + Click Choose &mysql; to select &mysql; as the database engine. - In the Instance ID field, enter an identifier for MySQL + In the Instance ID field, enter an identifier for &mysql; instance. @@ -848,13 +848,13 @@ tcp-router-tcp-router-public LoadBalancer 10.23.241.17 35.197 - Click Create and wait for the MySQL instance to finish + Click Create and wait for the &mysql; instance to finish creating. - After the MySQL instance is finished creating, connect to it using either + After the &mysql; instance is finished creating, connect to it using either the Cloud Shell or the mysql command line client. @@ -865,7 +865,7 @@ tcp-router-tcp-router-public LoadBalancer 10.23.241.17 35.197 - Click on the instance ID of the MySQL instance. + Click on the instance ID of the &mysql; instance. @@ -879,7 +879,7 @@ tcp-router-tcp-router-public LoadBalancer 10.23.241.17 35.197 After the shell is opened, the gcloud sql connect command is displayed. Press Enter to connect to the - MySQL instance as the root user. + &mysql; instance as the root user. @@ -897,7 +897,7 @@ tcp-router-tcp-router-public LoadBalancer 10.23.241.17 35.197 - Click on the instance ID of the MySQL instance. + Click on the instance ID of the &mysql; instance. @@ -926,7 +926,7 @@ tcp-router-tcp-router-public LoadBalancer 10.23.241.17 35.197 - After connecting to the MySQL instance, run the following commands to + After connecting to the &mysql; instance, run the following commands to create an initial user. The service broker will use this user to connect to the service broker database. @@ -1126,14 +1126,14 @@ applications: Enable access to a service. This example enables access to the Google - CloudSQL MySQL service (see + CloudSQL &mysql; service (see ). &prompt.user;cf enable-service-access google-cloudsql-mysql - Create an instance of the Google CloudSQL MySQL service. This example uses + Create an instance of the Google CloudSQL &mysql; service. This example uses the mysql-db-f1-micro plan. Use the -c flag to pass optional parameters when provisioning a service. See for the parameters that can be set for each service.