whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
Marc Boorshtein
2017-01-17 21:09:41 -05:00
committed by GitHub
parent b192b3ee00 96a07031ea
commit 91ddb6aa08
20 changed files with 381 additions and 489 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/admin/authorization.md
-1
View File
@@ -259,7 +259,6 @@ rules:
- apiGroups: [""] # The API group "" indicates the core API Group.
resources: ["pods"]
verbs: ["get", "watch", "list"]
nonResourceURLs: []
```
`ClusterRoles` hold the same information as a `Role` but can apply to any
docs/admin/salt.md
+1 -1
View File
@@ -6,7 +6,7 @@ title: Configuring Kubernetes with Salt
The Kubernetes cluster can be configured using Salt.
The Salt scripts are shared across multiple hosting providers, so it's important to understand some background information prior to making a modification to ensure your changes do not break hosting Kubernetes across multiple environments. Depending on where you host your Kubernetes cluster, you may be using different operating systems and different networking configurations. As a result, it's important to understand some background information before making Salt changes in order to minimize introducing failures for other hosting providers.
The Salt scripts are shared across multiple hosting providers and depending on where you host your Kubernetes cluster, you may be using different operating systems and different networking configurations. As a result, it's important to understand some background information before making Salt changes in order to minimize introducing failures for other hosting providers.
## Salt cluster setup