From 68984d18bd865beac99a1216caa50352907deb99 Mon Sep 17 00:00:00 2001 From: David Nuzik Date: Fri, 13 Dec 2019 11:00:22 -0700 Subject: [PATCH 1/2] Remove date from main _index.md page - Most contributors won't know to always update this date - If we actually want to keep this date (which is rendered on the website) we need to ensure all contributors always update the date... --- content/k3s/latest/en/_index.md | 1 - 1 file changed, 1 deletion(-) diff --git a/content/k3s/latest/en/_index.md b/content/k3s/latest/en/_index.md index 85d522e5e37..ede2b86a14d 100644 --- a/content/k3s/latest/en/_index.md +++ b/content/k3s/latest/en/_index.md @@ -1,7 +1,6 @@ --- title: "K3s - 5 less than K8s" shortTitle: K3s -date: 2019-02-05T09:52:46-07:00 name: "menu" --- From ef0adce4783446a07800ba300cc5c9678e5db9d3 Mon Sep 17 00:00:00 2001 From: David Nuzik Date: Fri, 13 Dec 2019 11:07:42 -0700 Subject: [PATCH 2/2] Remove "k3s-db" and replace with "k3s" for dbname - PostgreSQL/MySQL already have links to docs for DSN that users could reference to escape special chars - Make suggested command work out of the box (won't run into an issue with unescaped dash in db name any more) --- content/k3s/latest/en/installation/datastore/_index.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/k3s/latest/en/installation/datastore/_index.md b/content/k3s/latest/en/installation/datastore/_index.md index 6e5ac992ab3..7d5c2775871 100644 --- a/content/k3s/latest/en/installation/datastore/_index.md +++ b/content/k3s/latest/en/installation/datastore/_index.md @@ -80,14 +80,14 @@ The above assumes a typical three node etcd cluster. The parameter can accept on {{% /tab %}} {{% /tabs %}} -
Based on the above, the following example command could be used to launch a server instance that connects to a PostgresSQL database named k3s-db: +
Based on the above, the following example command could be used to launch a server instance that connects to a PostgresSQL database named k3s: ``` -K3S_DATASTORE_ENDPOINT='postgres://username:password@hostname:5432/k3s-db' k3s server +K3S_DATASTORE_ENDPOINT='postgres://username:password@hostname:5432/k3s' k3s server ``` And the following example could be used to connect to a MySQL database using client certificate authentication: ``` -K3S_DATASTORE_ENDPOINT='mysql://username:password@tcp(hostname:3306)/k3s-db' \ +K3S_DATASTORE_ENDPOINT='mysql://username:password@tcp(hostname:3306)/k3s' \ K3S_DATASTORE_CERTFILE='/path/to/client.crt' \ K3S_DATASTORE_KEYFILE='/path/to/client.key' \ k3s server