Commit Graph

3671 Commits

Author SHA1 Message Date
Catherine Luse cbdff7ca2b Merge pull request #2497 from valo/patch-1
Fix a leftover from a merge conflict in the docs
2020-05-06 12:32:49 -07:00
Valentin Mihov bf9867e747 Fix a leftover from a merge conflict in the docs
Seems like there was an unresolved merge conflict, which was left in the docs.
2020-05-06 22:24:16 +03:00
David Nuzik daff9997ae Merge pull request #2494 from davidnuzik/channel-server2
[K3s] Modify About Channel Server section > Release Channels
2020-05-05 19:40:35 -07:00
David Nuzik 3c50fd9a77 Modify About Channel Server section > Release Channels
- Addresses Craig's comment outlined here https://github.com/rancher/docs/pull/2488/files#r420489320
- This tweaks the /upgrades/basic and /upgrades/automate pages. The basic page now goes into more depth about the release channels -- outlining specific examples. The automated page now calls out a link directly to this section on the /basic page instead of linking to the channelserver github project.
- I called out in the "v1.18" example that this selects the LATEST in the specific minor release. This does not select stable (I don't want people to confuse that with a stable channel).
- Minor spelling fix
2020-05-05 18:33:17 -07:00
Catherine Luse cb3ed34523 Merge pull request #2491 from catherineluse/master
Fix outdated information about K3s
2020-05-05 14:32:24 -07:00
Catherine Luse dfd8097214 Fix outdated information about K3s 2020-05-05 14:31:00 -07:00
Catherine Luse 8b67a15357 Merge pull request #2490 from rancher/Tejeev-patch-12
Added note for port 9796 for metrics
2020-05-05 13:33:53 -07:00
Catherine Luse 1f2341fef2 Merge pull request #2488 from davidnuzik/channel-server
[K3s] Update docs to mention channel server for installs and upgrades
2020-05-05 10:21:00 -07:00
Tejeev c2d2357cff Added note for port 9796 for metrics 2020-05-05 12:10:57 +01:00
David Nuzik 8aac392664 Update automated upgrades to mention channel server stable URL
- Updates upgrades/automated so that the section that mentions channels for the YAML now mentions the channel server stable URL.
2020-05-04 16:46:43 -07:00
David Nuzik 25d346a73d Update upgrade basics to mention channel server
- Updates /upgrades/basic so that we now briefly describe what the channel server is and how to upgrade with the script
2020-05-04 16:26:18 -07:00
Catherine Luse 51ef0d52b2 Merge pull request #2487 from rancher/cert-manager-doc-update
Update helm2 upgrade doc for cert-manager v0.12
2020-05-04 14:17:45 -07:00
Catherine Luse edca7d87cc Merge pull request #2486 from rancher/ryanelliottsmith-patch-1
Update Okta authentication docs
2020-05-04 14:12:23 -07:00
David Nuzik fd3ce0b299 Update install-options to include channel options
- Updates to include these channel server options
- Updates to add in INSTALL_K3S_SKIP_ENABLE env var
2020-05-04 13:53:12 -07:00
Ryan Elliott-Smith 74db4a3513 Update doc for cert-manager v0.12 2020-05-04 12:33:11 +12:00
Ryan Elliott-Smith 0311856d1e Update Okta authentication docs 2020-05-03 11:08:53 +12:00
Catherine Luse 2566fddee3 Merge pull request #2485 from catherineluse/privateCA
Add separate examples for Rancher Helm install with privateCA
2020-05-01 14:15:52 -07:00
Catherine Luse 960a0938ba Add separate examples for Rancher Helm install with privateCA 2020-05-01 13:31:16 -07:00
Catherine Luse 7bf0696cd5 Fix link to OpenLDAP config reference 2020-05-01 11:27:25 -07:00
Catherine Luse b0abaae288 Fix link to custom cluster page 2020-04-30 15:47:29 -07:00
Catherine Luse 23e666e6cb Merge pull request #2479 from rancher/dependabot/npm_and_yarn/jquery-3.5.0
Bump jquery from 3.4.0 to 3.5.0
2020-04-30 14:44:03 -07:00
dependabot[bot] 9ac0032dcb Bump jquery from 3.4.0 to 3.5.0
Bumps [jquery](https://github.com/jquery/jquery) from 3.4.0 to 3.5.0.
- [Release notes](https://github.com/jquery/jquery/releases)
- [Commits](https://github.com/jquery/jquery/compare/3.4.0...3.5.0)

Signed-off-by: dependabot[bot] <support@github.com>
2020-04-30 07:28:22 +00:00
Catherine Luse b367bd3875 Merge pull request #2478 from cbron/desired-asg
Change ASG min/max to just desired
2020-04-29 16:50:23 -07:00
Caleb Bron 22a77126db Change ASG min/max to just desired 2020-04-29 16:28:59 -07:00
Catherine Luse 2831296b23 Fix formatting of JSON snippet 2020-04-28 15:53:59 -07:00
Catherine Luse 4241ecf07c Merge pull request #2474 from catherineluse/master
Simplify example for skipping CIS scan tests
2020-04-28 11:44:56 -07:00
Catherine Luse 7cbf79a44e Simplify example for skipping CIS scan tests 2020-04-28 11:39:18 -07:00
Catherine Luse 1183782dc1 Merge pull request #2473 from wilsonge/patch-1
Remove sample code related to helm v2
2020-04-28 11:37:35 -07:00
George Wilson a305c94f04 Remove sample code related to helm v2 2020-04-28 18:38:46 +01:00
Catherine Luse 40a62d8037 Fix link 2020-04-27 14:55:34 -07:00
Catherine Luse 86b2149713 Add Shibboleth to auth service table 2020-04-23 05:58:23 -07:00
Catherine Luse 6f33c08952 Edit cloning clusters page 2020-04-22 15:10:32 -07:00
Catherine Luse 2a5b4ba9ff Say that all clusters but imported can be cloned 2020-04-22 15:07:35 -07:00
Catherine Luse 91b32b06df Say that RKE clusters and managed K8s clusters can be cloned 2020-04-22 15:02:17 -07:00
Catherine Luse beb331e69f Merge pull request #2466 from catherineluse/master
Clarify AWS quickstart prerequisites
2020-04-22 12:00:24 -07:00
Catherine Luse 41253d421e Merge pull request #2468 from rancher/janeczku-k3s-kubeconfig
Clarify configuration of the kubeconfig path
2020-04-22 11:26:22 -07:00
Jan B d20448ee6c Clarify configuration of the kubeconfig path 2020-04-22 17:57:43 +02:00
Catherine Luse 89a281f945 Merge pull request #2467 from rancher/add-hostpath-volume-info
Add requirements for hostPath volumes
2020-04-21 15:15:50 -07:00
Ryan Elliott-Smith 0b3fdfdef7 Update _index.md 2020-04-22 10:11:40 +12:00
Catherine Luse e52236509a Clarify AWS quickstart prerequisites 2020-04-21 13:56:23 -07:00
Catherine Luse 0fc714ee3f Merge pull request #2464 from rancher/revert-2399-add_scw_ips_doc
Revert "Docs for scaleway IPs in dynamic IP options"
2020-04-20 09:42:00 -07:00
Catherine Luse 96e4795a1d Revert "Docs for scaleway IPs in dynamic IP options" 2020-04-20 09:41:33 -07:00
Catherine Luse 24fc2de5cd Merge pull request #2184 from ynott/patch-2
[k3s] Fix plugin config filename mismatch.
2020-04-20 09:38:28 -07:00
Catherine Luse 883742f397 Merge pull request #2399 from Sh4d1/add_scw_ips_doc
Docs for scaleway IPs in dynamic IP options
2020-04-20 09:35:56 -07:00
Catherine Luse fb4b927f42 Merge pull request #2451 from superseb/remove_directory_auditlog
Add audit log to directories to be cleaned
2020-04-20 09:09:55 -07:00
Catherine Luse 7c5226d1bb Merge pull request #2455 from rancher/Tejeev-patch-10
Removed duplicate + fixed grammar and link
2020-04-20 09:09:22 -07:00
Catherine Luse 3cc2d28fac Remove slash 2020-04-20 09:09:13 -07:00
Catherine Luse 62dcc19b89 Merge pull request #2450 from superseb/rke_audit_config
Update audit log defaults
2020-04-20 09:08:20 -07:00
Catherine Luse 3a9aa4fa5c Merge pull request #2457 from brendarearden/helm3_info
Add info about helm 3
2020-04-20 09:06:40 -07:00
Catherine Luse a1c7c90a12 Minor edits 2020-04-20 09:06:29 -07:00