Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removing merge conflicts for branch dev1.15 #14940

Merged
merged 629 commits into from
Jun 17, 2019
Merged
Changes from 1 commit
Commits
Show all changes
629 commits
Select commit Hold shift + click to select a range
30b1b98
Fix typo (#14299)
sftim May 13, 2019
88f3268
Correct publish date for blog post (#14302)
craigbox May 13, 2019
6aa3beb
Update pick-right-solution.md (#14305)
May 14, 2019
93e1a67
Fixes for https://kubernetes.io/docs/tasks/administer-cluster/cluster…
sftim May 14, 2019
ebf65c1
Created nl.toml (#14131)
olku May 14, 2019
dfa2698
Improve Kubernetes-setup-using-Ansible-and-Vagrant (#13999)
halfcrazy May 14, 2019
3099d9d
Add New Contributor Workshops blog post. (#14315)
May 14, 2019
5cb3942
Add Indonesian Translation for names (#14320)
iputra May 15, 2019
4bb98f7
changed the formatting of example-ingress.yaml (#14333)
Vageesha17 May 15, 2019
0693952
add links to individual readme files (#14324)
kbhawkey May 15, 2019
caca9c6
Add co-chair role (#14219)
zacharysarah May 16, 2019
38fcbeb
updated the links of cherrypick guide (#14348)
idealhack May 16, 2019
b63bbe3
Update deployment.md (#14345)
May 16, 2019
da9d0da
Fix code block (#14334)
FranklinYu May 16, 2019
22db0bb
Add links to the external cloud-provider repos (#14335)
mdaniel May 16, 2019
5f5883a
List & watch can be authorized on named resources (#14339)
tallclair May 16, 2019
21b7d12
Fix sentence format (#14311)
mittalyashu May 16, 2019
51e71ed
Add cla page (#14363)
andreugallofre May 16, 2019
e77fa91
Move Karbon to on-premisses (#14269)
Maaryaams May 16, 2019
e676622
Declare IPVS-based kube-proxy GA (#14263)
renan May 16, 2019
7aad953
en/glossary: use title for all Pod occurrences (#14366)
ifraixedes May 16, 2019
4ff9663
kubectl should also be held by apt-mark (#14250)
silenceshell May 16, 2019
39c3774
Update create-cluster-kubeadm.md (#13801)
May 16, 2019
60006e9
fix runasgroup psp policy (#14121)
krmayankk May 16, 2019
ac65ac4
YAML code-block within a list bug fixed (#14293) (#14295)
pilosus May 17, 2019
c1a2c4f
Localisation of the architecture section (#14145)
glo-pena May 18, 2019
df4ef9b
Initialize Network Policy in Bahasa Indonesia. (#14287)
irvifa May 18, 2019
e2f8ae0
Fixing the output of jsonpath (#14387)
findneville May 20, 2019
bacd21d
Correcting sequence of tasks for manage cluster daemon (#14383)
rajeshdeshpande02 May 20, 2019
2029b9b
Updated DaemonSet page to include SignalFx Agent. (#14385)
May 20, 2019
110f5e1
move obj mgmt files to tasks (#14374)
kbhawkey May 20, 2019
f7fc6ce
Fixing grammatical error (#14389)
AshishThakur May 20, 2019
ea7af96
Correcting example to avoid ambiguity (#14354)
rajeshdeshpande02 May 20, 2019
6930b21
Changed the redisslave version from v1 to v3. (#14276)
rajvaibhavdubey May 20, 2019
d21ffb4
Refractor _index.md (#14163)
Rajakavitha1 May 20, 2019
a7e4e00
Updated Linux Academy courses (#14303)
Chazzledazzle1 May 20, 2019
d135d56
Correcting minikube quickstart steps (#14355)
rajeshdeshpande02 May 20, 2019
3c7cae7
Create blog post draft (#14384)
May 20, 2019
3a44233
Edits for clarity (#14423)
zacharysarah May 21, 2019
0d471c4
pick-right-solution.md (#14434)
mkhaas May 21, 2019
6be8640
Fix link (#14438)
May 21, 2019
7aed682
removed the junk character (#14430)
May 21, 2019
9e966b2
Switch to long command option (#14422)
abuango May 21, 2019
be35043
fix links to tool install (#14418)
kbhawkey May 21, 2019
55ace3b
Remove extra '**' (#14413)
41tair May 21, 2019
8ab64f7
Updated links to vendor specific implementions (#14400)
May 21, 2019
6c3d270
document pod downwardAPI fieldRef & resourceFiledRef values (#14321)
yuchengwu May 21, 2019
e0873fe
Add containerd and CRI-O to glossary (#14309)
sftim May 21, 2019
702a4fd
Use relevant glossary definitions (#14414)
sftim May 21, 2019
85ab4a4
Link upgrade to skewed version page (#14421)
alex-slynko May 21, 2019
18367fe
Describe language specific style guide in l10n guide (#14437)
gochist May 21, 2019
a98753c
Flag --export has been deprecated (#14432)
gwind May 21, 2019
625bf36
setup page replaces picking the right solutions (#14442)
Rajakavitha1 May 21, 2019
5c89ab7
Update i18n/ja.toml (#13666)
cstoku May 21, 2019
7f888c1
Pod yaml command and change pod curl (#14448)
sethmccombs May 21, 2019
00b8aea
Translate "Pod Preset" page to Bahasa Indonesia (#14394)
antoooks May 22, 2019
78be343
Add a Korean l10n reviewer to OWNERS_ALIASES (#14460)
seokho-son May 22, 2019
4ca230d
Add content/en/docs/reference/glossary/certificate.md (#14371)
ignasi35 May 22, 2019
4aa0fda
Update apiVersion on example-ingress to extensions/v1beta1 (#14449)
thecrudge May 22, 2019
866b99c
Fix link in "Customizing DNS Service" docs (#14455)
prankul88 May 22, 2019
bbf3a97
Second Japanese l10n work for release-1.13 (#14465)
cstoku May 22, 2019
785412c
cleanup component install to use new catalog feature (#14063)
zehicle May 22, 2019
3f02b89
Fix dangling "pick-right-solution" references - English (#14468)
May 23, 2019
3be372b
Add blog post about Kyma from CNCF landscape (#14266)
derberg May 23, 2019
0144a82
Fix typo "feedbacks" (#14505)
q-ode May 24, 2019
c66db29
update link to front matter description (#14493)
kbhawkey May 24, 2019
03e840d
Fix dead links related to Kubernetes object management (#14481)
Steven0351 May 24, 2019
d30a74f
Translate Disruptions docs to Indonesian (#14395)
phanama May 24, 2019
8279c43
Initialize Taints and Tolerations in Bahasa Indonesia. (#14405)
irvifa May 24, 2019
de38a3b
Choisir la bonne solution link updated! (#14483)
hh May 24, 2019
3d39002
Update kubecon buttons on homepage (#14521)
alexcontini May 25, 2019
1077a76
Update cluster-administration-overview.md (#14510)
zhangqx2010 May 25, 2019
a7209fa
Update overview.md (#14424)
jogspokoen May 25, 2019
22f2106
Add content/es/docs/reference/glossary/job.md (#14359)
krlooss May 25, 2019
060cb63
Add content/es/docs/reference/glossary/rkt.md (#14365)
ifraixedes May 25, 2019
afcc69c
Add translations for Imperative Command for Bahasa Indonesia (#14064)
qbl May 25, 2019
4229462
Update URL in k8s.io/docs/tasks/federation/administer-federation/clus…
prankul88 May 26, 2019
473e15d
Add /content/fr/docs/reference/_index.md (#14528)
daverick May 26, 2019
1213d41
Update install-minikube.md (#14542)
May 27, 2019
81dd45f
Tidy & reword “Configure a Pod to Use a Projected Volume for Storage”…
sftim May 27, 2019
1078044
Fix HTML typo (#14527)
sftim May 27, 2019
4f60e86
Add content/fr/docs/tutorials/_index.md (#14529)
daverick May 27, 2019
bbc3061
fix kubernetes certified logo url (#14511)
May 27, 2019
c9bb6aa
Add more language specific slack channels (#14506)
lentzi90 May 27, 2019
e40697c
Add spanish translation for node (#14360)
paudirac May 27, 2019
c16f82b
Add container-environment-varibales concepts page (#14378)
andreugallofre May 27, 2019
7841f8b
Add content/es/docs/reference/glossary/cluster.md (#14472)
paudirac May 27, 2019
b19c549
Fourth Korean localization work for release-1.14 (#14578)
gochist May 28, 2019
5656da5
Updating blog OWNERS (#14338)
kbarnard10 May 28, 2019
16f557f
Fix content/es/docs/setup/_index.md (#14491)
jrab66 May 28, 2019
dd22f47
Add annotation page (#14358)
May 28, 2019
a845f40
Add content/es/docs/reference/glossary/sysctl.md (#14390)
jluis May 28, 2019
54b4a1f
fix link to aws.go (#14550)
santhosh-tekuri May 29, 2019
23e8eaf
Use shortcode for note in Kops glossary entry (#14534)
sftim May 29, 2019
f38c907
Delete resources created during this task (#14536)
oussemos May 29, 2019
5c9a9b1
[WIP] Clean up and reorganize minikube.md (#14255)
shavidissa May 29, 2019
8bf1393
docs-fr | tutorials | create-cluster (#14584)
rekcah78 May 29, 2019
9c8845c
Update kubecon buttons on homepage fr (#14587)
rekcah78 May 29, 2019
da76416
Fix OpenAPI deprecated endpoints in Kubernetes 1.14 (#14608)
aerialls May 30, 2019
b2d7cc5
Reword glossary entry for etcd (#14621)
sftim May 30, 2019
92760f8
Update code of conduct based on upstream changes (#14612)
sftim May 30, 2019
8e54184
Use `runtime/default` for seccomp. (#14616)
May 30, 2019
424045f
Corrected documentation for kubectl tab completion on Mac (#14617)
May 30, 2019
b40144e
Fix reference to features state to beta (#14618)
craiglpeters May 30, 2019
39bdcc0
Update the pull Request template wording (#14619)
rugwirobaker May 30, 2019
5913160
Update config option for openstack block storage (#14603)
adisky May 30, 2019
a55e66f
Remove initializers feature gate (#14602)
May 30, 2019
2efe4d5
fix link to Storage Classes doc (#14551)
tjanson May 30, 2019
7df7a2e
correct the Feature:PodPriority in feature-gates.md (#14547)
mysunshine92 May 30, 2019
0180769
Remove initializers (ja) (#14626)
May 30, 2019
c116795
Update content/es/_index.html with new links (#14589)
javisabalete May 30, 2019
ebce625
Add content/es/docs/reference/glossary/service.md (#14361)
daverick May 30, 2019
c4c4cc6
Add content/es/docs/reference/glossary/application-developer.md (#14372)
ignasi35 May 30, 2019
0461eaa
Add content/es/docs/reference/glossary/image.md (#14364)
javisabalete May 30, 2019
3d8b015
Add content/es/docs/reference/glossary/application-architect.md (#14373)
ignasi35 May 30, 2019
2fcdd4d
Add content/es/docs/reference/glossary/secret.md (#14356)
ignasi35 May 30, 2019
f8ccf4d
Add translations for Imperative Config for Bahasa Indonesia (#14530)
qbl May 30, 2019
5ece295
Add content/es/docs/reference/glossary/pod.md (#14368)
May 30, 2019
49e18cd
Fix typo (#14592)
sftim May 30, 2019
60266ff
Cloud Native Security Intro (#14495)
zparnold May 30, 2019
1d0f8d9
Document rounding behavior for PDBs (#14408)
May 30, 2019
f6b8449
content/es/docs/reference/glossary/selector (#14369)
slienyp May 30, 2019
ebed710
Add relevant glossary tooltips (#14632)
sftim May 31, 2019
0ebe8c3
Remove initializers (id) (#14655)
May 31, 2019
8d674dd
Remove initializers (zh) (#14654)
May 31, 2019
0cb3f4a
Fix Typo in the deprecation warning (#13488)
anshulahuja98 May 31, 2019
20f29ca
Update minikube.md (#14662)
Magro28 Jun 1, 2019
fabe7aa
fix typo in install-kubeadm.md (#14680)
mysunshine92 Jun 1, 2019
3de064f
New upstream commit for code of conduct (Portuguese) (#14630)
sftim Jun 2, 2019
c25d3c0
Fix Container Environment Variables full link (#14663)
oussemos Jun 3, 2019
26fd321
fix typo in romana-network-policy.md (#14661)
mysunshine92 Jun 3, 2019
73ee498
fix typos in configure-aggregation-layer.md (#14650)
mysunshine92 Jun 3, 2019
674303b
Link to 'Add image pull secret to service account' (#14669)
rajeshdeshpande02 Jun 3, 2019
985c083
change to documentation ip adress #14664 (#14677)
icheikhrouhou Jun 3, 2019
711a0d2
update feature-gates.md (#14635)
mysunshine92 Jun 3, 2019
42b422b
Add german slack channel and maintainer (#14489)
Xaseron Jun 3, 2019
3af9a19
Updates kubernetes-basics (#14702)
shavidissa Jun 4, 2019
44414ce
Updated target environments supported by Kublr (#14698)
olegch Jun 4, 2019
e66b9a5
updating ICP version 3.1.2 to 3.2.0 (#14697)
stacyped Jun 4, 2019
88fe150
clean up feature state examples, style guide (#14699)
kbhawkey Jun 4, 2019
eda841c
small grammar fixes in overview/components.md (#14693)
jaypipes Jun 4, 2019
6f291e0
Update secret.md (#14690)
Jun 4, 2019
92d1da4
document version changes of critical pod (#14684)
yuchengwu Jun 4, 2019
6c91774
Adapt docs for kubectl completion on macOS (#14636)
weibeld Jun 4, 2019
10e71c9
Clarify behavior of parallel pod management policy (#14606)
MajorBreakfast Jun 4, 2019
270bae0
Fix typo: Update to hello-minikube (#14706)
tmerkel Jun 4, 2019
8b2b09e
corrected example for private image string format (#14283)
raja-anbazhagan Jun 4, 2019
aa9384e
Tweak glossary definition for Node (#14317)
sftim Jun 4, 2019
2ca9136
unhold the binaries on the worker nodes during upgrade (#14708)
Jun 4, 2019
d259346
Improve Pivotal row in Production Setup table (#14648)
astrieanna Jun 4, 2019
b207ff8
Prefer "minikube delete" over "rm -rf ~/.minikube" (#14647)
tstromberg Jun 4, 2019
62ae33b
Reword documentation for Service concept (#14526)
sftim Jun 4, 2019
704aa64
Link from Security concept to related pages (#14726)
sftim Jun 5, 2019
944ab0d
Remove unneeded "groups" from CSR yaml example (#14723)
mattva01 Jun 5, 2019
83d5e1e
fix homepage redirect of localized documentations (#14586)
rekcah78 Jun 5, 2019
82baf65
Add case studies from cncf.io (#14520)
alexcontini Jun 5, 2019
07812a5
fix typo en/fr (#14749)
rekcah78 Jun 5, 2019
1fbcb30
changed example domain to be **example.com** (#14740)
raja-anbazhagan Jun 6, 2019
28d225e
Fix a small typo (#14743)
austinbv Jun 6, 2019
8ac73fc
Update images.md (#14736)
rishgh Jun 6, 2019
cdc2ccf
Add KubeOne as AWS turnkey solution (#14737)
xmudrii Jun 6, 2019
c19c669
Fix typo in limit-range.md. (#14730)
carlonelong Jun 6, 2019
cbbaf04
use glossary defs in overview/components.md (#14721)
jaypipes Jun 6, 2019
ac3e49b
Kubespray supports Custom VM and BareMetal (#14717)
Jun 6, 2019
64d61cf
fix markdown format (#14756)
silenceshell Jun 6, 2019
fd6ec9b
Update guestbook-logs-metrics-with-elk.md (#14755)
SupriyaSirbi Jun 6, 2019
1aae328
Issue #14703 - Update Images.md (#14757)
SupriyaSirbi Jun 6, 2019
2e73fb6
update pod-overview.md (#14758)
Vageesha17 Jun 6, 2019
ba2dc02
Translate docs/tasks/configure-pod-container/attach-handler-lifecycle…
rainingmaster Jun 6, 2019
7289483
Update “Autoscale the DNS Service in a Cluster” (#14525)
sftim Jun 6, 2019
7fef09f
Explain motivation for RuntimeClass (#14490)
sftim Jun 6, 2019
6c85c9c
Update Calico to v3.7 (#14501)
caseydavenport Jun 6, 2019
11194bc
Update link and standardize language (#14482)
Jun 6, 2019
5f7feac
Emphasize that cluster API v1 is deprecated (#14461)
sftim Jun 6, 2019
7166553
Rs rollingupdate (#14462)
Jun 6, 2019
1646be8
Adding annotation example (#14440)
rajeshdeshpande02 Jun 6, 2019
0e146f8
setup/independent: fix cilium installation guide for kubeadm (#14411)
aanm Jun 6, 2019
6b9fd61
Adding example to show labels in POD yaml (#14439)
rajeshdeshpande02 Jun 6, 2019
86e0bef
New upstream commit for code of conduct (Spanish) (#14631)
sftim Jun 6, 2019
194a895
revert on a name translation of card made by mistake (#14751)
rekcah78 Jun 6, 2019
019c774
Revert "fix typo en/fr (#14749)" (#14750)
rekcah78 Jun 6, 2019
0fcc348
docs-fr | concepts | services-networking | ingress (#13742)
0xawaz Jun 6, 2019
aa96765
fix typo and wrong url (#14772)
rekcah78 Jun 7, 2019
7fe0d50
Fix typo, missing 's' for plural (#14783)
anthonydahanne Jun 7, 2019
871ba61
Update bootstrap js because bootstrap 3.3.7 is vulnerable (#14775)
remyleone Jun 8, 2019
ce2f471
small typo: extra verb (#14765)
dimitropoulos Jun 8, 2019
c133a32
correct typo in home directory name (#14659)
rchowson Jun 8, 2019
654db85
Use Hugo extended for Sass/CSS (#13113)
lucperkins Jun 9, 2019
8f4fe15
Correction: sysctl entries aren't annotations (#14796)
JayBeale Jun 10, 2019
1f9786e
Fixes PDB rounding docs (percentage as string instead of float) (#14788)
jasongwartz Jun 10, 2019
4ac08fc
improve arch/nodes.md info on Conditions and Allocatable (#14753)
jaypipes Jun 10, 2019
7e63eb4
Add missing logrotate component to logging with streaming sidecar ima…
perk Jun 10, 2019
6a77a5a
recommended admission controllers are enabled by default (#14784)
rptaylor Jun 10, 2019
43ed5b7
add link to default admission controllers (#14808)
rptaylor Jun 10, 2019
8b68f6a
Add CSI type pv and description of CSI accessMode (#14798)
cwdsuzhou Jun 10, 2019
1b9af9a
Federation Remediation Part Deux (#14140)
thecrudge Jun 11, 2019
4302188
Update service.md (#14804)
cdivitotawela Jun 11, 2019
ba7f02e
fix padding for docs home on nav (#14807)
kbhawkey Jun 11, 2019
277d206
Fixes the IP addresses shown in the ip-masq diagram. (#14789)
palnabarun Jun 11, 2019
feda4f9
Update install-minikube.md (#14776)
jarst Jun 11, 2019
9909ef7
Updated podpreset.md to reflect changes in #71479 (#14764)
NicolasRouquette Jun 11, 2019
b67e560
Remove Port Proxy reference (#14769)
foxylion Jun 11, 2019
9e1dc47
add clux/kube-rs client (#14759)
clux Jun 11, 2019
04f568d
Update control-plane-flags.md (#14729)
kigawas Jun 11, 2019
b237842
add related note with pod deleted (#14709)
Jun 11, 2019
1e354c5
Update persistent-volumes.md (#14811)
zhangqx2010 Jun 11, 2019
a905be0
Add recommendation to use kms provider (#13264)
mayakacz Jun 11, 2019
d865cc4
Add comment about where to run probe (#13815)
daixiang0 Jun 11, 2019
0c03137
updated recommend key path for multiple certificates . (#13895)
shubham-asati Jun 11, 2019
b3e3332
update kubectl "$" format (#13256)
Liujingfang1 Jun 11, 2019
7b44b7a
Downloadable examples for “Run applications” section (#14147)
sftim Jun 11, 2019
5c3e795
Split minikube install task into tabs (per-OS) (#14013)
sftim Jun 11, 2019
a1cde3f
Add Ref to shared process namespaces (#14194)
so0k Jun 11, 2019
6e901b9
Check all commits in branch for examples (to trigger testing) (#14243)
sftim Jun 11, 2019
c27dced
Fix several potential issues with existing translation (#14785)
anthonydahanne Jun 11, 2019
f7d6afe
Add accessibility guidelines to the style guide (#14292)
Rajakavitha1 Jun 11, 2019
38aff0f
Improve concept page for Ingress (#14313)
sftim Jun 11, 2019
d028d87
Add all the _index files for the French translation (#14744)
remyleone Jun 11, 2019
f60947b
initial french translation (#14793)
anthonydahanne Jun 12, 2019
55ac801
Restructure the left navigation pane of setup (#14826)
Rajakavitha1 Jun 12, 2019
1306060
Update _index.md for Spanish (#14645)
chesstrian Jun 12, 2019
c113e20
Add content/es/docs/reference/glossary/kubeadm.md (#14546)
javisabalete Jun 12, 2019
c3fa521
Add content/es/docs/reference/glossary/docker.md (#14553)
javisabalete Jun 12, 2019
846de91
Translate content/id/docs/concepts/cluster-administration/cluster-adm…
devlware Jun 12, 2019
be946f2
Add a script to check differences between translated and English vers…
remyleone Jun 12, 2019
528fd25
fix a mistake in limit-range.md (#14836)
Pingan2017 Jun 12, 2019
e0f5576
Update field-selectors.md (#14839)
wanghaoran1988 Jun 12, 2019
cef5f1f
fix-zh-home (#14835)
zhangqx2010 Jun 12, 2019
ba03f95
Update install-kubectl.md (#14840)
jarst Jun 12, 2019
21f32e1
2 translated interactive tutorials for ES (#14417)
BenHall Jun 12, 2019
488c04f
Added blog post about the upcoming Contributor Summit Shanghai. (#14782)
jberkus Jun 12, 2019
a20807c
Update out-of-resource.md (#14862)
woosley Jun 13, 2019
9eec2f2
update pick-right-solution to setup page (#14866)
mcbenjemaa Jun 13, 2019
26f2e55
zh-trans: add 2019-06-11-contributor-summit-shanghai.md (#14837)
chenrui333 Jun 13, 2019
c2ecd93
remove useless file: whatisk8s.md (#14844)
rainingmaster Jun 14, 2019
02d963d
fix some typos in kubeadm init (#14864)
anthonydahanne Jun 14, 2019
c0612ae
Translate "Garbage Collection" page to Bahasa Indonesia (#14513)
antoooks Jun 14, 2019
d058c46
Dangling "pick-right-solution" references - Italian (#14806)
mcbenjemaa Jun 15, 2019
355b5ef
Update _index.md (#14685)
jhbiggs Jun 15, 2019
a44d4ee
Fixed typo (#14845)
kersten Jun 15, 2019
9dddb3c
Add content/es/docs/reference/glossary/kops.md (#14533)
javisabalete Jun 15, 2019
2cdd519
[docs-fr] add missing overview (#14815)
0xawaz Jun 15, 2019
1d874b9
translated term: container-runtime (#14921)
julienemo Jun 15, 2019
0f7cb40
Fifth Korean localization work for release-1.14 (#14578) (#14874)
gochist Jun 16, 2019
ff60500
fixing carousel Fixes ##14882 (#14895)
mcbenjemaa Jun 16, 2019
c310498
translated term: container (#14909)
julienemo Jun 16, 2019
d1a47bf
translated glossary/aggregation-layer.md from en to fr (#14911)
ryanzidago Jun 16, 2019
ca9e44f
Tidy reference doc generation guide (#14825)
sftim Jun 17, 2019
dee06de
Tidy garbage collection controller page (#14856)
sftim Jun 17, 2019
f61fcdf
removed merge conflicts choosing upstream dev1.15 as source correct c…
makoscafee Jun 17, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Improve Pivotal row in Production Setup table (#14648)
* Improve Pivotal row in Production Setup table.

- Provider column should contain company name
- Change check marks to product links to match other rows

Co-authored-by: Danny Berger <dberger@pivotal.io>

* Spell out PKS abbreviation.

Co-authored-by: Danny Berger <dberger@pivotal.io>
  • Loading branch information
2 people authored and k8s-ci-robot committed Jun 4, 2019
commit d259346fde14a3bd06202adf6e5545115ea58560
2 changes: 1 addition & 1 deletion content/en/docs/setup/_index.md
Original file line number Diff line number Diff line change
@@ -97,7 +97,7 @@ The following production environment solutions table lists the providers and the
| [OpenShift](https://www.openshift.com) |[OpenShift Dedicated](https://www.openshift.com/products/dedicated/) and [OpenShift Online](https://www.openshift.com/products/online/) | | [OpenShift Container Platform](https://www.openshift.com/products/container-platform/) | | [OpenShift Container Platform](https://www.openshift.com/products/container-platform/) |[OpenShift Container Platform](https://www.openshift.com/products/container-platform/)
| [Oracle Cloud Infrastructure Container Engine for Kubernetes (OKE)](https://docs.cloud.oracle.com/iaas/Content/ContEng/Concepts/contengoverview.htm) | &#x2714; | &#x2714; | | | |
| [oVirt](https://www.ovirt.org/) | | | | | &#x2714; |
| [Pivotal Container Service](https://pivotal.io/platform/pivotal-container-service) | | &#x2714; | &#x2714; | | |
| [Pivotal](https://pivotal.io/) | | [Enterprise Pivotal Container Service (PKS)](https://pivotal.io/platform/pivotal-container-service) | [Enterprise Pivotal Container Service (PKS)](https://pivotal.io/platform/pivotal-container-service) | | |
| [Platform9](https://platform9.com/) | &#x2714; | &#x2714; | &#x2714; | | &#x2714; |&#x2714;
| [Rancher](https://rancher.com/) | | [Rancher 2.x](https://rancher.com/docs/rancher/v2.x/en/) | | [Rancher Kubernetes Engine (RKE)](https://rancher.com/docs/rke/latest/en/) | | [k3s](https://k3s.io/)
| [StackPoint](https://stackpoint.io/)  | &#x2714; | &#x2714; | | | |