Production-Grade Container Scheduling and Management
Go to file
Kubernetes Submit Queue 72e0256935
Merge pull request #59057 from JordanFaust/add-cri-socket-to-kubeadm-master-manifest
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Add criSocket to kubeadm MasterConfiguration manifest

**What this PR does / why we need it**:
Adds a criSocket field to the MasterConfiguration manifest used by kubeadm. This field configures the cri socket that kubeadm uses during preflight checks.  

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes # kubernetes/kubeadm#679

**Special notes for your reviewer**:

kubeadm does not allow the use of --config and the --cri-socket flag together. When using kubeadm to create a cluster that will not be using docker, the preflight checks fail since this is not configurable. This PR adds the criSocket to the MasterConfiguration manifest and uses that value within the MasterConfiguration if it was provided. 

Storing the value of the criSocket within the MasterConfiguration manifest will also make joining additional masters with the proposed 'kubeadm join --master' command by not requiring operators to remember to include an additional flag. This may not be the case if we instead relaxed the constraint of using additional flags when using the --config flag is set.

**Release note**:
/area kubeadm
/assign @luxas
/cc @kubernetes/sig-cluster-lifecycle-pr-reviews

```release-note
kubeadm: add criSocket field to MasterConfiguration manifiest
```
2018-02-21 04:22:31 -08:00
.github
api Merge pull request #54933 from php-coder/psp_introduce_new_api_group 2018-02-20 15:44:50 -08:00
build bzl: use --local_test_jobs 2018-02-20 10:57:40 -08:00
cluster Merge pull request #59916 from kawych/cluster-location 2018-02-20 12:39:40 -08:00
cmd Merge pull request #59057 from JordanFaust/add-cri-socket-to-kubeadm-master-manifest 2018-02-21 04:22:31 -08:00
docs Merge pull request #54933 from php-coder/psp_introduce_new_api_group 2018-02-20 15:44:50 -08:00
examples Merge pull request #59319 from pires/clean_elasticsearch_example 2018-02-20 17:20:14 -08:00
Godeps Merge pull request #60091 from ravisantoshgudimetla/monitor-kubepods 2018-02-20 23:58:53 -08:00
hack Merge pull request #59341 from dmathieu/golint-daemon 2018-02-20 19:19:19 -08:00
logo
pkg Merge pull request #60091 from ravisantoshgudimetla/monitor-kubepods 2018-02-20 23:58:53 -08:00
plugin Merge pull request #59391 from msau42/topology-beta 2018-02-20 13:26:07 -08:00
staging Merge pull request #54933 from php-coder/psp_introduce_new_api_group 2018-02-20 15:44:50 -08:00
test Merge pull request #60130 from aleksandra-malinowska/autoscaling-test-fix-14 2018-02-21 03:44:07 -08:00
third_party
translations
vendor Merge pull request #60091 from ravisantoshgudimetla/monitor-kubepods 2018-02-20 23:58:53 -08:00
.bazelrc
.generated_files
.gitattributes
.gitignore
.kazelcfg.json
BUILD.bazel
CHANGELOG-1.2.md
CHANGELOG-1.3.md
CHANGELOG-1.4.md
CHANGELOG-1.5.md
CHANGELOG-1.6.md
CHANGELOG-1.7.md
CHANGELOG-1.8.md
CHANGELOG-1.9.md
CHANGELOG-1.10.md Merge pull request #59250 from thedrow/patch-1 2018-02-20 20:00:38 -08:00
CHANGELOG.md
code-of-conduct.md
CONTRIBUTING.md
labels.yaml
LICENSE
Makefile
Makefile.generated_files
OWNERS
OWNERS_ALIASES Merge pull request #59587 from cblecker/cblecker-vendor 2018-02-19 23:24:34 -08:00
README.md
SUPPORT.md
WORKSPACE

Kubernetes

Submit Queue Widget GoDoc Widget CII Best Practices


Kubernetes is an open source system for managing containerized applications across multiple hosts; providing basic mechanisms for deployment, maintenance, and scaling of applications.

Kubernetes builds upon a decade and a half of experience at Google running production workloads at scale using a system called Borg, combined with best-of-breed ideas and practices from the community.

Kubernetes is hosted by the Cloud Native Computing Foundation (CNCF). If you are a company that wants to help shape the evolution of technologies that are container-packaged, dynamically-scheduled and microservices-oriented, consider joining the CNCF. For details about who's involved and how Kubernetes plays a role, read the CNCF announcement.


To start using Kubernetes

See our documentation on kubernetes.io.

Try our interactive tutorial.

Take a free course on Scalable Microservices with Kubernetes.

To start developing Kubernetes

The community repository hosts all information about building Kubernetes from source, how to contribute code and documentation, who to contact about what, etc.

If you want to build Kubernetes right away there are two options:

You have a working Go environment.
$ go get -d k8s.io/kubernetes
$ cd $GOPATH/src/k8s.io/kubernetes
$ make
You have a working Docker environment.
$ git clone https://github.com/kubernetes/kubernetes
$ cd kubernetes
$ make quick-release

For the full story, head over to the developer's documentation.

Support

If you need support, start with the troubleshooting guide, and work your way through the process that we've outlined.

That said, if you have questions, reach out to us one way or another.

Analytics