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

Add Kubermatic to pick-right-solution.md #6459

Merged
merged 2 commits into from
Jan 8, 2018
Merged

Add Kubermatic to pick-right-solution.md #6459

merged 2 commits into from
Jan 8, 2018

Conversation

scruplelesswizard
Copy link
Contributor

@scruplelesswizard scruplelesswizard commented Nov 27, 2017

Adding information for Kubermatic to Picking the Right Solution documentation


This change is Reviewable

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Nov 27, 2017
@k8sio-netlify-preview-bot
Copy link
Collaborator

k8sio-netlify-preview-bot commented Nov 27, 2017

Deploy preview ready!

Built with commit 359fc1b

https://deploy-preview-6459--kubernetes-io-master-staging.netlify.com

@@ -59,6 +59,8 @@ a Kubernetes cluster from scratch.

* [Giant Swarm](https://giantswarm.io/product/) offers managed Kubernetes clusters in their own datacenter, on-premises, or on public clouds.

* [Kubermatic](https://kubermatic.io) provides managed Kubernetes clusters for various public clouds, including AWS and Digital Ocean, as well as on-premise with OpenStack integration.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

on-premise -> on-premises

@@ -154,6 +158,7 @@ AppsCode.com | Saltstack | Debian | multi-support | [docs](https://ap
KUBE2GO.io | | multi-support | multi-support | [docs](https://kube2go.io) | Commercial
Madcore.Ai | Jenkins DSL | Ubuntu | flannel | [docs](https://madcore.ai) | Community ([@madcore-ai](https://github.com/madcore-ai))
Platform9 | | multi-support | multi-support | [docs](https://platform9.com/managed-kubernetes/) | Commercial
Kubermatic | | multi-support | multi-support | [docs](https://github.com/kubermatic/docs/) | Commercial
Giant Swarm | | CoreOS | flannel and/or Calico | [docs](https://docs.giantswarm.io/) | Commercial
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This link returns 404.
https://github.com/kubermatic/docs/

@@ -154,6 +158,7 @@ AppsCode.com | Saltstack | Debian | multi-support | [docs](https://ap
KUBE2GO.io | | multi-support | multi-support | [docs](https://kube2go.io) | Commercial
Madcore.Ai | Jenkins DSL | Ubuntu | flannel | [docs](https://madcore.ai) | Community ([@madcore-ai](https://github.com/madcore-ai))
Platform9 | | multi-support | multi-support | [docs](https://platform9.com/managed-kubernetes/) | Commercial
Kubermatic | | multi-support | multi-support | [docs](https://github.com/kubermatic/docs/) | Commercial
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we make all the list alphabetically ? I'm +1 on it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that would make the most sense. Would you like me to update the list to descending alphabetical order?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't have a strong feeling about it. But I think descending alphabetical order would be fine.

@steveperry-53
Copy link
Contributor

@chaosaffe @xiangpengzhao Sorry about the delay. Are you ready for me to merge this? Or would you like to make the alphabetizing change? Thanks.

@xiangpengzhao
Copy link
Contributor

@steveperry-53 I'm fine with merging it as-is if @chaosaffe has no cycles to change the order. That can be a follow-up PR. I'm not strong on changing the order either.

@steveperry-53 steveperry-53 merged commit 42bc7bf into kubernetes:master Jan 8, 2018
chenopis added a commit that referenced this pull request Jan 9, 2018
…elease-1.9

* 'master' of https://github.com/kubernetes/website: (140 commits)
  Update configure-multiple-schedulers.md (#6877)
  Explicitly specify the components that need a change (#6873)
  Updates to partner page (#6797)
  Add steps for extension api-server setup (#6667)
  securing a cluster: add recommendations about cloud metadata APIs (#6659)
  Namespace glossary term (#6607)
  Update device plugin doc with upgrade suggestions and known limitations. (#6501)
  Add Kubermatic to pick-right-solution.md (#6459)
  extra word
  typo
  Fix concepts/configuration/secret
  Link to extended resources instead of deprecated opaque integer resources
  Fix CI issue
  Corrected the group in runtime-config of ValidatingAdmissionWebhook and MutatingAdmissionWebhook. It should be admissionregistration.k8s.io (was admissionregistration).
  Correct references in Jekyll data files
  Update scheduling-hugepages.md
  Drop reference to outdated FAQ
  Follow sig list to kubernetes/community
  Update scheduling-hugepages.md
  Fix references to ConfigMap for the CN website
  ...

# Conflicts:
#	docs/concepts/policy/pod-security-policy.md
@scruplelesswizard scruplelesswizard deleted the patch-1 branch January 15, 2018 13:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants