mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-01 15:58:37 +00:00
Merge remote-tracking branch 'kubernetes/master'
This commit is contained in:
Chris Crane
commit
6e2dee56e5
2
.github/PULL_REQUEST_TEMPLATE.md
vendored
2
.github/PULL_REQUEST_TEMPLATE.md
vendored
@ -15,5 +15,5 @@ Please remove this comment block before submitting.
|
||||
* Use the release-note-* labels to set the release note state
|
||||
* Clear this block to use the PR title as the release note
|
||||
-OR-
|
||||
* Enter your extended release note here
|
||||
* Enter your extended release note here (newlines are formatted as bullets)
|
||||
```
|
||||
|
||||
109
CHANGELOG.md
109
CHANGELOG.md
@ -1,25 +1,29 @@
|
||||
<!-- BEGIN MUNGE: GENERATED_TOC -->
|
||||
|
||||
- [v1.3.2](#v132)
|
||||
- [v1.3.3](#v133)
|
||||
- [Downloads](#downloads)
|
||||
- [Changelog since v1.3.1](#changelog-since-v131)
|
||||
- [Changelog since v1.3.2](#changelog-since-v132)
|
||||
- [Other notable changes](#other-notable-changes)
|
||||
- [v1.3.1](#v131)
|
||||
- [v1.3.2](#v132)
|
||||
- [Downloads](#downloads-1)
|
||||
- [Changelog since v1.3.0](#changelog-since-v130)
|
||||
- [Changelog since v1.3.1](#changelog-since-v131)
|
||||
- [Other notable changes](#other-notable-changes-1)
|
||||
- [v1.2.6](#v126)
|
||||
- [v1.3.1](#v131)
|
||||
- [Downloads](#downloads-2)
|
||||
- [Changelog since v1.2.5](#changelog-since-v125)
|
||||
- [Changelog since v1.3.0](#changelog-since-v130)
|
||||
- [Other notable changes](#other-notable-changes-2)
|
||||
- [v1.4.0-alpha.1](#v140-alpha1)
|
||||
- [v1.2.6](#v126)
|
||||
- [Downloads](#downloads-3)
|
||||
- [Changelog since v1.2.5](#changelog-since-v125)
|
||||
- [Other notable changes](#other-notable-changes-3)
|
||||
- [v1.4.0-alpha.1](#v140-alpha1)
|
||||
- [Downloads](#downloads-4)
|
||||
- [Changelog since v1.3.0](#changelog-since-v130-1)
|
||||
- [Experimental Features](#experimental-features)
|
||||
- [Action Required](#action-required)
|
||||
- [Other notable changes](#other-notable-changes-3)
|
||||
- [Other notable changes](#other-notable-changes-4)
|
||||
- [v1.3.0](#v130)
|
||||
- [Downloads](#downloads-4)
|
||||
- [Downloads](#downloads-5)
|
||||
- [Highlights](#highlights)
|
||||
- [Known Issues and Important Steps before Upgrading](#known-issues-and-important-steps-before-upgrading)
|
||||
- [ThirdPartyResource](#thirdpartyresource)
|
||||
@ -30,67 +34,67 @@
|
||||
- [Provider-specific Notes](#provider-specific-notes)
|
||||
- [Previous Releases Included in v1.3.0](#previous-releases-included-in-v130)
|
||||
- [v1.3.0-beta.3](#v130-beta3)
|
||||
- [Downloads](#downloads-5)
|
||||
- [Downloads](#downloads-6)
|
||||
- [Changelog since v1.3.0-beta.2](#changelog-since-v130-beta2)
|
||||
- [Action Required](#action-required-1)
|
||||
- [Other notable changes](#other-notable-changes-4)
|
||||
- [v1.2.5](#v125)
|
||||
- [Downloads](#downloads-6)
|
||||
- [Changes since v1.2.4](#changes-since-v124)
|
||||
- [Other notable changes](#other-notable-changes-5)
|
||||
- [v1.3.0-beta.2](#v130-beta2)
|
||||
- [v1.2.5](#v125)
|
||||
- [Downloads](#downloads-7)
|
||||
- [Changes since v1.2.4](#changes-since-v124)
|
||||
- [Other notable changes](#other-notable-changes-6)
|
||||
- [v1.3.0-beta.2](#v130-beta2)
|
||||
- [Downloads](#downloads-8)
|
||||
- [Changes since v1.3.0-beta.1](#changes-since-v130-beta1)
|
||||
- [Experimental Features](#experimental-features-1)
|
||||
- [Other notable changes](#other-notable-changes-6)
|
||||
- [Other notable changes](#other-notable-changes-7)
|
||||
- [v1.3.0-beta.1](#v130-beta1)
|
||||
- [Downloads](#downloads-8)
|
||||
- [Downloads](#downloads-9)
|
||||
- [Changes since v1.3.0-alpha.5](#changes-since-v130-alpha5)
|
||||
- [Action Required](#action-required-2)
|
||||
- [Other notable changes](#other-notable-changes-7)
|
||||
- [Other notable changes](#other-notable-changes-8)
|
||||
- [v1.3.0-alpha.5](#v130-alpha5)
|
||||
- [Downloads](#downloads-9)
|
||||
- [Downloads](#downloads-10)
|
||||
- [Changes since v1.3.0-alpha.4](#changes-since-v130-alpha4)
|
||||
- [Action Required](#action-required-3)
|
||||
- [Other notable changes](#other-notable-changes-8)
|
||||
- [Other notable changes](#other-notable-changes-9)
|
||||
- [v1.3.0-alpha.4](#v130-alpha4)
|
||||
- [Downloads](#downloads-10)
|
||||
- [Downloads](#downloads-11)
|
||||
- [Changes since v1.3.0-alpha.3](#changes-since-v130-alpha3)
|
||||
- [Action Required](#action-required-4)
|
||||
- [Other notable changes](#other-notable-changes-9)
|
||||
- [v1.2.4](#v124)
|
||||
- [Downloads](#downloads-11)
|
||||
- [Changes since v1.2.3](#changes-since-v123)
|
||||
- [Other notable changes](#other-notable-changes-10)
|
||||
- [v1.3.0-alpha.3](#v130-alpha3)
|
||||
- [v1.2.4](#v124)
|
||||
- [Downloads](#downloads-12)
|
||||
- [Changes since v1.2.3](#changes-since-v123)
|
||||
- [Other notable changes](#other-notable-changes-11)
|
||||
- [v1.3.0-alpha.3](#v130-alpha3)
|
||||
- [Downloads](#downloads-13)
|
||||
- [Changes since v1.3.0-alpha.2](#changes-since-v130-alpha2)
|
||||
- [Action Required](#action-required-5)
|
||||
- [Other notable changes](#other-notable-changes-11)
|
||||
- [Other notable changes](#other-notable-changes-12)
|
||||
- [v1.2.3](#v123)
|
||||
- [Downloads](#downloads-13)
|
||||
- [Downloads](#downloads-14)
|
||||
- [Changes since v1.2.2](#changes-since-v122)
|
||||
- [Action Required](#action-required-6)
|
||||
- [Other notable changes](#other-notable-changes-12)
|
||||
- [v1.3.0-alpha.2](#v130-alpha2)
|
||||
- [Downloads](#downloads-14)
|
||||
- [Changes since v1.3.0-alpha.1](#changes-since-v130-alpha1)
|
||||
- [Other notable changes](#other-notable-changes-13)
|
||||
- [v1.2.2](#v122)
|
||||
- [v1.3.0-alpha.2](#v130-alpha2)
|
||||
- [Downloads](#downloads-15)
|
||||
- [Changes since v1.2.1](#changes-since-v121)
|
||||
- [Changes since v1.3.0-alpha.1](#changes-since-v130-alpha1)
|
||||
- [Other notable changes](#other-notable-changes-14)
|
||||
- [v1.2.1](#v121)
|
||||
- [v1.2.2](#v122)
|
||||
- [Downloads](#downloads-16)
|
||||
- [Changes since v1.2.0](#changes-since-v120)
|
||||
- [Changes since v1.2.1](#changes-since-v121)
|
||||
- [Other notable changes](#other-notable-changes-15)
|
||||
- [v1.3.0-alpha.1](#v130-alpha1)
|
||||
- [v1.2.1](#v121)
|
||||
- [Downloads](#downloads-17)
|
||||
- [Changes since v1.2.0](#changes-since-v120)
|
||||
- [Other notable changes](#other-notable-changes-16)
|
||||
- [v1.3.0-alpha.1](#v130-alpha1)
|
||||
- [Downloads](#downloads-18)
|
||||
- [Changes since v1.2.0](#changes-since-v120-1)
|
||||
- [Action Required](#action-required-7)
|
||||
- [Other notable changes](#other-notable-changes-16)
|
||||
- [Other notable changes](#other-notable-changes-17)
|
||||
- [v1.2.0](#v120)
|
||||
- [Downloads](#downloads-18)
|
||||
- [Downloads](#downloads-19)
|
||||
- [Changes since v1.1.1](#changes-since-v111)
|
||||
- [Major Themes](#major-themes)
|
||||
- [Other notable improvements](#other-notable-improvements)
|
||||
@ -109,6 +113,33 @@
|
||||
<!-- NEW RELEASE NOTES ENTRY -->
|
||||
|
||||
|
||||
# v1.3.3
|
||||
|
||||
[Documentation](http://kubernetes.github.io) & [Examples](http://releases.k8s.io/release-1.3/examples)
|
||||
|
||||
## Downloads
|
||||
|
||||
binary | sha256 hash
|
||||
------ | -----------
|
||||
[kubernetes.tar.gz](https://storage.googleapis.com/kubernetes-release/release/v1.3.3/kubernetes.tar.gz) | `a92a74a0d3f7d02d01ac2c8dfb5ee2e97b0485819e77b2110eb7c6b7c782478c`
|
||||
|
||||
## Changelog since v1.3.2
|
||||
|
||||
### Other notable changes
|
||||
|
||||
* Removing images with multiple tags ([#29316](https://github.com/kubernetes/kubernetes/pull/29316), [@ronnielai](https://github.com/ronnielai))
|
||||
* kubectl: don't display an empty list when trying to get a single resource that isn't found ([#28294](https://github.com/kubernetes/kubernetes/pull/28294), [@ncdc](https://github.com/ncdc))
|
||||
* Fix working_set calculation in kubelet ([#29154](https://github.com/kubernetes/kubernetes/pull/29154), [@vishh](https://github.com/vishh))
|
||||
* Don't delete affinity when endpoints are empty ([#28655](https://github.com/kubernetes/kubernetes/pull/28655), [@freehan](https://github.com/freehan))
|
||||
* GCE bring-up: Differentiate NODE_TAGS from NODE_INSTANCE_PREFIX ([#29141](https://github.com/kubernetes/kubernetes/pull/29141), [@zmerlynn](https://github.com/zmerlynn))
|
||||
* Fix logrotate config on GCI ([#29139](https://github.com/kubernetes/kubernetes/pull/29139), [@adityakali](https://github.com/adityakali))
|
||||
* Do not query the metadata server to find out if running on GCE. Retry metadata server query for gcr if running on gce. ([#28871](https://github.com/kubernetes/kubernetes/pull/28871), [@vishh](https://github.com/vishh))
|
||||
* Fix GPU resource validation ([#28743](https://github.com/kubernetes/kubernetes/pull/28743), [@therc](https://github.com/therc))
|
||||
* Scale kube-proxy conntrack limits by cores (new default behavior) ([#28876](https://github.com/kubernetes/kubernetes/pull/28876), [@thockin](https://github.com/thockin))
|
||||
* Don't recreate lb cloud resources on kcm restart ([#29082](https://github.com/kubernetes/kubernetes/pull/29082), [@bprashanth](https://github.com/bprashanth))
|
||||
|
||||
|
||||
|
||||
# v1.3.2
|
||||
|
||||
[Documentation](http://kubernetes.github.io) & [Examples](http://releases.k8s.io/release-1.3/examples)
|
||||
|
||||
247
Godeps/Godeps.json
generated
247
Godeps/Godeps.json
generated
@ -223,6 +223,71 @@
|
||||
"Comment": "v1.1.0-65-gee4a088",
|
||||
"Rev": "ee4a0888a9abe7eefe5a0992ca4cb06864839873"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/cloudflare/cfssl/auth",
|
||||
"Comment": "1.2.0",
|
||||
"Rev": "db0d0650b6496bfe8061ec56a92edd32d8e75c30"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/cloudflare/cfssl/certdb",
|
||||
"Comment": "1.2.0",
|
||||
"Rev": "db0d0650b6496bfe8061ec56a92edd32d8e75c30"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/cloudflare/cfssl/config",
|
||||
"Comment": "1.2.0",
|
||||
"Rev": "db0d0650b6496bfe8061ec56a92edd32d8e75c30"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/cloudflare/cfssl/crypto/pkcs7",
|
||||
"Comment": "1.2.0",
|
||||
"Rev": "db0d0650b6496bfe8061ec56a92edd32d8e75c30"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/cloudflare/cfssl/csr",
|
||||
"Comment": "1.2.0",
|
||||
"Rev": "db0d0650b6496bfe8061ec56a92edd32d8e75c30"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/cloudflare/cfssl/errors",
|
||||
"Comment": "1.2.0",
|
||||
"Rev": "db0d0650b6496bfe8061ec56a92edd32d8e75c30"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/cloudflare/cfssl/helpers",
|
||||
"Comment": "1.2.0",
|
||||
"Rev": "db0d0650b6496bfe8061ec56a92edd32d8e75c30"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/cloudflare/cfssl/helpers/derhelpers",
|
||||
"Comment": "1.2.0",
|
||||
"Rev": "db0d0650b6496bfe8061ec56a92edd32d8e75c30"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/cloudflare/cfssl/info",
|
||||
"Comment": "1.2.0",
|
||||
"Rev": "db0d0650b6496bfe8061ec56a92edd32d8e75c30"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/cloudflare/cfssl/log",
|
||||
"Comment": "1.2.0",
|
||||
"Rev": "db0d0650b6496bfe8061ec56a92edd32d8e75c30"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/cloudflare/cfssl/ocsp/config",
|
||||
"Comment": "1.2.0",
|
||||
"Rev": "db0d0650b6496bfe8061ec56a92edd32d8e75c30"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/cloudflare/cfssl/signer",
|
||||
"Comment": "1.2.0",
|
||||
"Rev": "db0d0650b6496bfe8061ec56a92edd32d8e75c30"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/cloudflare/cfssl/signer/local",
|
||||
"Comment": "1.2.0",
|
||||
"Rev": "db0d0650b6496bfe8061ec56a92edd32d8e75c30"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/codegangsta/negroni",
|
||||
"Comment": "v0.1.0-62-g8d75e11",
|
||||
@ -642,68 +707,68 @@
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/docker/engine-api/client",
|
||||
"Comment": "v0.3.1-62-g3d72d39",
|
||||
"Rev": "3d72d392d07bece8d7d7b2a3b6b2e57c2df376a2"
|
||||
"Comment": "v0.3.1-78-gdea108d",
|
||||
"Rev": "dea108d3aa0c67d7162a3fd8aa65f38a430019fd"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/docker/engine-api/client/transport",
|
||||
"Comment": "v0.3.1-62-g3d72d39",
|
||||
"Rev": "3d72d392d07bece8d7d7b2a3b6b2e57c2df376a2"
|
||||
"Comment": "v0.3.1-78-gdea108d",
|
||||
"Rev": "dea108d3aa0c67d7162a3fd8aa65f38a430019fd"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/docker/engine-api/client/transport/cancellable",
|
||||
"Comment": "v0.3.1-62-g3d72d39",
|
||||
"Rev": "3d72d392d07bece8d7d7b2a3b6b2e57c2df376a2"
|
||||
"Comment": "v0.3.1-78-gdea108d",
|
||||
"Rev": "dea108d3aa0c67d7162a3fd8aa65f38a430019fd"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/docker/engine-api/types",
|
||||
"Comment": "v0.3.1-62-g3d72d39",
|
||||
"Rev": "3d72d392d07bece8d7d7b2a3b6b2e57c2df376a2"
|
||||
"Comment": "v0.3.1-78-gdea108d",
|
||||
"Rev": "dea108d3aa0c67d7162a3fd8aa65f38a430019fd"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/docker/engine-api/types/blkiodev",
|
||||
"Comment": "v0.3.1-62-g3d72d39",
|
||||
"Rev": "3d72d392d07bece8d7d7b2a3b6b2e57c2df376a2"
|
||||
"Comment": "v0.3.1-78-gdea108d",
|
||||
"Rev": "dea108d3aa0c67d7162a3fd8aa65f38a430019fd"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/docker/engine-api/types/container",
|
||||
"Comment": "v0.3.1-62-g3d72d39",
|
||||
"Rev": "3d72d392d07bece8d7d7b2a3b6b2e57c2df376a2"
|
||||
"Comment": "v0.3.1-78-gdea108d",
|
||||
"Rev": "dea108d3aa0c67d7162a3fd8aa65f38a430019fd"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/docker/engine-api/types/filters",
|
||||
"Comment": "v0.3.1-62-g3d72d39",
|
||||
"Rev": "3d72d392d07bece8d7d7b2a3b6b2e57c2df376a2"
|
||||
"Comment": "v0.3.1-78-gdea108d",
|
||||
"Rev": "dea108d3aa0c67d7162a3fd8aa65f38a430019fd"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/docker/engine-api/types/network",
|
||||
"Comment": "v0.3.1-62-g3d72d39",
|
||||
"Rev": "3d72d392d07bece8d7d7b2a3b6b2e57c2df376a2"
|
||||
"Comment": "v0.3.1-78-gdea108d",
|
||||
"Rev": "dea108d3aa0c67d7162a3fd8aa65f38a430019fd"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/docker/engine-api/types/reference",
|
||||
"Comment": "v0.3.1-62-g3d72d39",
|
||||
"Rev": "3d72d392d07bece8d7d7b2a3b6b2e57c2df376a2"
|
||||
"Comment": "v0.3.1-78-gdea108d",
|
||||
"Rev": "dea108d3aa0c67d7162a3fd8aa65f38a430019fd"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/docker/engine-api/types/registry",
|
||||
"Comment": "v0.3.1-62-g3d72d39",
|
||||
"Rev": "3d72d392d07bece8d7d7b2a3b6b2e57c2df376a2"
|
||||
"Comment": "v0.3.1-78-gdea108d",
|
||||
"Rev": "dea108d3aa0c67d7162a3fd8aa65f38a430019fd"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/docker/engine-api/types/strslice",
|
||||
"Comment": "v0.3.1-62-g3d72d39",
|
||||
"Rev": "3d72d392d07bece8d7d7b2a3b6b2e57c2df376a2"
|
||||
"Comment": "v0.3.1-78-gdea108d",
|
||||
"Rev": "dea108d3aa0c67d7162a3fd8aa65f38a430019fd"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/docker/engine-api/types/time",
|
||||
"Comment": "v0.3.1-62-g3d72d39",
|
||||
"Rev": "3d72d392d07bece8d7d7b2a3b6b2e57c2df376a2"
|
||||
"Comment": "v0.3.1-78-gdea108d",
|
||||
"Rev": "dea108d3aa0c67d7162a3fd8aa65f38a430019fd"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/docker/engine-api/types/versions",
|
||||
"Comment": "v0.3.1-62-g3d72d39",
|
||||
"Rev": "3d72d392d07bece8d7d7b2a3b6b2e57c2df376a2"
|
||||
"Comment": "v0.3.1-78-gdea108d",
|
||||
"Rev": "dea108d3aa0c67d7162a3fd8aa65f38a430019fd"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/docker/go-connections/nat",
|
||||
@ -1125,6 +1190,26 @@
|
||||
"Comment": "v0.23.2-25-g51574ec",
|
||||
"Rev": "51574ec04ff12ca5a50f0935625ec02437191a06"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/google/certificate-transparency/go",
|
||||
"Rev": "af98904302724c29aa6659ca372d41c9687de2b7"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/google/certificate-transparency/go/asn1",
|
||||
"Rev": "af98904302724c29aa6659ca372d41c9687de2b7"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/google/certificate-transparency/go/client",
|
||||
"Rev": "af98904302724c29aa6659ca372d41c9687de2b7"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/google/certificate-transparency/go/x509",
|
||||
"Rev": "af98904302724c29aa6659ca372d41c9687de2b7"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/google/certificate-transparency/go/x509/pkix",
|
||||
"Rev": "af98904302724c29aa6659ca372d41c9687de2b7"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/google/gofuzz",
|
||||
"Rev": "bbcb9da2d746f8bdbd6a936686a0a6067ada0ec5"
|
||||
@ -1330,6 +1415,10 @@
|
||||
"ImportPath": "github.com/mitchellh/mapstructure",
|
||||
"Rev": "740c764bc6149d3f1806231418adb9f52c11bcbf"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/mreiferson/go-httpclient",
|
||||
"Rev": "31f0106b4474f14bc441575c19d3a5fa21aa1f6c"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/mvdan/xurls",
|
||||
"Comment": "v0.8.0-14-g1b768d7",
|
||||
@ -1511,83 +1600,83 @@
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/opencontainers/runc/libcontainer",
|
||||
"Comment": "v1.0.0-rc1-57-g4eb8c2f",
|
||||
"Rev": "4eb8c2fb1dcb10fa3bf9bd7031f3a25a8ce2fef6"
|
||||
"Comment": "v1.0.0-rc1-79-g0ae6018",
|
||||
"Rev": "0ae6018eb9a3591c856c57c8caa4a6f3e89a2e67"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/opencontainers/runc/libcontainer/apparmor",
|
||||
"Comment": "v1.0.0-rc1-57-g4eb8c2f",
|
||||
"Rev": "4eb8c2fb1dcb10fa3bf9bd7031f3a25a8ce2fef6"
|
||||
"Comment": "v1.0.0-rc1-79-g0ae6018",
|
||||
"Rev": "0ae6018eb9a3591c856c57c8caa4a6f3e89a2e67"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/opencontainers/runc/libcontainer/cgroups",
|
||||
"Comment": "v1.0.0-rc1-57-g4eb8c2f",
|
||||
"Rev": "4eb8c2fb1dcb10fa3bf9bd7031f3a25a8ce2fef6"
|
||||
"Comment": "v1.0.0-rc1-79-g0ae6018",
|
||||
"Rev": "0ae6018eb9a3591c856c57c8caa4a6f3e89a2e67"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/opencontainers/runc/libcontainer/cgroups/fs",
|
||||
"Comment": "v1.0.0-rc1-57-g4eb8c2f",
|
||||
"Rev": "4eb8c2fb1dcb10fa3bf9bd7031f3a25a8ce2fef6"
|
||||
"Comment": "v1.0.0-rc1-79-g0ae6018",
|
||||
"Rev": "0ae6018eb9a3591c856c57c8caa4a6f3e89a2e67"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/opencontainers/runc/libcontainer/cgroups/systemd",
|
||||
"Comment": "v1.0.0-rc1-57-g4eb8c2f",
|
||||
"Rev": "4eb8c2fb1dcb10fa3bf9bd7031f3a25a8ce2fef6"
|
||||
"Comment": "v1.0.0-rc1-79-g0ae6018",
|
||||
"Rev": "0ae6018eb9a3591c856c57c8caa4a6f3e89a2e67"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/opencontainers/runc/libcontainer/configs",
|
||||
"Comment": "v1.0.0-rc1-57-g4eb8c2f",
|
||||
"Rev": "4eb8c2fb1dcb10fa3bf9bd7031f3a25a8ce2fef6"
|
||||
"Comment": "v1.0.0-rc1-79-g0ae6018",
|
||||
"Rev": "0ae6018eb9a3591c856c57c8caa4a6f3e89a2e67"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/opencontainers/runc/libcontainer/configs/validate",
|
||||
"Comment": "v1.0.0-rc1-57-g4eb8c2f",
|
||||
"Rev": "4eb8c2fb1dcb10fa3bf9bd7031f3a25a8ce2fef6"
|
||||
"Comment": "v1.0.0-rc1-79-g0ae6018",
|
||||
"Rev": "0ae6018eb9a3591c856c57c8caa4a6f3e89a2e67"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/opencontainers/runc/libcontainer/criurpc",
|
||||
"Comment": "v1.0.0-rc1-57-g4eb8c2f",
|
||||
"Rev": "4eb8c2fb1dcb10fa3bf9bd7031f3a25a8ce2fef6"
|
||||
"Comment": "v1.0.0-rc1-79-g0ae6018",
|
||||
"Rev": "0ae6018eb9a3591c856c57c8caa4a6f3e89a2e67"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/opencontainers/runc/libcontainer/keys",
|
||||
"Comment": "v1.0.0-rc1-57-g4eb8c2f",
|
||||
"Rev": "4eb8c2fb1dcb10fa3bf9bd7031f3a25a8ce2fef6"
|
||||
"Comment": "v1.0.0-rc1-79-g0ae6018",
|
||||
"Rev": "0ae6018eb9a3591c856c57c8caa4a6f3e89a2e67"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/opencontainers/runc/libcontainer/label",
|
||||
"Comment": "v1.0.0-rc1-57-g4eb8c2f",
|
||||
"Rev": "4eb8c2fb1dcb10fa3bf9bd7031f3a25a8ce2fef6"
|
||||
"Comment": "v1.0.0-rc1-79-g0ae6018",
|
||||
"Rev": "0ae6018eb9a3591c856c57c8caa4a6f3e89a2e67"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/opencontainers/runc/libcontainer/seccomp",
|
||||
"Comment": "v1.0.0-rc1-57-g4eb8c2f",
|
||||
"Rev": "4eb8c2fb1dcb10fa3bf9bd7031f3a25a8ce2fef6"
|
||||
"Comment": "v1.0.0-rc1-79-g0ae6018",
|
||||
"Rev": "0ae6018eb9a3591c856c57c8caa4a6f3e89a2e67"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/opencontainers/runc/libcontainer/selinux",
|
||||
"Comment": "v1.0.0-rc1-57-g4eb8c2f",
|
||||
"Rev": "4eb8c2fb1dcb10fa3bf9bd7031f3a25a8ce2fef6"
|
||||
"Comment": "v1.0.0-rc1-79-g0ae6018",
|
||||
"Rev": "0ae6018eb9a3591c856c57c8caa4a6f3e89a2e67"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/opencontainers/runc/libcontainer/stacktrace",
|
||||
"Comment": "v1.0.0-rc1-57-g4eb8c2f",
|
||||
"Rev": "4eb8c2fb1dcb10fa3bf9bd7031f3a25a8ce2fef6"
|
||||
"Comment": "v1.0.0-rc1-79-g0ae6018",
|
||||
"Rev": "0ae6018eb9a3591c856c57c8caa4a6f3e89a2e67"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/opencontainers/runc/libcontainer/system",
|
||||
"Comment": "v1.0.0-rc1-57-g4eb8c2f",
|
||||
"Rev": "4eb8c2fb1dcb10fa3bf9bd7031f3a25a8ce2fef6"
|
||||
"Comment": "v1.0.0-rc1-79-g0ae6018",
|
||||
"Rev": "0ae6018eb9a3591c856c57c8caa4a6f3e89a2e67"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/opencontainers/runc/libcontainer/user",
|
||||
"Comment": "v1.0.0-rc1-57-g4eb8c2f",
|
||||
"Rev": "4eb8c2fb1dcb10fa3bf9bd7031f3a25a8ce2fef6"
|
||||
"Comment": "v1.0.0-rc1-79-g0ae6018",
|
||||
"Rev": "0ae6018eb9a3591c856c57c8caa4a6f3e89a2e67"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/opencontainers/runc/libcontainer/utils",
|
||||
"Comment": "v1.0.0-rc1-57-g4eb8c2f",
|
||||
"Rev": "4eb8c2fb1dcb10fa3bf9bd7031f3a25a8ce2fef6"
|
||||
"Comment": "v1.0.0-rc1-79-g0ae6018",
|
||||
"Rev": "0ae6018eb9a3591c856c57c8caa4a6f3e89a2e67"
|
||||
},
|
||||
{
|
||||
"ImportPath": "github.com/pborman/uuid",
|
||||
@ -1971,15 +2060,27 @@
|
||||
},
|
||||
{
|
||||
"ImportPath": "golang.org/x/crypto/bcrypt",
|
||||
"Rev": "c84e1f8e3a7e322d497cd16c0e8a13c7e127baf3"
|
||||
"Rev": "1f22c0103821b9390939b6776727195525381532"
|
||||
},
|
||||
{
|
||||
"ImportPath": "golang.org/x/crypto/blowfish",
|
||||
"Rev": "c84e1f8e3a7e322d497cd16c0e8a13c7e127baf3"
|
||||
"Rev": "1f22c0103821b9390939b6776727195525381532"
|
||||
},
|
||||
{
|
||||
"ImportPath": "golang.org/x/crypto/curve25519",
|
||||
"Rev": "1f22c0103821b9390939b6776727195525381532"
|
||||
},
|
||||
{
|
||||
"ImportPath": "golang.org/x/crypto/pkcs12",
|
||||
"Rev": "1f22c0103821b9390939b6776727195525381532"
|
||||
},
|
||||
{
|
||||
"ImportPath": "golang.org/x/crypto/pkcs12/internal/rc2",
|
||||
"Rev": "1f22c0103821b9390939b6776727195525381532"
|
||||
},
|
||||
{
|
||||
"ImportPath": "golang.org/x/crypto/ssh",
|
||||
"Rev": "c84e1f8e3a7e322d497cd16c0e8a13c7e127baf3"
|
||||
"Rev": "1f22c0103821b9390939b6776727195525381532"
|
||||
},
|
||||
{
|
||||
"ImportPath": "golang.org/x/exp/inotify",
|
||||
@ -1987,43 +2088,47 @@
|
||||
},
|
||||
{
|
||||
"ImportPath": "golang.org/x/net/context",
|
||||
"Rev": "62685c2d7ca23c807425dca88b11a3e2323dab41"
|
||||
"Rev": "e90d6d0afc4c315a0d87a568ae68577cc15149a0"
|
||||
},
|
||||
{
|
||||
"ImportPath": "golang.org/x/net/context/ctxhttp",
|
||||
"Rev": "62685c2d7ca23c807425dca88b11a3e2323dab41"
|
||||
"Rev": "e90d6d0afc4c315a0d87a568ae68577cc15149a0"
|
||||
},
|
||||
{
|
||||
"ImportPath": "golang.org/x/net/html",
|
||||
"Rev": "62685c2d7ca23c807425dca88b11a3e2323dab41"
|
||||
"Rev": "e90d6d0afc4c315a0d87a568ae68577cc15149a0"
|
||||
},
|
||||
{
|
||||
"ImportPath": "golang.org/x/net/html/atom",
|
||||
"Rev": "62685c2d7ca23c807425dca88b11a3e2323dab41"
|
||||
"Rev": "e90d6d0afc4c315a0d87a568ae68577cc15149a0"
|
||||
},
|
||||
{
|
||||
"ImportPath": "golang.org/x/net/http2",
|
||||
"Rev": "62685c2d7ca23c807425dca88b11a3e2323dab41"
|
||||
"Rev": "e90d6d0afc4c315a0d87a568ae68577cc15149a0"
|
||||
},
|
||||
{
|
||||
"ImportPath": "golang.org/x/net/http2/hpack",
|
||||
"Rev": "62685c2d7ca23c807425dca88b11a3e2323dab41"
|
||||
"Rev": "e90d6d0afc4c315a0d87a568ae68577cc15149a0"
|
||||
},
|
||||
{
|
||||
"ImportPath": "golang.org/x/net/internal/timeseries",
|
||||
"Rev": "62685c2d7ca23c807425dca88b11a3e2323dab41"
|
||||
"Rev": "e90d6d0afc4c315a0d87a568ae68577cc15149a0"
|
||||
},
|
||||
{
|
||||
"ImportPath": "golang.org/x/net/lex/httplex",
|
||||
"Rev": "e90d6d0afc4c315a0d87a568ae68577cc15149a0"
|
||||
},
|
||||
{
|
||||
"ImportPath": "golang.org/x/net/proxy",
|
||||
"Rev": "62685c2d7ca23c807425dca88b11a3e2323dab41"
|
||||
"Rev": "e90d6d0afc4c315a0d87a568ae68577cc15149a0"
|
||||
},
|
||||
{
|
||||
"ImportPath": "golang.org/x/net/trace",
|
||||
"Rev": "62685c2d7ca23c807425dca88b11a3e2323dab41"
|
||||
"Rev": "e90d6d0afc4c315a0d87a568ae68577cc15149a0"
|
||||
},
|
||||
{
|
||||
"ImportPath": "golang.org/x/net/websocket",
|
||||
"Rev": "62685c2d7ca23c807425dca88b11a3e2323dab41"
|
||||
"Rev": "e90d6d0afc4c315a0d87a568ae68577cc15149a0"
|
||||
},
|
||||
{
|
||||
"ImportPath": "golang.org/x/oauth2",
|
||||
|
||||
1635
Godeps/LICENSES
generated
1635
Godeps/LICENSES
generated
File diff suppressed because it is too large
Load Diff
62
Makefile
62
Makefile
@ -14,7 +14,7 @@
|
||||
|
||||
DBG_MAKEFILE ?=
|
||||
ifeq ($(DBG_MAKEFILE),1)
|
||||
$(warning ***** starting makefile for goal(s) "$(MAKECMDGOALS)")
|
||||
$(warning ***** starting Makefile for goal(s) "$(MAKECMDGOALS)")
|
||||
$(warning ***** $(shell date))
|
||||
else
|
||||
# If we're not debugging the Makefile, don't echo recipes.
|
||||
@ -29,38 +29,29 @@ endif
|
||||
# test: Run tests.
|
||||
# clean: Clean up.
|
||||
|
||||
# It's necessary to set this because some docker images don't make sh -> bash.
|
||||
# It's necessary to set this because some environments don't link sh -> bash.
|
||||
SHELL := /bin/bash
|
||||
|
||||
# We don't need make's built-in rules.
|
||||
MAKEFLAGS += --no-builtin-rules
|
||||
.SUFFIXES:
|
||||
|
||||
# We want make to yell at us if we use undefined variables.
|
||||
MAKEFLAGS += --warn-undefined-variables
|
||||
|
||||
# Constants used throughout.
|
||||
.EXPORT_ALL_VARIABLES:
|
||||
OUT_DIR ?= _output
|
||||
BIN_DIR := $(OUT_DIR)/bin
|
||||
PRJ_SRC_PATH := k8s.io/kubernetes
|
||||
GENERATED_FILE_PREFIX := zz_generated.
|
||||
|
||||
# Metadata for driving the build lives here.
|
||||
META_DIR := .make
|
||||
|
||||
#
|
||||
# Define variables that we use as inputs so we can warn about undefined variables.
|
||||
#
|
||||
KUBE_GOFLAGS := $(GOFLAGS)
|
||||
KUBE_GOLDFLAGS := $(GOLDFLAGS)
|
||||
|
||||
WHAT ?=
|
||||
TESTS ?=
|
||||
|
||||
GOFLAGS ?=
|
||||
KUBE_GOFLAGS = $(GOFLAGS)
|
||||
export KUBE_GOFLAGS GOFLAGS
|
||||
|
||||
GOLDFLAGS ?=
|
||||
KUBE_GOLDFLAGS = $(GOLDFLAGS)
|
||||
export KUBE_GOLDFLAGS GOLDFLAGS
|
||||
GOGCFLAGS ?=
|
||||
KUBE_GOGCFLAGS = $(GOGCFLAGS)
|
||||
export KUBE_GOGCFLAGS GOGCFLAGS
|
||||
|
||||
# Build code.
|
||||
#
|
||||
@ -69,12 +60,17 @@ export KUBE_GOLDFLAGS GOLDFLAGS
|
||||
# package, the build will produce executable files under $(OUT_DIR)/go/bin.
|
||||
# If not specified, "everything" will be built.
|
||||
# GOFLAGS: Extra flags to pass to 'go' when building.
|
||||
# GOLDFLAGS: Extra linking flags to pass to 'go' when building.
|
||||
# GOLDFLAGS: Extra linking flags passed to 'go' when building.
|
||||
# GOGCFLAGS: Additional go compile flags passed to 'go' when building.
|
||||
#
|
||||
# Example:
|
||||
# make
|
||||
# make all
|
||||
# make all WHAT=cmd/kubelet GOFLAGS=-v
|
||||
# make all GOGCFLAGS="-N -l"
|
||||
# Note: Use the -N -l options to disable compiler optimizations an inlining.
|
||||
# Using these build options allows you to subsequently use source
|
||||
# debugging tools like delve.
|
||||
.PHONY: all
|
||||
all: generated_files
|
||||
hack/make-rules/build.sh $(WHAT)
|
||||
@ -90,7 +86,7 @@ ginkgo:
|
||||
# Runs all the presubmission verifications.
|
||||
#
|
||||
# Args:
|
||||
# BRANCH: Branch to be passed to hack/verify-godeps.sh script.
|
||||
# BRANCH: Branch to be passed to verify-godeps.sh script.
|
||||
#
|
||||
# Example:
|
||||
# make verify
|
||||
@ -107,6 +103,7 @@ verify:
|
||||
# TESTS: Same as WHAT.
|
||||
# GOFLAGS: Extra flags to pass to 'go' when building.
|
||||
# GOLDFLAGS: Extra linking flags to pass to 'go' when building.
|
||||
# GOGCFLAGS: Additional go compile flags passed to 'go' when building.
|
||||
#
|
||||
# Example:
|
||||
# make check
|
||||
@ -162,7 +159,7 @@ test-e2e: ginkgo generated_files
|
||||
# have the name "${INSTANCE_PREFIX}-${IMAGE_NAME}". Defaults to "test".
|
||||
#
|
||||
# Example:
|
||||
# make test-e2e-node FOCUS=kubelet SKIP=container
|
||||
# make test-e2e-node FOCUS=Kubelet SKIP=container
|
||||
# make test-e2e-node REMOTE=true DELETE_INSTANCES=true
|
||||
# make test-e2e-node TEST_ARGS="--cgroups-per-qos=true"
|
||||
# Build and run tests.
|
||||
@ -174,7 +171,7 @@ test-e2e-node: ginkgo generated_files
|
||||
#
|
||||
# Example:
|
||||
# make test-cmd
|
||||
test-cmd:
|
||||
test-cmd: generated_files
|
||||
@hack/make-rules/test-cmd.sh
|
||||
.PHONY: test-cmd
|
||||
|
||||
@ -198,6 +195,14 @@ clean: clean_meta
|
||||
clean_meta:
|
||||
rm -rf $(META_DIR)
|
||||
|
||||
# Remove all auto-generated artifacts.
|
||||
#
|
||||
# Example:
|
||||
# make clean_generated
|
||||
.PHONY: clean_generated
|
||||
clean_generated:
|
||||
find . -type f -name $(GENERATED_FILE_PREFIX)\* | xargs rm -f
|
||||
|
||||
# Run 'go vet'.
|
||||
#
|
||||
# Args:
|
||||
@ -217,7 +222,7 @@ vet:
|
||||
# Example:
|
||||
# make release
|
||||
.PHONY: release
|
||||
release: generated_files
|
||||
release:
|
||||
build/release.sh
|
||||
|
||||
# Build a release, but skip tests
|
||||
@ -225,7 +230,7 @@ release: generated_files
|
||||
# Example:
|
||||
# make release-skip-tests
|
||||
.PHONY: release-skip-tests quick-release
|
||||
release-skip-tests quick-release: generated_files
|
||||
release-skip-tests quick-release:
|
||||
KUBE_RELEASE_RUN_TESTS=n KUBE_FASTBUILD=true build/release.sh
|
||||
|
||||
# Cross-compile for all platforms
|
||||
@ -244,5 +249,10 @@ cross:
|
||||
$(notdir $(abspath $(wildcard cmd/*/))): generated_files
|
||||
hack/make-rules/build.sh cmd/$@
|
||||
|
||||
# Include logic for generated files.
|
||||
include Makefile.generated_files
|
||||
# Produce auto-generated files needed for the build.
|
||||
#
|
||||
# Example:
|
||||
# make generated_files
|
||||
.PHONY: generated_files
|
||||
generated_files:
|
||||
$(MAKE) -f Makefile.$@ $@
|
||||
|
||||
@ -12,8 +12,24 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
# Constants used throughout.
|
||||
GENERATED_FILE_PREFIX := zz_generated.
|
||||
# Don't allow an implicit 'all' rule. This is not a user-facing file.
|
||||
ifeq ($(MAKECMDGOALS),)
|
||||
$(error This Makefile requires an explicit rule to be specified)
|
||||
endif
|
||||
|
||||
ifeq ($(DBG_MAKEFILE),1)
|
||||
$(warning ***** starting Makefile.generated_files for goal(s) "$(MAKECMDGOALS)")
|
||||
$(warning ***** $(shell date))
|
||||
endif
|
||||
|
||||
|
||||
# It's necessary to set this because some environments don't link sh -> bash.
|
||||
SHELL := /bin/bash
|
||||
|
||||
# This rule collects all the generated file sets into a single rule. Other
|
||||
# rules should depend on this to ensure generated files are rebuilt.
|
||||
.PHONY: generated_files
|
||||
generated_files: gen_deepcopy gen_conversion
|
||||
|
||||
# Code-generation logic.
|
||||
#
|
||||
@ -92,24 +108,11 @@ GENERATED_FILE_PREFIX := zz_generated.
|
||||
ifeq ($(DBG_MAKEFILE),1)
|
||||
$(warning ***** finding all *.go dirs)
|
||||
endif
|
||||
ALL_GO_DIRS := $(shell \
|
||||
find . \
|
||||
-not \( \
|
||||
\( \
|
||||
-path ./vendor -o \
|
||||
-path ./_\* -o \
|
||||
-path ./.\* -o \
|
||||
-path ./docs -o \
|
||||
-path ./examples \
|
||||
\) -prune \
|
||||
\) \
|
||||
-type f -name \*.go \
|
||||
| sed 's|^./||' \
|
||||
| xargs -n1 dirname \
|
||||
| sort -u \
|
||||
ALL_GO_DIRS := $(shell \
|
||||
hack/make-rules/helpers/cache_go_dirs.sh $(META_DIR)/all_go_dirs.mk \
|
||||
)
|
||||
|
||||
# The name of the make metadata file listing Go files.
|
||||
# The name of the metadata file which lists *.go files in each pkg.
|
||||
GOFILES_META := gofiles.mk
|
||||
|
||||
# Establish a dependency between the deps file and the dir. Whenever a dir
|
||||
@ -139,12 +142,18 @@ $(foreach dir, $(ALL_GO_DIRS), $(eval \
|
||||
# We regenerate the output file in order to satisfy make's "newer than" rules,
|
||||
# but we only need to rebuild targets if the contents actually changed. That
|
||||
# is what the .stamp file represents.
|
||||
$(foreach dir, $(ALL_GO_DIRS), $(META_DIR)/$(dir)/$(GOFILES_META)):
|
||||
$(foreach dir, $(ALL_GO_DIRS), \
|
||||
$(META_DIR)/$(dir)/$(GOFILES_META)):
|
||||
FILES=$$(ls $</*.go | grep --color=never -v $(GENERATED_FILE_PREFIX)); \
|
||||
mkdir -p $(@D); \
|
||||
echo "gofiles__$< := $$(echo $${FILES})" >$@.tmp; \
|
||||
cmp -s $@.tmp $@ || touch $@.stamp; \
|
||||
mv $@.tmp $@
|
||||
# This is required to fill in the DAG, since some cases (e.g. 'make clean all')
|
||||
# will reference the .stamp file when it doesn't exist. We don't need to
|
||||
# rebuild it in that case, just keep make happy.
|
||||
$(foreach dir, $(ALL_GO_DIRS), \
|
||||
$(META_DIR)/$(dir)/$(GOFILES_META).stamp):
|
||||
|
||||
# Include any deps files as additional Makefile rules. This triggers make to
|
||||
# consider the deps files for rebuild, which makes the whole
|
||||
@ -219,7 +228,7 @@ gen_deepcopy: $(DEEPCOPY_FILES)
|
||||
# has changed. This allows us to detect deleted input files.
|
||||
$(foreach dir, $(DEEPCOPY_DIRS), $(eval \
|
||||
$(dir)/$(DEEPCOPY_FILENAME): $(META_DIR)/$(dir)/$(GOFILES_META).stamp \
|
||||
$(gofiles__$(dir)) \
|
||||
$(gofiles__$(dir)) \
|
||||
))
|
||||
|
||||
# Unilaterally remove any leftovers from previous runs.
|
||||
@ -228,6 +237,7 @@ $(shell rm -f $(META_DIR)/$(DEEPCOPY_GEN)*.todo)
|
||||
# How to regenerate deep-copy code. This is a little slow to run, so we batch
|
||||
# it up and trigger the batch from the 'generated_files' target.
|
||||
$(DEEPCOPY_FILES): $(DEEPCOPY_GEN)
|
||||
mkdir -p $$(dirname $(META_DIR)/$(DEEPCOPY_GEN))
|
||||
echo $(PRJ_SRC_PATH)/$(@D) >> $(META_DIR)/$(DEEPCOPY_GEN).todo
|
||||
|
||||
# This calculates the dependencies for the generator tool, so we only rebuild
|
||||
@ -291,7 +301,7 @@ CONVERSION_FILENAME := $(CONVERSION_BASENAME).go
|
||||
# The tool used to generate conversions.
|
||||
CONVERSION_GEN := $(BIN_DIR)/conversion-gen
|
||||
|
||||
# The name of the make metadata file controlling conversions.
|
||||
# The name of the metadata file listing conversion peers for each pkg.
|
||||
CONVERSIONS_META := conversions.mk
|
||||
|
||||
# All directories that request any form of conversion generation.
|
||||
@ -341,8 +351,9 @@ $(foreach dir, $(CONVERSION_DIRS), $(eval \
|
||||
# We regenerate the output file in order to satisfy make's "newer than" rules,
|
||||
# but we only need to rebuild targets if the contents actually changed. That
|
||||
# is what the .stamp file represents.
|
||||
$(foreach dir, $(CONVERSION_DIRS), $(META_DIR)/$(dir)/$(CONVERSIONS_META)):
|
||||
TAGS=$$(grep --color=never -h '^// *+k8s:conversion-gen=' $</*.go \
|
||||
$(foreach dir, $(CONVERSION_DIRS), \
|
||||
$(META_DIR)/$(dir)/$(CONVERSIONS_META)):
|
||||
TAGS=$$(grep --color=never -h '^// *+k8s:conversion-gen=' $</*.go \
|
||||
| cut -f2- -d= \
|
||||
| sed 's|$(PRJ_SRC_PATH)/||'); \
|
||||
mkdir -p $(@D); \
|
||||
@ -407,6 +418,7 @@ $(shell rm -f $(META_DIR)/$(CONVERSION_GEN)*.todo)
|
||||
# How to regenerate conversion code. This is a little slow to run, so we batch
|
||||
# it up and trigger the batch from the 'generated_files' target.
|
||||
$(CONVERSION_FILES): $(CONVERSION_GEN)
|
||||
mkdir -p $$(dirname $(META_DIR)/$(CONVERSION_GEN))
|
||||
echo $(PRJ_SRC_PATH)/$(@D) >> $(META_DIR)/$(CONVERSION_GEN).todo
|
||||
|
||||
# This calculates the dependencies for the generator tool, so we only rebuild
|
||||
@ -446,17 +458,3 @@ sinclude $(META_DIR)/$(CONVERSION_GEN).mk
|
||||
$(CONVERSION_GEN):
|
||||
hack/make-rules/build.sh cmd/libs/go2idl/conversion-gen
|
||||
touch $@
|
||||
|
||||
# This rule collects all the generated file sets into a single dep, which is
|
||||
# defined BELOW the *_FILES variables and leaves higher-level rules clean.
|
||||
# Top-level rules should depend on this to ensure generated files are rebuilt.
|
||||
.PHONY: generated_files
|
||||
generated_files: gen_deepcopy gen_conversion
|
||||
|
||||
# Remove all auto-generated artifacts.
|
||||
#
|
||||
# Example:
|
||||
# make clean_generated
|
||||
.PHONY: clean_generated
|
||||
clean_generated:
|
||||
find . -type f -name $(GENERATED_FILE_PREFIX)\* | xargs rm -f
|
||||
|
||||
@ -141,9 +141,9 @@ If you need support, start with the [troubleshooting guide](docs/troubleshooting
|
||||
|
||||
That said, if you have questions, reach out to us one way or another. We don't bite!
|
||||
|
||||
### Community resources:
|
||||
### Community resources
|
||||
|
||||
* **Awesome-kubernetes**:
|
||||
* **Awesome-kubernetes** - [http://ramitsurana.github.io/awesome-kubernetes](http://ramitsurana.github.io/awesome-kubernetes)
|
||||
|
||||
You can find more projects, tools and articles related to Kubernetes on the [awesome-kubernetes](https://github.com/ramitsurana/awesome-kubernetes) list. Add your project there and help us make it better.
|
||||
|
||||
@ -151,5 +151,8 @@ You can find more projects, tools and articles related to Kubernetes on the [aw
|
||||
|
||||
Instructive & educational resources for the Kubernetes community. By the community.
|
||||
|
||||
* **Community Documentation**
|
||||
|
||||
Here you can learn more about the current happenings in the [kubernetes community](https://github.com/kubernetes/community).
|
||||
|
||||
[]()
|
||||
|
||||
@ -25,6 +25,14 @@
|
||||
"path": "/apis/extensions",
|
||||
"description": "get information of a group"
|
||||
},
|
||||
{
|
||||
"path": "/apis/apps/v1alpha1",
|
||||
"description": "API at /apis/apps/v1alpha1"
|
||||
},
|
||||
{
|
||||
"path": "/apis/apps",
|
||||
"description": "get information of a group"
|
||||
},
|
||||
{
|
||||
"path": "/apis/autoscaling/v1",
|
||||
"description": "API at /apis/autoscaling/v1"
|
||||
@ -45,22 +53,6 @@
|
||||
"path": "/apis/batch",
|
||||
"description": "get information of a group"
|
||||
},
|
||||
{
|
||||
"path": "/apis/policy/v1alpha1",
|
||||
"description": "API at /apis/policy/v1alpha1"
|
||||
},
|
||||
{
|
||||
"path": "/apis/policy",
|
||||
"description": "get information of a group"
|
||||
},
|
||||
{
|
||||
"path": "/apis/apps/v1alpha1",
|
||||
"description": "API at /apis/apps/v1alpha1"
|
||||
},
|
||||
{
|
||||
"path": "/apis/apps",
|
||||
"description": "get information of a group"
|
||||
},
|
||||
{
|
||||
"path": "/apis/certificates/v1alpha1",
|
||||
"description": "API at /apis/certificates/v1alpha1"
|
||||
@ -69,6 +61,14 @@
|
||||
"path": "/apis/certificates",
|
||||
"description": "get information of a group"
|
||||
},
|
||||
{
|
||||
"path": "/apis/policy/v1alpha1",
|
||||
"description": "API at /apis/policy/v1alpha1"
|
||||
},
|
||||
{
|
||||
"path": "/apis/policy",
|
||||
"description": "get information of a group"
|
||||
},
|
||||
{
|
||||
"path": "/apis/rbac.authorization.k8s.io/v1alpha1",
|
||||
"description": "API at /apis/rbac.authorization.k8s.io/v1alpha1"
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
# This file creates a standard build environment for building cross
|
||||
# platform go binary for the architecture kubernetes cares about.
|
||||
|
||||
FROM golang:1.6.2
|
||||
FROM golang:1.6.3
|
||||
|
||||
ENV GOARM 6
|
||||
ENV KUBE_DYNAMIC_CROSSPLATFORMS \
|
||||
|
||||
@ -1 +1 @@
|
||||
v1.6.2-2
|
||||
v1.6.3-0
|
||||
|
||||
@ -45,7 +45,7 @@ readonly KUBE_GCS_DELETE_EXISTING="${KUBE_GCS_DELETE_EXISTING:-n}"
|
||||
|
||||
# Constants
|
||||
readonly KUBE_BUILD_IMAGE_REPO=kube-build
|
||||
readonly KUBE_BUILD_IMAGE_CROSS_TAG="v1.6.2-2"
|
||||
readonly KUBE_BUILD_IMAGE_CROSS_TAG="v1.6.3-0"
|
||||
# KUBE_BUILD_DATA_CONTAINER_NAME=kube-build-data-<hash>"
|
||||
|
||||
# Here we map the output directories across both the local and remote _output
|
||||
@ -173,7 +173,7 @@ function kube::build::docker_available_on_osx() {
|
||||
kube::log::status "Using Docker for MacOS"
|
||||
return 0
|
||||
fi
|
||||
|
||||
|
||||
kube::log::status "No docker host is set. Checking options for setting one..."
|
||||
if [[ -z "$(which docker-machine)" && -z "$(which boot2docker)" ]]; then
|
||||
kube::log::status "It looks like you're running Mac OS X, yet none of Docker for Mac, docker-machine or boot2docker are on the path."
|
||||
|
||||
@ -143,8 +143,8 @@ ENABLE_NODE_PUBLIC_IP=${KUBE_ENABLE_NODE_PUBLIC_IP:-true}
|
||||
|
||||
# OS options for minions
|
||||
KUBE_OS_DISTRIBUTION="${KUBE_OS_DISTRIBUTION:-jessie}"
|
||||
KUBE_MASTER_OS_DISTRIBUTION="${KUBE_OS_DISTRIBUTION}"
|
||||
KUBE_NODE_OS_DISTRIBUTION="${KUBE_OS_DISTRIBUTION}"
|
||||
MASTER_OS_DISTRIBUTION="${KUBE_OS_DISTRIBUTION}"
|
||||
NODE_OS_DISTRIBUTION="${KUBE_OS_DISTRIBUTION}"
|
||||
KUBE_NODE_IMAGE="${KUBE_NODE_IMAGE:-}"
|
||||
COREOS_CHANNEL="${COREOS_CHANNEL:-alpha}"
|
||||
CONTAINER_RUNTIME="${KUBE_CONTAINER_RUNTIME:-docker}"
|
||||
|
||||
@ -129,8 +129,8 @@ ENABLE_NODE_PUBLIC_IP=${KUBE_ENABLE_NODE_PUBLIC_IP:-true}
|
||||
|
||||
# OS options for minions
|
||||
KUBE_OS_DISTRIBUTION="${KUBE_OS_DISTRIBUTION:-jessie}"
|
||||
KUBE_MASTER_OS_DISTRIBUTION="${KUBE_OS_DISTRIBUTION}"
|
||||
KUBE_NODE_OS_DISTRIBUTION="${KUBE_OS_DISTRIBUTION}"
|
||||
MASTER_OS_DISTRIBUTION="${KUBE_OS_DISTRIBUTION}"
|
||||
NODE_OS_DISTRIBUTION="${KUBE_OS_DISTRIBUTION}"
|
||||
KUBE_NODE_IMAGE="${KUBE_NODE_IMAGE:-}"
|
||||
COREOS_CHANNEL="${COREOS_CHANNEL:-alpha}"
|
||||
CONTAINER_RUNTIME="${KUBE_CONTAINER_RUNTIME:-docker}"
|
||||
|
||||
@ -102,6 +102,7 @@ EOF
|
||||
fi
|
||||
|
||||
env-to-grains "runtime_config"
|
||||
env-to-grains "kube_user"
|
||||
}
|
||||
|
||||
salt-node-role() {
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
# exit on any error
|
||||
set -e
|
||||
|
||||
SSH_OPTS="-oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null -oLogLevel=ERROR"
|
||||
SSH_OPTS="-oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null -oLogLevel=ERROR -C"
|
||||
|
||||
# Use the config file specified in $KUBE_CONFIG_FILE, or default to
|
||||
# config-default.sh.
|
||||
|
||||
@ -517,7 +517,7 @@ function build-kube-env {
|
||||
|
||||
local server_binary_tar_url=$SERVER_BINARY_TAR_URL
|
||||
local salt_tar_url=$SALT_TAR_URL
|
||||
local kube_manifests_tar_url=$KUBE_MANIFESTS_TAR_URL
|
||||
local kube_manifests_tar_url="${KUBE_MANIFESTS_TAR_URL:-}"
|
||||
if [[ "${master}" == "true" && "${MASTER_OS_DISTRIBUTION}" == "coreos" ]] || \
|
||||
[[ "${master}" == "false" && "${NODE_OS_DISTRIBUTION}" == "coreos" ]] ; then
|
||||
# TODO: Support fallback .tar.gz settings on CoreOS
|
||||
@ -534,6 +534,7 @@ function build-kube-env {
|
||||
ENV_TIMESTAMP: $(yaml-quote $(date -u +%Y-%m-%dT%T%z))
|
||||
INSTANCE_PREFIX: $(yaml-quote ${INSTANCE_PREFIX})
|
||||
NODE_INSTANCE_PREFIX: $(yaml-quote ${NODE_INSTANCE_PREFIX})
|
||||
NODE_TAGS: $(yaml-quote ${NODE_TAGS:-})
|
||||
CLUSTER_IP_RANGE: $(yaml-quote ${CLUSTER_IP_RANGE:-10.244.0.0/16})
|
||||
SERVER_BINARY_TAR_URL: $(yaml-quote ${server_binary_tar_url})
|
||||
SERVER_BINARY_TAR_HASH: $(yaml-quote ${SERVER_BINARY_TAR_HASH})
|
||||
|
||||
@ -21,6 +21,7 @@ source "${KUBE_ROOT}/cluster/gce/config-common.sh"
|
||||
|
||||
GCLOUD=gcloud
|
||||
ZONE=${KUBE_GCE_ZONE:-us-central1-b}
|
||||
REGION=${ZONE%-*}
|
||||
RELEASE_REGION_FALLBACK=${RELEASE_REGION_FALLBACK:-false}
|
||||
REGIONAL_KUBE_ADDONS=${REGIONAL_KUBE_ADDONS:-true}
|
||||
NODE_SIZE=${NODE_SIZE:-n1-standard-2}
|
||||
|
||||
@ -21,6 +21,7 @@ source "${KUBE_ROOT}/cluster/gce/config-common.sh"
|
||||
|
||||
GCLOUD=gcloud
|
||||
ZONE=${KUBE_GCE_ZONE:-us-central1-b}
|
||||
REGION=${ZONE%-*}
|
||||
RELEASE_REGION_FALLBACK=${RELEASE_REGION_FALLBACK:-false}
|
||||
REGIONAL_KUBE_ADDONS=${REGIONAL_KUBE_ADDONS:-true}
|
||||
NODE_SIZE=${NODE_SIZE:-n1-standard-2}
|
||||
|
||||
@ -166,7 +166,7 @@ download-or-bust() {
|
||||
for url in "${urls[@]}"; do
|
||||
local file="${url##*/}"
|
||||
rm -f "${file}"
|
||||
if ! curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --max-time 80 --retry 6 --retry-delay 10 "${url}"; then
|
||||
if ! curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --max-time 300 --retry 6 --retry-delay 10 "${url}"; then
|
||||
echo "== Failed to download ${url}. Retrying. =="
|
||||
elif [[ -n "${hash}" ]] && ! validate-hash "${file}" "${hash}"; then
|
||||
echo "== Hash validation of ${url} failed. Retrying. =="
|
||||
@ -422,6 +422,7 @@ function create-salt-pillar() {
|
||||
mkdir -p /srv/salt-overlay/pillar
|
||||
cat <<EOF >/srv/salt-overlay/pillar/cluster-params.sls
|
||||
instance_prefix: '$(echo "$INSTANCE_PREFIX" | sed -e "s/'/''/g")'
|
||||
node_tags: '$(echo "$NODE_TAGS" | sed -e "s/'/''/g")'
|
||||
node_instance_prefix: '$(echo "$NODE_INSTANCE_PREFIX" | sed -e "s/'/''/g")'
|
||||
cluster_cidr: '$(echo "$CLUSTER_IP_RANGE" | sed -e "s/'/''/g")'
|
||||
allocate_node_cidrs: '$(echo "$ALLOCATE_NODE_CIDRS" | sed -e "s/'/''/g")'
|
||||
@ -814,8 +815,13 @@ EOF
|
||||
fi
|
||||
|
||||
if [[ -n "${NODE_INSTANCE_PREFIX:-}" ]]; then
|
||||
if [[ -n "${NODE_TAGS:-}" ]]; then
|
||||
local -r node_tags="${NODE_TAGS}"
|
||||
else
|
||||
local -r node_tags="${NODE_INSTANCE_PREFIX}"
|
||||
fi
|
||||
cat <<EOF >>/etc/gce.conf
|
||||
node-tags = ${NODE_INSTANCE_PREFIX}
|
||||
node-tags = ${NODE_TAGS}
|
||||
node-instance-prefix = ${NODE_INSTANCE_PREFIX}
|
||||
EOF
|
||||
CLOUD_CONFIG=/etc/gce.conf
|
||||
@ -898,6 +904,7 @@ EOF
|
||||
fi
|
||||
|
||||
env-to-grains "runtime_config"
|
||||
env-to-grains "kube_user"
|
||||
}
|
||||
|
||||
function salt-node-role() {
|
||||
|
||||
@ -10,8 +10,8 @@ spec:
|
||||
- -c
|
||||
- /usr/local/bin/etcd
|
||||
--listen-peer-urls=http://127.0.0.1:2381
|
||||
--addr=127.0.0.1:4002
|
||||
--bind-addr=127.0.0.1:4002
|
||||
--advertise-client-urls=http://127.0.0.1:4002
|
||||
--listen-client-urls=http://127.0.0.1:4002
|
||||
--data-dir=/var/etcd/data-events
|
||||
1>>/var/log/etcd-events.log 2>&1
|
||||
image: gcr.io/google_containers/etcd:2.2.1
|
||||
|
||||
@ -10,8 +10,8 @@ spec:
|
||||
- -c
|
||||
- /usr/local/bin/etcd
|
||||
--listen-peer-urls=http://127.0.0.1:2380
|
||||
--addr=127.0.0.1:4001
|
||||
--bind-addr=127.0.0.1:4001
|
||||
--advertise-client-urls=http://127.0.0.1:4001
|
||||
--listen-client-urls=http://127.0.0.1:4001
|
||||
--data-dir=/var/etcd/data
|
||||
1>>/var/log/etcd.log 2>&1
|
||||
image: gcr.io/google_containers/etcd:2.2.1
|
||||
|
||||
@ -77,12 +77,21 @@ function setup-logrotate() {
|
||||
compress
|
||||
maxsize 10M
|
||||
daily
|
||||
dateext
|
||||
dateformat -%Y%m%d-%s
|
||||
create 0644 root root
|
||||
}
|
||||
EOF
|
||||
|
||||
# Configuration for k8s services that redirect logs to /var/log/<service>.log
|
||||
# files.
|
||||
# files. Whenever logrotate is ran, this config will:
|
||||
# * rotate the log file if its size is > 100Mb OR if one day has elapsed
|
||||
# * save rotated logs into a gzipped timestamped backup
|
||||
# * log file timestamp (controlled by 'dateformat') includes seconds too. this
|
||||
# ensures that logrotate can generate unique logfiles during each rotation
|
||||
# (otherwise it skips rotation if 'maxsize' is reached multiple times in a
|
||||
# day).
|
||||
# * keep only 5 old (rotated) logs, and will discard older logs.
|
||||
local logrotate_files=( "kube-scheduler" "kube-proxy" "kube-apiserver" "kube-controller-manager" "kube-addons" )
|
||||
for file in "${logrotate_files[@]}" ; do
|
||||
cat > /etc/logrotate.d/${file} <<EOF
|
||||
@ -94,6 +103,8 @@ EOF
|
||||
compress
|
||||
maxsize 100M
|
||||
daily
|
||||
dateext
|
||||
dateformat -%Y%m%d-%s
|
||||
create 0644 root root
|
||||
}
|
||||
EOF
|
||||
@ -189,8 +200,13 @@ EOF
|
||||
fi
|
||||
if [[ -n "${NODE_INSTANCE_PREFIX:-}" ]]; then
|
||||
use_cloud_config="true"
|
||||
if [[ -n "${NODE_TAGS:-}" ]]; then
|
||||
local -r node_tags="${NODE_TAGS}"
|
||||
else
|
||||
local -r node_tags="${NODE_INSTANCE_PREFIX}"
|
||||
fi
|
||||
cat <<EOF >>/etc/gce.conf
|
||||
node-tags = ${NODE_INSTANCE_PREFIX}
|
||||
node-tags = ${node_tags}
|
||||
node-instance-prefix = ${NODE_INSTANCE_PREFIX}
|
||||
EOF
|
||||
fi
|
||||
@ -621,7 +637,12 @@ function start-kube-apiserver {
|
||||
webhook_config_volume="{\"name\": \"webhookconfigmount\",\"hostPath\": {\"path\": \"/etc/gcp_authz.config\"}},"
|
||||
fi
|
||||
local -r src_dir="${KUBE_HOME}/kube-manifests/kubernetes/gci-trusty"
|
||||
cp "${src_dir}/abac-authz-policy.jsonl" /etc/srv/kubernetes/
|
||||
|
||||
local -r abac_policy_json="${src_dir}/abac-authz-policy.jsonl"
|
||||
remove-salt-config-comments "${abac_policy_json}"
|
||||
sed -i -e "s@{{kube_user}}@${KUBE_USER}@g" "${abac_policy_json}"
|
||||
cp "${abac_policy_json}" /etc/srv/kubernetes/
|
||||
|
||||
src_file="${src_dir}/kube-apiserver.manifest"
|
||||
remove-salt-config-comments "${src_file}"
|
||||
# Evaluate variables.
|
||||
|
||||
@ -78,7 +78,7 @@ function download-or-bust {
|
||||
for url in "${urls[@]}"; do
|
||||
local file="${url##*/}"
|
||||
rm -f "${file}"
|
||||
if ! curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --max-time 80 --retry 6 --retry-delay 10 "${url}"; then
|
||||
if ! curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --max-time 300 --retry 6 --retry-delay 10 "${url}"; then
|
||||
echo "== Failed to download ${url}. Retrying. =="
|
||||
elif [[ -n "${hash}" ]] && ! validate-hash "${file}" "${hash}"; then
|
||||
echo "== Hash validation of ${url} failed. Retrying. =="
|
||||
|
||||
@ -332,8 +332,13 @@ EOF
|
||||
fi
|
||||
if [ -n "${NODE_INSTANCE_PREFIX:-}" ]; then
|
||||
use_cloud_config="true"
|
||||
if [[ -n "${NODE_TAGS:-}" ]]; then
|
||||
local -r node_tags="${NODE_TAGS}"
|
||||
else
|
||||
local -r node_tags="${NODE_INSTANCE_PREFIX}"
|
||||
fi
|
||||
cat <<EOF >>/etc/gce.conf
|
||||
node-tags = ${NODE_INSTANCE_PREFIX}
|
||||
node-tags = ${node_tags}
|
||||
node-instance-prefix = ${NODE_INSTANCE_PREFIX}
|
||||
EOF
|
||||
fi
|
||||
@ -537,7 +542,12 @@ start_kube_apiserver() {
|
||||
fi
|
||||
|
||||
src_dir="/home/kubernetes/kube-manifests/kubernetes/gci-trusty"
|
||||
cp "${src_dir}/abac-authz-policy.jsonl" /etc/srv/kubernetes/
|
||||
|
||||
local -r abac_policy_json="${src_dir}/abac-authz-policy.jsonl"
|
||||
remove_salt_config_comments "${abac_policy_json}"
|
||||
sed -i -e "s@{{kube_user}}@${KUBE_USER}@g" "${abac_policy_json}"
|
||||
cp "${abac_policy_json}" /etc/srv/kubernetes/
|
||||
|
||||
src_file="${src_dir}/kube-apiserver.manifest"
|
||||
remove_salt_config_comments "${src_file}"
|
||||
# Evaluate variables
|
||||
|
||||
@ -61,6 +61,9 @@ if [[ "${MASTER_OS_DISTRIBUTION}" == "gci" ]]; then
|
||||
# Otherwise, we respect whatever is set by the user.
|
||||
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-"$(get_latest_gci_image)"}
|
||||
MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers}
|
||||
elif [[ "${MASTER_OS_DISTRIBUTION}" == "debian" ]]; then
|
||||
MASTER_IMAGE=${KUBE_GCE_MASTER_IMAGE:-${CVM_VERSION}}
|
||||
MASTER_IMAGE_PROJECT=${KUBE_GCE_MASTER_PROJECT:-google-containers}
|
||||
fi
|
||||
|
||||
if [[ "${NODE_OS_DISTRIBUTION}" == "gci" ]]; then
|
||||
@ -68,6 +71,9 @@ if [[ "${NODE_OS_DISTRIBUTION}" == "gci" ]]; then
|
||||
# Otherwise, we respect whatever is set by the user.
|
||||
NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-"$(get_latest_gci_image)"}
|
||||
NODE_IMAGE_PROJECT=${KUBE_GCE_NODE_PROJECT:-google-containers}
|
||||
elif [[ "${NODE_OS_DISTRIBUTION}" == "debian" ]]; then
|
||||
NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-${CVM_VERSION}}
|
||||
NODE_IMAGE_PROJECT=${KUBE_GCE_NODE_PROJECT:-google-containers}
|
||||
fi
|
||||
|
||||
# Verfiy cluster autoscaler configuration.
|
||||
@ -83,6 +89,7 @@ if [[ "${ENABLE_CLUSTER_AUTOSCALER}" == "true" ]]; then
|
||||
fi
|
||||
|
||||
NODE_INSTANCE_PREFIX="${INSTANCE_PREFIX}-minion"
|
||||
NODE_TAGS="${NODE_TAG}"
|
||||
|
||||
ALLOCATE_NODE_CIDRS=true
|
||||
|
||||
@ -267,7 +274,9 @@ function upload-server-tars() {
|
||||
|
||||
SERVER_BINARY_TAR_HASH=$(sha1sum-file "${SERVER_BINARY_TAR}")
|
||||
SALT_TAR_HASH=$(sha1sum-file "${SALT_TAR}")
|
||||
KUBE_MANIFESTS_TAR_HASH=$(sha1sum-file "${KUBE_MANIFESTS_TAR}")
|
||||
if [[ -n "${KUBE_MANIFESTS_TAR:-}" ]]; then
|
||||
KUBE_MANIFESTS_TAR_HASH=$(sha1sum-file "${KUBE_MANIFESTS_TAR}")
|
||||
fi
|
||||
|
||||
local server_binary_tar_urls=()
|
||||
local salt_tar_urls=()
|
||||
@ -297,16 +306,19 @@ function upload-server-tars() {
|
||||
# Convert from gs:// URL to an https:// URL
|
||||
server_binary_tar_urls+=("${server_binary_gs_url/gs:\/\//https://storage.googleapis.com/}")
|
||||
salt_tar_urls+=("${salt_gs_url/gs:\/\//https://storage.googleapis.com/}")
|
||||
|
||||
local kube_manifests_gs_url="${staging_path}/${KUBE_MANIFESTS_TAR##*/}"
|
||||
copy-to-staging "${staging_path}" "${kube_manifests_gs_url}" "${KUBE_MANIFESTS_TAR}" "${KUBE_MANIFESTS_TAR_HASH}"
|
||||
# Convert from gs:// URL to an https:// URL
|
||||
kube_manifests_tar_urls+=("${kube_manifests_gs_url/gs:\/\//https://storage.googleapis.com/}")
|
||||
if [[ -n "${KUBE_MANIFESTS_TAR:-}" ]]; then
|
||||
local kube_manifests_gs_url="${staging_path}/${KUBE_MANIFESTS_TAR##*/}"
|
||||
copy-to-staging "${staging_path}" "${kube_manifests_gs_url}" "${KUBE_MANIFESTS_TAR}" "${KUBE_MANIFESTS_TAR_HASH}"
|
||||
# Convert from gs:// URL to an https:// URL
|
||||
kube_manifests_tar_urls+=("${kube_manifests_gs_url/gs:\/\//https://storage.googleapis.com/}")
|
||||
fi
|
||||
done
|
||||
|
||||
SERVER_BINARY_TAR_URL=$(join_csv "${server_binary_tar_urls[@]}")
|
||||
SALT_TAR_URL=$(join_csv "${salt_tar_urls[@]}")
|
||||
KUBE_MANIFESTS_TAR_URL=$(join_csv "${kube_manifests_tar_urls[@]}")
|
||||
if [[ -n "${KUBE_MANIFESTS_TAR:-}" ]]; then
|
||||
KUBE_MANIFESTS_TAR_URL=$(join_csv "${kube_manifests_tar_urls[@]}")
|
||||
fi
|
||||
}
|
||||
|
||||
# Detect minions created in the minion group
|
||||
@ -367,6 +379,7 @@ function detect-nodes () {
|
||||
# Assumed vars:
|
||||
# MASTER_NAME
|
||||
# ZONE
|
||||
# REGION
|
||||
# Vars set:
|
||||
# KUBE_MASTER
|
||||
# KUBE_MASTER_IP
|
||||
@ -374,8 +387,8 @@ function detect-master () {
|
||||
detect-project
|
||||
KUBE_MASTER=${MASTER_NAME}
|
||||
if [[ -z "${KUBE_MASTER_IP-}" ]]; then
|
||||
KUBE_MASTER_IP=$(gcloud compute instances describe --project "${PROJECT}" --zone "${ZONE}" \
|
||||
"${MASTER_NAME}" --format='value(networkInterfaces[0].accessConfigs[0].natIP)')
|
||||
KUBE_MASTER_IP=$(gcloud compute addresses describe "${MASTER_NAME}-ip" \
|
||||
--project "${PROJECT}" --region "${REGION}" -q --format='value(address)')
|
||||
fi
|
||||
if [[ -z "${KUBE_MASTER_IP-}" ]]; then
|
||||
echo "Could not detect Kubernetes master node. Make sure you've launched a cluster with 'kube-up.sh'" >&2
|
||||
@ -597,6 +610,9 @@ function kube-up {
|
||||
if [[ ${KUBE_USE_EXISTING_MASTER:-} == "true" ]]; then
|
||||
parse-master-env
|
||||
create-nodes
|
||||
elif [[ ${KUBE_REPLICATE_EXISTING_MASTER:-} == "true" ]]; then
|
||||
create-loadbalancer
|
||||
# TODO: Add logic for copying an existing master.
|
||||
else
|
||||
check-existing
|
||||
create-network
|
||||
@ -711,10 +727,7 @@ function create-master() {
|
||||
KUBE_PROXY_TOKEN=$(dd if=/dev/urandom bs=128 count=1 2>/dev/null | base64 | tr -d "=+/" | dd bs=32 count=1 2>/dev/null)
|
||||
|
||||
# Reserve the master's IP so that it can later be transferred to another VM
|
||||
# without disrupting the kubelets. IPs are associated with regions, not zones,
|
||||
# so extract the region name, which is the same as the zone but with the final
|
||||
# dash and characters trailing the dash removed.
|
||||
local REGION=${ZONE%-*}
|
||||
# without disrupting the kubelets.
|
||||
create-static-ip "${MASTER_NAME}-ip" "${REGION}"
|
||||
MASTER_RESERVED_IP=$(gcloud compute addresses describe "${MASTER_NAME}-ip" \
|
||||
--project "${PROJECT}" --region "${REGION}" -q --format='value(address)')
|
||||
@ -727,6 +740,83 @@ function create-master() {
|
||||
create-master-instance "${MASTER_RESERVED_IP}" &
|
||||
}
|
||||
|
||||
# Detaches old and ataches new external IP to a VM.
|
||||
#
|
||||
# Arguments:
|
||||
# $1 - VM name
|
||||
# $2 - VM zone
|
||||
# $3 - external static IP; if empty will use an ephemeral IP address.
|
||||
function attach-external-ip() {
|
||||
local NAME=${1}
|
||||
local ZONE=${2}
|
||||
local IP_ADDR=${3:-}
|
||||
local ACCESS_CONFIG_NAME=$(gcloud compute instances describe "${NAME}" \
|
||||
--project "${PROJECT}" --zone "${ZONE}" \
|
||||
--format="value(networkInterfaces[0].accessConfigs[0].name)")
|
||||
gcloud compute instances delete-access-config "${NAME}" \
|
||||
--project "${PROJECT}" --zone "${ZONE}" \
|
||||
--access-config-name "${ACCESS_CONFIG_NAME}"
|
||||
if [[ -z ${IP_ADDR} ]]; then
|
||||
gcloud compute instances add-access-config "${NAME}" \
|
||||
--project "${PROJECT}" --zone "${ZONE}" \
|
||||
--access-config-name "${ACCESS_CONFIG_NAME}"
|
||||
else
|
||||
gcloud compute instances add-access-config "${NAME}" \
|
||||
--project "${PROJECT}" --zone "${ZONE}" \
|
||||
--access-config-name "${ACCESS_CONFIG_NAME}" \
|
||||
--address "${IP_ADDR}"
|
||||
fi
|
||||
}
|
||||
|
||||
# Creates load balancer in front of apiserver if it doesn't exists already. Assumes there's only one
|
||||
# existing master replica.
|
||||
#
|
||||
# Assumes:
|
||||
# PROJECT
|
||||
# MASTER_NAME
|
||||
# ZONE
|
||||
# REGION
|
||||
function create-loadbalancer() {
|
||||
detect-master
|
||||
|
||||
# Step 0: Return early if LB is already configured.
|
||||
if gcloud compute forwarding-rules describe ${MASTER_NAME} \
|
||||
--project "${PROJECT}" --region ${REGION} > /dev/null 2>&1; then
|
||||
echo "Load balancer already exists"
|
||||
return
|
||||
fi
|
||||
local EXISTING_MASTER_ZONE=$(gcloud compute instances list "${MASTER_NAME}" \
|
||||
--project "${PROJECT}" --format="value(zone)")
|
||||
echo "Creating load balancer in front of an already existing master in ${EXISTING_MASTER_ZONE}"
|
||||
|
||||
# Step 1: Detach master IP address and attach ephemeral address to the existing master
|
||||
attach-external-ip ${MASTER_NAME} ${EXISTING_MASTER_ZONE}
|
||||
|
||||
# Step 2: Create target pool.
|
||||
gcloud compute target-pools create "${MASTER_NAME}" --region "${REGION}"
|
||||
# TODO: We should also add master instances with suffixes
|
||||
gcloud compute target-pools add-instances ${MASTER_NAME} --instances ${MASTER_NAME} --zone ${EXISTING_MASTER_ZONE}
|
||||
|
||||
# Step 3: Create forwarding rule.
|
||||
# TODO: This step can take up to 20 min. We need to speed this up...
|
||||
gcloud compute forwarding-rules create ${MASTER_NAME} \
|
||||
--project "${PROJECT}" --region ${REGION} \
|
||||
--target-pool ${MASTER_NAME} --address=${KUBE_MASTER_IP} --ports=443
|
||||
|
||||
echo -n "Waiting for the load balancer configuration to propagate..."
|
||||
local counter=0
|
||||
until $(curl -k -m1 https://${KUBE_MASTER_IP} &> /dev/null); do
|
||||
counter=$((counter+1))
|
||||
echo -n .
|
||||
if [[ ${counter} -ge 1800 ]]; then
|
||||
echo -e "${color_red}TIMEOUT${color_norm}" >&2
|
||||
echo -e "${color_red}Load balancer failed to initialize within ${counter} seconds.${color_norm}" >&2
|
||||
exit 2
|
||||
fi
|
||||
done
|
||||
echo "DONE"
|
||||
}
|
||||
|
||||
function create-nodes-firewall() {
|
||||
# Create a single firewall rule for all minions.
|
||||
create-firewall-rule "${NODE_TAG}-all" "${CLUSTER_IP_RANGE}" "${NODE_TAG}" &
|
||||
@ -1017,6 +1107,58 @@ function kube-down {
|
||||
fi
|
||||
fi
|
||||
|
||||
# Check if this are any remaining master replicas.
|
||||
local REMAINING_MASTER_COUNT=$(gcloud compute instances list \
|
||||
--project "${PROJECT}" \
|
||||
--regexp "${MASTER_NAME}(-...)?" \
|
||||
--format "value(zone)" | wc -l)
|
||||
|
||||
# In the replicated scenario, if there's only a single master left, we should also delete load balancer in front of it.
|
||||
if [[ "${REMAINING_MASTER_COUNT}" == "1" ]]; then
|
||||
if gcloud compute forwarding-rules describe "${MASTER_NAME}" --region "${REGION}" --project "${PROJECT}" &>/dev/null; then
|
||||
detect-master
|
||||
local EXISTING_MASTER_ZONE=$(gcloud compute instances list "${MASTER_NAME}" \
|
||||
--project "${PROJECT}" --format="value(zone)")
|
||||
gcloud compute forwarding-rules delete \
|
||||
--project "${PROJECT}" \
|
||||
--region "${REGION}" \
|
||||
--quiet \
|
||||
"${MASTER_NAME}"
|
||||
attach-external-ip "${MASTER_NAME}" "${EXISTING_MASTER_ZONE}" "${KUBE_MASTER_IP}"
|
||||
gcloud compute target-pools delete \
|
||||
--project "${PROJECT}" \
|
||||
--region "${REGION}" \
|
||||
--quiet \
|
||||
"${MASTER_NAME}"
|
||||
fi
|
||||
fi
|
||||
|
||||
# If there are no more remaining master replicas, we should delete all remaining network resources.
|
||||
if [[ "${REMAINING_MASTER_COUNT}" == "0" ]]; then
|
||||
# Delete firewall rule for the master.
|
||||
if gcloud compute firewall-rules describe --project "${PROJECT}" "${MASTER_NAME}-https" &>/dev/null; then
|
||||
gcloud compute firewall-rules delete \
|
||||
--project "${PROJECT}" \
|
||||
--quiet \
|
||||
"${MASTER_NAME}-https"
|
||||
fi
|
||||
# Delete the master's reserved IP
|
||||
if gcloud compute addresses describe "${MASTER_NAME}-ip" --region "${REGION}" --project "${PROJECT}" &>/dev/null; then
|
||||
gcloud compute addresses delete \
|
||||
--project "${PROJECT}" \
|
||||
--region "${REGION}" \
|
||||
--quiet \
|
||||
"${MASTER_NAME}-ip"
|
||||
fi
|
||||
# Delete firewall rule for minions.
|
||||
if gcloud compute firewall-rules describe --project "${PROJECT}" "${NODE_TAG}-all" &>/dev/null; then
|
||||
gcloud compute firewall-rules delete \
|
||||
--project "${PROJECT}" \
|
||||
--quiet \
|
||||
"${NODE_TAG}-all"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Find out what minions are running.
|
||||
local -a minions
|
||||
minions=( $(gcloud compute instances list \
|
||||
@ -1035,22 +1177,6 @@ function kube-down {
|
||||
minions=( "${minions[@]:${batch}}" )
|
||||
done
|
||||
|
||||
# Delete firewall rule for the master.
|
||||
if gcloud compute firewall-rules describe --project "${PROJECT}" "${MASTER_NAME}-https" &>/dev/null; then
|
||||
gcloud compute firewall-rules delete \
|
||||
--project "${PROJECT}" \
|
||||
--quiet \
|
||||
"${MASTER_NAME}-https"
|
||||
fi
|
||||
|
||||
# Delete firewall rule for minions.
|
||||
if gcloud compute firewall-rules describe --project "${PROJECT}" "${NODE_TAG}-all" &>/dev/null; then
|
||||
gcloud compute firewall-rules delete \
|
||||
--project "${PROJECT}" \
|
||||
--quiet \
|
||||
"${NODE_TAG}-all"
|
||||
fi
|
||||
|
||||
# Delete routes.
|
||||
local -a routes
|
||||
# Clean up all routes w/ names like "<cluster-name>-<node-GUID>"
|
||||
@ -1071,16 +1197,6 @@ function kube-down {
|
||||
routes=( "${routes[@]:${batch}}" )
|
||||
done
|
||||
|
||||
# Delete the master's reserved IP
|
||||
local REGION=${ZONE%-*}
|
||||
if gcloud compute addresses describe "${MASTER_NAME}-ip" --region "${REGION}" --project "${PROJECT}" &>/dev/null; then
|
||||
gcloud compute addresses delete \
|
||||
--project "${PROJECT}" \
|
||||
--region "${REGION}" \
|
||||
--quiet \
|
||||
"${MASTER_NAME}-ip"
|
||||
fi
|
||||
|
||||
# Delete persistent disk for influx-db.
|
||||
if gcloud compute disks describe "${INSTANCE_PREFIX}"-influxdb-pd --zone "${ZONE}" --project "${PROJECT}" &>/dev/null; then
|
||||
gcloud compute disks delete \
|
||||
@ -1090,8 +1206,11 @@ function kube-down {
|
||||
"${INSTANCE_PREFIX}"-influxdb-pd
|
||||
fi
|
||||
|
||||
export CONTEXT="${PROJECT}_${INSTANCE_PREFIX}"
|
||||
clear-kubeconfig
|
||||
# If there are no more remaining master replicas, we should update kubeconfig.
|
||||
if [[ "${REMAINING_MASTER_COUNT}" == "0" ]]; then
|
||||
export CONTEXT="${PROJECT}_${INSTANCE_PREFIX}"
|
||||
clear-kubeconfig
|
||||
fi
|
||||
set -e
|
||||
}
|
||||
|
||||
@ -1112,6 +1231,7 @@ function get-template {
|
||||
# MASTER_NAME
|
||||
# NODE_INSTANCE_PREFIX
|
||||
# ZONE
|
||||
# REGION
|
||||
# Vars set:
|
||||
# KUBE_RESOURCE_FOUND
|
||||
function check-resources {
|
||||
@ -1180,7 +1300,6 @@ function check-resources {
|
||||
return 1
|
||||
fi
|
||||
|
||||
local REGION=${ZONE%-*}
|
||||
if gcloud compute addresses describe --project "${PROJECT}" "${MASTER_NAME}-ip" --region "${REGION}" &>/dev/null; then
|
||||
KUBE_RESOURCE_FOUND="Master's reserved IP"
|
||||
return 1
|
||||
|
||||
@ -17,10 +17,10 @@
|
||||
# Usage:
|
||||
# [TAG=2.2.1] [REGISTRY=gcr.io/google_containers] [ARCH=amd64] [BASEIMAGE=busybox] make (build|push)
|
||||
|
||||
TAG?=2.2.5
|
||||
TAG?=3.0.3
|
||||
ARCH?=amd64
|
||||
REGISTRY?=gcr.io/google_containers
|
||||
GOLANG_VERSION?=1.6.0
|
||||
GOLANG_VERSION?=1.6.3
|
||||
GOARM=6
|
||||
TEMP_DIR:=$(shell mktemp -d)
|
||||
|
||||
@ -49,10 +49,17 @@ else
|
||||
|
||||
# Download etcd in a golang container and cross-compile it statically
|
||||
docker run -it -v $(TEMP_DIR):/etcdbin golang:$(GOLANG_VERSION) /bin/bash -c \
|
||||
"git clone https://github.com/coreos/etcd \
|
||||
&& cd etcd && git checkout v$(TAG) \
|
||||
"git clone https://github.com/coreos/etcd /go/src/github.com/coreos/etcd \
|
||||
&& cd /go/src/github.com/coreos/etcd \
|
||||
&& git checkout v$(TAG) \
|
||||
&& GOARM=$(GOARM) GOARCH=$(ARCH) ./build \
|
||||
&& cp bin/* /etcdbin"
|
||||
&& cp bin/$(ARCH)/* /etcdbin"
|
||||
|
||||
# Add this ENV variable in order to workaround an unsupported arch blocker
|
||||
# The multiarch feature is in an limited and experimental state right now, and etcd should work fine on arm64
|
||||
# On arm (which is 32-bit), it can't handle >1GB data in-memory, but it is very unlikely someone tinkering with their limited arm devices would reach such a high usage
|
||||
# ppc64le is still quite untested, but compiles and is probably in the process of being validated by IBM.
|
||||
cd $(TEMP_DIR) && echo "ENV ETCD_UNSUPPORTED_ARCH=$(ARCH)" >> Dockerfile
|
||||
endif
|
||||
|
||||
# Replace BASEIMAGE with the real base image
|
||||
|
||||
@ -91,11 +91,22 @@ ifeq ($(ARCH),amd64)
|
||||
# Download CNI
|
||||
curl -sSL --retry 5 https://storage.googleapis.com/kubernetes-release/network-plugins/cni-${CNI_RELEASE}.tar.gz | tar -xz -C ${TEMP_DIR}/cni
|
||||
else
|
||||
cd ${TEMP_DIR} && ${SED_CMD} "s/CROSS_BUILD_//g" Dockerfile
|
||||
|
||||
# When cross-building, only the placeholder "CROSS_BUILD_" should be removed
|
||||
# Register /usr/bin/qemu-ARCH-static as the handler for ARM binaries in the kernel
|
||||
docker run --rm --privileged multiarch/qemu-user-static:register --reset
|
||||
curl -sSL --retry 5 https://github.com/multiarch/qemu-user-static/releases/download/v2.5.0/x86_64_qemu-${QEMUARCH}-static.tar.xz | tar -xJ -C ${TEMP_DIR}
|
||||
cd ${TEMP_DIR} && ${SED_CMD} "s/CROSS_BUILD_//g" Dockerfile
|
||||
|
||||
# This cross-compiles cni for the other architectures, until CNI releases binaries for all arches: https://github.com/containernetworking/cni/pull/241
|
||||
docker run -it -v ${TEMP_DIR}/cni:/cnibin golang:1.6 /bin/bash -c "\
|
||||
git clone https://github.com/containernetworking/cni \
|
||||
&& cd cni \
|
||||
&& git checkout $(CNI_RELEASE) \
|
||||
&& curl -sSL https://patch-diff.githubusercontent.com/raw/containernetworking/cni/pull/241.patch > multiarch.patch \
|
||||
&& git apply --exclude=.travis.yml --exclude=scripts/release-with-rkt.sh < multiarch.patch \
|
||||
&& GOARCH=$(ARCH) ./build \
|
||||
&& cp bin/* /cnibin"
|
||||
endif
|
||||
|
||||
docker build -t ${REGISTRY}/hyperkube-${ARCH}:${VERSION} ${TEMP_DIR}
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
"containers": [
|
||||
{
|
||||
"name": "kube-proxy",
|
||||
"image": "gcr.io/google_containers/hyperkube-ARCH:VERSION",
|
||||
"image": "REGISTRY/hyperkube-ARCH:VERSION",
|
||||
"command": [
|
||||
"/hyperkube",
|
||||
"proxy",
|
||||
|
||||
@ -23,6 +23,7 @@ source "${KUBE_ROOT}/cluster/gce/config-common.sh"
|
||||
|
||||
GCLOUD=gcloud
|
||||
ZONE=${KUBE_GCE_ZONE:-us-central1-b}
|
||||
REGION=${ZONE%-*}
|
||||
NUM_NODES=${NUM_NODES:-100}
|
||||
MASTER_SIZE=${MASTER_SIZE:-n1-standard-$(get-master-size)}
|
||||
MASTER_DISK_TYPE=pd-ssd
|
||||
@ -55,6 +56,8 @@ KUBEPROXY_TEST_LOG_LEVEL="${KUBEPROXY_TEST_LOG_LEVEL:-$TEST_CLUSTER_LOG_LEVEL}"
|
||||
TEST_CLUSTER_DELETE_COLLECTION_WORKERS="${TEST_CLUSTER_DELETE_COLLECTION_WORKERS:---delete-collection-workers=16}"
|
||||
TEST_CLUSTER_RESYNC_PERIOD="${TEST_CLUSTER_RESYNC_PERIOD:-}"
|
||||
|
||||
KUBEMARK_MASTER_COMPONENTS_QPS_LIMITS="${KUBEMARK_MASTER_COMPONENTS_QPS_LIMITS:-}"
|
||||
|
||||
# ContentType used by all components to communicate with apiserver.
|
||||
TEST_CLUSTER_API_CONTENT_TYPE="${TEST_CLUSTER_API_CONTENT_TYPE:-}"
|
||||
# ContentType used to store objects in underlying database.
|
||||
@ -62,8 +65,8 @@ TEST_CLUSTER_STORAGE_CONTENT_TYPE="${TEST_CLUSTER_STORAGE_CONTENT_TYPE:-}"
|
||||
|
||||
KUBELET_TEST_ARGS="--max-pods=100 $TEST_CLUSTER_LOG_LEVEL ${TEST_CLUSTER_API_CONTENT_TYPE}"
|
||||
APISERVER_TEST_ARGS="--runtime-config=extensions/v1beta1 ${API_SERVER_TEST_LOG_LEVEL} ${TEST_CLUSTER_STORAGE_CONTENT_TYPE} ${TEST_CLUSTER_DELETE_COLLECTION_WORKERS}"
|
||||
CONTROLLER_MANAGER_TEST_ARGS="${CONTROLLER_MANAGER_TEST_LOG_LEVEL} ${TEST_CLUSTER_RESYNC_PERIOD} ${TEST_CLUSTER_API_CONTENT_TYPE}"
|
||||
SCHEDULER_TEST_ARGS="${SCHEDULER_TEST_LOG_LEVEL} ${TEST_CLUSTER_API_CONTENT_TYPE}"
|
||||
CONTROLLER_MANAGER_TEST_ARGS="${CONTROLLER_MANAGER_TEST_LOG_LEVEL} ${TEST_CLUSTER_RESYNC_PERIOD} ${TEST_CLUSTER_API_CONTENT_TYPE} ${KUBEMARK_MASTER_COMPONENTS_QPS_LIMITS}"
|
||||
SCHEDULER_TEST_ARGS="${SCHEDULER_TEST_LOG_LEVEL} ${TEST_CLUSTER_API_CONTENT_TYPE} ${KUBEMARK_MASTER_COMPONENTS_QPS_LIMITS}"
|
||||
KUBEPROXY_TEST_ARGS="${KUBEPROXY_TEST_LOG_LEVEL} ${TEST_CLUSTER_API_CONTENT_TYPE}"
|
||||
|
||||
SERVICE_CLUSTER_IP_RANGE="10.0.0.0/16" # formerly PORTAL_NET
|
||||
|
||||
@ -24,6 +24,7 @@ write_files:
|
||||
docker_opts: ""
|
||||
master_extra_sans: "DNS:kubernetes,DNS:kubernetes.default,DNS:kubernetes.default.svc,DNS:kubernetes.default.svc.cluster.local,DNS:kubernetes-master"
|
||||
keep_host_etcd: true
|
||||
kube_user: $KUBE_USER
|
||||
- path: /srv/kubernetes/openstack.conf
|
||||
content: |
|
||||
[Global]
|
||||
|
||||
@ -54,7 +54,7 @@ VM_USER=kube
|
||||
# will be reused, and the ssh keys will be different. This prevents us from seeing error
|
||||
# due to this, and it will not save the SSH key to the known_hosts file, so users will
|
||||
# still have standard ssh security checks.
|
||||
SSH_OPTS="-oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null -oLogLevel=ERROR"
|
||||
SSH_OPTS="-oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null -oLogLevel=ERROR -C"
|
||||
|
||||
# Optional: Enable node logging.
|
||||
# Note: currently untested
|
||||
|
||||
@ -29,6 +29,7 @@ grains:
|
||||
cloud: photon-controller
|
||||
master_extra_sans: $MASTER_EXTRA_SANS
|
||||
api_servers: $MASTER_NAME
|
||||
kube_user: $KUBE_USER
|
||||
EOF
|
||||
|
||||
# Auto accept all keys from minions that try to join
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
"command": [
|
||||
"/bin/sh",
|
||||
"-c",
|
||||
"/usr/local/bin/etcd --listen-peer-urls http://127.0.0.1:{{ server_port }} --addr 127.0.0.1:{{ port }} --bind-addr 127.0.0.1:{{ port }} --data-dir /var/etcd/data{{ suffix }} 1>>/var/log/etcd{{ suffix }}.log 2>&1"
|
||||
"/usr/local/bin/etcd --listen-peer-urls http://127.0.0.1:{{ server_port }} --advertise-client-urls http://127.0.0.1:{{ port }} --listen-client-urls http://127.0.0.1:{{ port }} --data-dir /var/etcd/data{{ suffix }} 1>>/var/log/etcd{{ suffix }}.log 2>&1"
|
||||
],
|
||||
"livenessProbe": {
|
||||
"httpGet": {
|
||||
|
||||
@ -79,7 +79,7 @@
|
||||
"command": [
|
||||
"/bin/sh",
|
||||
"-c",
|
||||
"/usr/local/bin/etcd --listen-peer-urls http://127.0.0.1:{{ etcd_peer_port }} --addr 127.0.0.1:{{ etcd_port }} --bind-addr 127.0.0.1:{{ etcd_port }} --data-dir /var/etcd-flannel/data 1>>/var/log/etcd_flannel.log 2>&1"
|
||||
"/usr/local/bin/etcd --listen-peer-urls http://127.0.0.1:{{ etcd_peer_port }} --advertise-client-urls http://127.0.0.1:{{ etcd_port }} --listen-client-urls http://127.0.0.1:{{ etcd_port }} --data-dir /var/etcd-flannel/data 1>>/var/log/etcd_flannel.log 2>&1"
|
||||
],
|
||||
"livenessProbe": {
|
||||
"httpGet": {
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
{% set kube_user = grains.kube_user -%}
|
||||
{"apiVersion": "abac.authorization.kubernetes.io/v1beta1", "kind": "Policy", "spec": {"user":"admin", "namespace": "*", "resource": "*", "apiGroup": "*", "nonResourcePath": "*"}}
|
||||
{"apiVersion": "abac.authorization.kubernetes.io/v1beta1", "kind": "Policy", "spec": {"user":"{{kube_user}}", "namespace": "*", "resource": "*", "apiGroup": "*", "nonResourcePath": "*"}}
|
||||
{"apiVersion": "abac.authorization.kubernetes.io/v1beta1", "kind": "Policy", "spec": {"user":"kubelet", "namespace": "*", "resource": "*", "apiGroup": "*", "nonResourcePath": "*"}}
|
||||
{"apiVersion": "abac.authorization.kubernetes.io/v1beta1", "kind": "Policy", "spec": {"user":"kube_proxy", "namespace": "*", "resource": "*", "apiGroup": "*", "nonResourcePath": "*"}}
|
||||
{"apiVersion": "abac.authorization.kubernetes.io/v1beta1", "kind": "Policy", "spec": {"user":"kubecfg", "namespace": "*", "resource": "*", "apiGroup": "*", "nonResourcePath": "*"}}
|
||||
|
||||
@ -19,6 +19,7 @@
|
||||
/srv/kubernetes/abac-authz-policy.jsonl:
|
||||
file.managed:
|
||||
- source: salt://kube-apiserver/abac-authz-policy.jsonl
|
||||
- template: jinja
|
||||
- user: root
|
||||
- group: root
|
||||
- mode: 600
|
||||
|
||||
@ -6,6 +6,8 @@
|
||||
compress
|
||||
maxsize 100M
|
||||
daily
|
||||
dateext
|
||||
dateformat -%Y%m%d-%s
|
||||
create 0644 root root
|
||||
}
|
||||
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
# must implement to use cluster/kube-*.sh scripts.
|
||||
set -e
|
||||
|
||||
SSH_OPTS="-oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null -oLogLevel=ERROR"
|
||||
SSH_OPTS="-oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null -oLogLevel=ERROR -C"
|
||||
|
||||
MASTER=""
|
||||
MASTER_IP=""
|
||||
|
||||
@ -90,6 +90,7 @@ grains:
|
||||
docker_opts: '$(echo "$DOCKER_OPTS" | sed -e "s/'/''/g")'
|
||||
master_extra_sans: '$(echo "$MASTER_EXTRA_SANS" | sed -e "s/'/''/g")'
|
||||
keep_host_etcd: true
|
||||
kube_user: '$(echo "$KUBE_USER" | sed -e "s/'/''/g")'
|
||||
EOF
|
||||
}
|
||||
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
SSH_OPTS="-oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null -oLogLevel=ERROR"
|
||||
SSH_OPTS="-oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null -oLogLevel=ERROR -C"
|
||||
|
||||
# These need to be set
|
||||
#export GOVC_URL=
|
||||
|
||||
@ -28,6 +28,7 @@ grains:
|
||||
cbr-cidr: $MASTER_IP_RANGE
|
||||
cloud: vsphere
|
||||
master_extra_sans: $MASTER_EXTRA_SANS
|
||||
kube_user: $KUBE_USER
|
||||
EOF
|
||||
|
||||
# Auto accept all keys from minions that try to join
|
||||
|
||||
@ -20,7 +20,6 @@ import (
|
||||
"fmt"
|
||||
"io"
|
||||
"os"
|
||||
"runtime"
|
||||
|
||||
kruntime "k8s.io/kubernetes/pkg/runtime"
|
||||
|
||||
@ -35,7 +34,6 @@ var (
|
||||
)
|
||||
|
||||
func main() {
|
||||
runtime.GOMAXPROCS(runtime.NumCPU())
|
||||
flag.Parse()
|
||||
|
||||
if *typeSrc == "" {
|
||||
|
||||
@ -26,7 +26,6 @@ import (
|
||||
"io/ioutil"
|
||||
"os"
|
||||
"path"
|
||||
"runtime"
|
||||
|
||||
"k8s.io/kubernetes/pkg/util"
|
||||
utilflag "k8s.io/kubernetes/pkg/util/flag"
|
||||
@ -188,7 +187,6 @@ func (hk *HyperKube) Run(args []string) error {
|
||||
|
||||
// RunToExit will run the hyperkube and then call os.Exit with an appropriate exit code.
|
||||
func (hk *HyperKube) RunToExit(args []string) {
|
||||
runtime.GOMAXPROCS(runtime.NumCPU())
|
||||
err := hk.Run(args)
|
||||
if err != nil {
|
||||
fmt.Fprint(os.Stderr, err.Error())
|
||||
|
||||
@ -17,15 +17,14 @@ limitations under the License.
|
||||
package main
|
||||
|
||||
import (
|
||||
"github.com/docker/docker/pkg/term"
|
||||
"os"
|
||||
|
||||
"k8s.io/kubernetes/pkg/kubectl/cmd"
|
||||
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
|
||||
)
|
||||
|
||||
func NewKubectlServer() *Server {
|
||||
// need to use term.StdStreams to get the right IO refs on Windows
|
||||
stdin, stdout, stderr := term.StdStreams()
|
||||
cmd := cmd.NewKubectlCommand(cmdutil.NewFactory(nil), stdin, stdout, stderr)
|
||||
cmd := cmd.NewKubectlCommand(cmdutil.NewFactory(nil), os.Stdin, os.Stdout, os.Stderr)
|
||||
localFlags := cmd.LocalFlags()
|
||||
localFlags.SetInterspersed(false)
|
||||
|
||||
|
||||
@ -22,7 +22,6 @@ import (
|
||||
"fmt"
|
||||
"math/rand"
|
||||
"os"
|
||||
"runtime"
|
||||
"time"
|
||||
|
||||
"k8s.io/kubernetes/cmd/kube-apiserver/app"
|
||||
@ -35,7 +34,6 @@ import (
|
||||
)
|
||||
|
||||
func main() {
|
||||
runtime.GOMAXPROCS(runtime.NumCPU())
|
||||
rand.Seed(time.Now().UTC().UnixNano())
|
||||
|
||||
s := options.NewAPIServer()
|
||||
|
||||
@ -65,24 +65,64 @@ func (s *APIServer) AddFlags(fs *pflag.FlagSet) {
|
||||
s.ServerRunOptions.AddFlags(fs)
|
||||
// Note: the weird ""+ in below lines seems to be the only way to get gofmt to
|
||||
// arrange these text blocks sensibly. Grrr.
|
||||
fs.DurationVar(&s.EventTTL, "event-ttl", s.EventTTL, "Amount of time to retain events. Default 1 hour.")
|
||||
fs.StringVar(&s.ServiceAccountKeyFile, "service-account-key-file", s.ServiceAccountKeyFile, "File containing PEM-encoded x509 RSA private or public key, used to verify ServiceAccount tokens. If unspecified, --tls-private-key-file is used.")
|
||||
fs.BoolVar(&s.ServiceAccountLookup, "service-account-lookup", s.ServiceAccountLookup, "If true, validate ServiceAccount tokens exist in etcd as part of authentication.")
|
||||
fs.StringVar(&s.WebhookTokenAuthnConfigFile, "authentication-token-webhook-config-file", s.WebhookTokenAuthnConfigFile, "File with webhook configuration for token authentication in kubeconfig format. The API server will query the remote service to determine authentication for bearer tokens.")
|
||||
fs.DurationVar(&s.WebhookTokenAuthnCacheTTL, "authentication-token-webhook-cache-ttl", s.WebhookTokenAuthnCacheTTL, "The duration to cache responses from the webhook token authenticator. Default is 2m")
|
||||
fs.BoolVar(&s.AllowPrivileged, "allow-privileged", s.AllowPrivileged, "If true, allow privileged containers.")
|
||||
fs.StringVar(&s.SSHUser, "ssh-user", s.SSHUser, "If non-empty, use secure SSH proxy to the nodes, using this user name")
|
||||
fs.StringVar(&s.SSHKeyfile, "ssh-keyfile", s.SSHKeyfile, "If non-empty, use secure SSH proxy to the nodes, using this user keyfile")
|
||||
fs.Int64Var(&s.MaxConnectionBytesPerSec, "max-connection-bytes-per-sec", s.MaxConnectionBytesPerSec, "If non-zero, throttle each user connection to this number of bytes/sec. Currently only applies to long-running requests")
|
||||
|
||||
fs.DurationVar(&s.EventTTL, "event-ttl", s.EventTTL,
|
||||
"Amount of time to retain events. Default is 1h.")
|
||||
|
||||
fs.StringVar(&s.ServiceAccountKeyFile, "service-account-key-file", s.ServiceAccountKeyFile, ""+
|
||||
"File containing PEM-encoded x509 RSA private or public key, used to verify "+
|
||||
"ServiceAccount tokens. If unspecified, --tls-private-key-file is used.")
|
||||
|
||||
fs.BoolVar(&s.ServiceAccountLookup, "service-account-lookup", s.ServiceAccountLookup,
|
||||
"If true, validate ServiceAccount tokens exist in etcd as part of authentication.")
|
||||
|
||||
fs.StringVar(&s.WebhookTokenAuthnConfigFile, "authentication-token-webhook-config-file", s.WebhookTokenAuthnConfigFile, ""+
|
||||
"File with webhook configuration for token authentication in kubeconfig format. "+
|
||||
"The API server will query the remote service to determine authentication for bearer tokens.")
|
||||
|
||||
fs.DurationVar(&s.WebhookTokenAuthnCacheTTL, "authentication-token-webhook-cache-ttl", s.WebhookTokenAuthnCacheTTL,
|
||||
"The duration to cache responses from the webhook token authenticator. Default is 2m.")
|
||||
|
||||
fs.BoolVar(&s.AllowPrivileged, "allow-privileged", s.AllowPrivileged,
|
||||
"If true, allow privileged containers.")
|
||||
|
||||
fs.StringVar(&s.SSHUser, "ssh-user", s.SSHUser,
|
||||
"If non-empty, use secure SSH proxy to the nodes, using this user name")
|
||||
|
||||
fs.StringVar(&s.SSHKeyfile, "ssh-keyfile", s.SSHKeyfile,
|
||||
"If non-empty, use secure SSH proxy to the nodes, using this user keyfile")
|
||||
|
||||
fs.Int64Var(&s.MaxConnectionBytesPerSec, "max-connection-bytes-per-sec", s.MaxConnectionBytesPerSec, ""+
|
||||
"If non-zero, throttle each user connection to this number of bytes/sec. "+
|
||||
"Currently only applies to long-running requests.")
|
||||
|
||||
// Kubelet related flags:
|
||||
fs.BoolVar(&s.KubeletConfig.EnableHttps, "kubelet-https", s.KubeletConfig.EnableHttps, "Use https for kubelet connections")
|
||||
fs.UintVar(&s.KubeletConfig.Port, "kubelet-port", s.KubeletConfig.Port, "Kubelet port")
|
||||
fs.MarkDeprecated("kubelet-port", "kubelet-port is deprecated and will be removed")
|
||||
fs.DurationVar(&s.KubeletConfig.HTTPTimeout, "kubelet-timeout", s.KubeletConfig.HTTPTimeout, "Timeout for kubelet operations")
|
||||
fs.StringVar(&s.KubeletConfig.CertFile, "kubelet-client-certificate", s.KubeletConfig.CertFile, "Path to a client cert file for TLS.")
|
||||
fs.StringVar(&s.KubeletConfig.KeyFile, "kubelet-client-key", s.KubeletConfig.KeyFile, "Path to a client key file for TLS.")
|
||||
fs.StringVar(&s.KubeletConfig.CAFile, "kubelet-certificate-authority", s.KubeletConfig.CAFile, "Path to a cert. file for the certificate authority.")
|
||||
fs.BoolVar(&s.KubeletConfig.EnableHttps, "kubelet-https", s.KubeletConfig.EnableHttps,
|
||||
"Use https for kubelet connections.")
|
||||
|
||||
fs.UintVar(&s.KubeletConfig.Port, "kubelet-port", s.KubeletConfig.Port,
|
||||
"DEPRECATED: kubelet port.")
|
||||
fs.MarkDeprecated("kubelet-port", "kubelet-port is deprecated and will be removed.")
|
||||
|
||||
fs.DurationVar(&s.KubeletConfig.HTTPTimeout, "kubelet-timeout", s.KubeletConfig.HTTPTimeout,
|
||||
"Timeout for kubelet operations.")
|
||||
|
||||
fs.StringVar(&s.KubeletConfig.CertFile, "kubelet-client-certificate", s.KubeletConfig.CertFile,
|
||||
"Path to a client cert file for TLS.")
|
||||
|
||||
fs.StringVar(&s.KubeletConfig.KeyFile, "kubelet-client-key", s.KubeletConfig.KeyFile,
|
||||
"Path to a client key file for TLS.")
|
||||
|
||||
fs.StringVar(&s.KubeletConfig.CAFile, "kubelet-certificate-authority", s.KubeletConfig.CAFile,
|
||||
"Path to a cert file for the certificate authority.")
|
||||
|
||||
// TODO: delete this flag as soon as we identify and fix all clients that send malformed updates, like #14126.
|
||||
fs.BoolVar(&validation.RepairMalformedUpdates, "repair-malformed-updates", validation.RepairMalformedUpdates, "If true, server will do its best to fix the update request to pass the validation, e.g., setting empty UID in update request to its existing value. This flag can be turned off after we fix all the clients that send malformed updates.")
|
||||
fs.BoolVar(®istry.EnableGarbageCollector, "enable-garbage-collector", false, "Enables the generic garbage collector. MUST be synced with the corresponding flag of the kube-controller-manager.")
|
||||
fs.BoolVar(&validation.RepairMalformedUpdates, "repair-malformed-updates", validation.RepairMalformedUpdates, ""+
|
||||
"If true, server will do its best to fix the update request to pass the validation, "+
|
||||
"e.g., setting empty UID in update request to its existing value. This flag can be turned off "+
|
||||
"after we fix all the clients that send malformed updates.")
|
||||
|
||||
fs.BoolVar(®istry.EnableGarbageCollector, "enable-garbage-collector", false, ""+
|
||||
"Enables the generic garbage collector. MUST be synced with the corresponding flag "+
|
||||
"of the kube-controller-manager.")
|
||||
}
|
||||
|
||||
@ -25,6 +25,7 @@ import (
|
||||
"net/url"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/golang/glog"
|
||||
"github.com/spf13/cobra"
|
||||
@ -41,6 +42,7 @@ import (
|
||||
"k8s.io/kubernetes/pkg/apiserver/authenticator"
|
||||
"k8s.io/kubernetes/pkg/capabilities"
|
||||
"k8s.io/kubernetes/pkg/cloudprovider"
|
||||
"k8s.io/kubernetes/pkg/controller/framework/informers"
|
||||
serviceaccountcontroller "k8s.io/kubernetes/pkg/controller/serviceaccount"
|
||||
"k8s.io/kubernetes/pkg/genericapiserver"
|
||||
kubeletclient "k8s.io/kubernetes/pkg/kubelet/client"
|
||||
@ -56,6 +58,7 @@ import (
|
||||
"k8s.io/kubernetes/pkg/registry/rolebinding"
|
||||
rolebindingetcd "k8s.io/kubernetes/pkg/registry/rolebinding/etcd"
|
||||
"k8s.io/kubernetes/pkg/serviceaccount"
|
||||
"k8s.io/kubernetes/pkg/util/wait"
|
||||
)
|
||||
|
||||
// NewAPIServerCommand creates a *cobra.Command object with default parameters
|
||||
@ -129,7 +132,7 @@ func Run(s *options.APIServer) error {
|
||||
|
||||
kubeletClient, err := kubeletclient.NewStaticKubeletClient(&s.KubeletConfig)
|
||||
if err != nil {
|
||||
glog.Fatalf("Failure to start kubelet client: %v", err)
|
||||
glog.Fatalf("Failed to start kubelet client: %v", err)
|
||||
}
|
||||
|
||||
storageGroupsToEncodingVersion, err := s.StorageGroupsToEncodingVersion()
|
||||
@ -243,7 +246,13 @@ func Run(s *options.APIServer) error {
|
||||
if err != nil {
|
||||
glog.Errorf("Failed to create clientset: %v", err)
|
||||
}
|
||||
admissionController := admission.NewFromPlugins(client, admissionControlPluginNames, s.AdmissionControlConfigFile)
|
||||
sharedInformers := informers.NewSharedInformerFactory(client, 10*time.Minute)
|
||||
pluginInitializer := admission.NewPluginInitializer(sharedInformers)
|
||||
|
||||
admissionController, err := admission.NewFromPlugins(client, admissionControlPluginNames, s.AdmissionControlConfigFile, pluginInitializer)
|
||||
if err != nil {
|
||||
glog.Fatalf("Failed to initialize plugins: %v", err)
|
||||
}
|
||||
|
||||
genericConfig := genericapiserver.NewConfig(s.ServerRunOptions)
|
||||
// TODO: Move the following to generic api server as well.
|
||||
@ -278,6 +287,7 @@ func Run(s *options.APIServer) error {
|
||||
return err
|
||||
}
|
||||
|
||||
sharedInformers.Start(wait.NeverStop)
|
||||
m.Run(s.ServerRunOptions)
|
||||
return nil
|
||||
}
|
||||
|
||||
@ -46,6 +46,7 @@ import (
|
||||
"k8s.io/kubernetes/pkg/client/unversioned/clientcmd"
|
||||
"k8s.io/kubernetes/pkg/cloudprovider"
|
||||
"k8s.io/kubernetes/pkg/controller"
|
||||
certcontroller "k8s.io/kubernetes/pkg/controller/certificates"
|
||||
"k8s.io/kubernetes/pkg/controller/daemon"
|
||||
"k8s.io/kubernetes/pkg/controller/deployment"
|
||||
endpointcontroller "k8s.io/kubernetes/pkg/controller/endpoint"
|
||||
@ -143,6 +144,7 @@ func Run(s *options.CMServer) error {
|
||||
mux.HandleFunc("/debug/pprof/profile", pprof.Profile)
|
||||
mux.HandleFunc("/debug/pprof/symbol", pprof.Symbol)
|
||||
}
|
||||
configz.InstallHandler(mux)
|
||||
mux.Handle("/metrics", prometheus.Handler())
|
||||
|
||||
server := &http.Server{
|
||||
@ -264,10 +266,8 @@ func StartControllers(s *options.CMServer, kubeClient *client.Client, kubeconfig
|
||||
routeController.Run(s.NodeSyncPeriod.Duration)
|
||||
time.Sleep(wait.Jitter(s.ControllerStartInterval.Duration, ControllerStartJitter))
|
||||
}
|
||||
} else if s.ConfigureCloudRoutes && !s.AllocateNodeCIDRs {
|
||||
glog.Warningf("allocate-node-cidrs set to %v, will not configure cloud provider routes.", s.AllocateNodeCIDRs)
|
||||
} else if s.AllocateNodeCIDRs && !s.ConfigureCloudRoutes {
|
||||
glog.Infof("configure-cloud-routes is set to %v, will not configure cloud provider routes.", s.ConfigureCloudRoutes)
|
||||
} else {
|
||||
glog.Infof("Will not configure cloud provider routes for allocate-node-cidrs: %v, configure-cloud-routes: %v.", s.AllocateNodeCIDRs, s.ConfigureCloudRoutes)
|
||||
}
|
||||
|
||||
resourceQuotaControllerClient := clientset.NewForConfigOrDie(restclient.AddUserAgent(kubeconfig, "resourcequota-controller"))
|
||||
@ -365,7 +365,7 @@ func StartControllers(s *options.CMServer, kubeClient *client.Client, kubeconfig
|
||||
|
||||
if containsResource(resources, "replicasets") {
|
||||
glog.Infof("Starting ReplicaSet controller")
|
||||
go replicaset.NewReplicaSetController(clientset.NewForConfigOrDie(restclient.AddUserAgent(kubeconfig, "replicaset-controller")), ResyncPeriod(s), replicaset.BurstReplicas, int(s.LookupCacheSizeForRS)).
|
||||
go replicaset.NewReplicaSetController(podInformer, clientset.NewForConfigOrDie(restclient.AddUserAgent(kubeconfig, "replicaset-controller")), ResyncPeriod(s), replicaset.BurstReplicas, int(s.LookupCacheSizeForRS), s.EnableGarbageCollector).
|
||||
Run(int(s.ConcurrentRSSyncs), wait.NeverStop)
|
||||
time.Sleep(wait.Jitter(s.ControllerStartInterval.Duration, ControllerStartJitter))
|
||||
}
|
||||
@ -391,7 +391,7 @@ func StartControllers(s *options.CMServer, kubeClient *client.Client, kubeconfig
|
||||
|
||||
provisioner, err := NewVolumeProvisioner(cloud, s.VolumeConfiguration)
|
||||
if err != nil {
|
||||
glog.Fatal("A Provisioner could not be created, but one was expected. Provisioning will not work. This functionality is considered an early Alpha version.")
|
||||
glog.Fatalf("A Provisioner could not be created: %v, but one was expected. Provisioning will not work. This functionality is considered an early Alpha version.", err)
|
||||
}
|
||||
|
||||
volumeController := persistentvolumecontroller.NewPersistentVolumeController(
|
||||
@ -418,9 +418,31 @@ func StartControllers(s *options.CMServer, kubeClient *client.Client, kubeconfig
|
||||
ProbeAttachableVolumePlugins(s.VolumeConfiguration))
|
||||
if attachDetachControllerErr != nil {
|
||||
glog.Fatalf("Failed to start attach/detach controller: %v", attachDetachControllerErr)
|
||||
} else {
|
||||
go attachDetachController.Run(wait.NeverStop)
|
||||
time.Sleep(wait.Jitter(s.ControllerStartInterval.Duration, ControllerStartJitter))
|
||||
}
|
||||
go attachDetachController.Run(wait.NeverStop)
|
||||
time.Sleep(wait.Jitter(s.ControllerStartInterval.Duration, ControllerStartJitter))
|
||||
|
||||
groupVersion = "certificates/v1alpha1"
|
||||
resources, found = resourceMap[groupVersion]
|
||||
glog.Infof("Attempting to start certificates, full resource map %+v", resourceMap)
|
||||
if containsVersion(versions, groupVersion) && found {
|
||||
glog.Infof("Starting %s apis", groupVersion)
|
||||
if containsResource(resources, "certificatesigningrequests") {
|
||||
glog.Infof("Starting certificate request controller")
|
||||
resyncPeriod := ResyncPeriod(s)()
|
||||
certController, err := certcontroller.NewCertificateController(
|
||||
clientset.NewForConfigOrDie(restclient.AddUserAgent(kubeconfig, "certificate-controller")),
|
||||
resyncPeriod,
|
||||
s.ClusterSigningCertFile,
|
||||
s.ClusterSigningKeyFile,
|
||||
)
|
||||
if err != nil {
|
||||
glog.Errorf("Failed to start certificate controller: %v", err)
|
||||
} else {
|
||||
go certController.Run(1, wait.NeverStop)
|
||||
}
|
||||
time.Sleep(wait.Jitter(s.ControllerStartInterval.Duration, ControllerStartJitter))
|
||||
}
|
||||
}
|
||||
|
||||
var rootCA []byte
|
||||
@ -468,9 +490,8 @@ func StartControllers(s *options.CMServer, kubeClient *client.Client, kubeconfig
|
||||
clientPool := dynamic.NewClientPool(restclient.AddUserAgent(kubeconfig, "generic-garbage-collector"), dynamic.LegacyAPIPathResolverFunc)
|
||||
garbageCollector, err := garbagecollector.NewGarbageCollector(clientPool, groupVersionResources)
|
||||
if err != nil {
|
||||
glog.Errorf("Failed to start the generic garbage collector")
|
||||
glog.Errorf("Failed to start the generic garbage collector: %v", err)
|
||||
} else {
|
||||
// TODO: make this a flag of kube-controller-manager
|
||||
workers := int(s.ConcurrentGCSyncs)
|
||||
go garbageCollector.Run(workers, wait.NeverStop)
|
||||
}
|
||||
|
||||
@ -93,8 +93,11 @@ func NewCMServer() *CMServer {
|
||||
ControllerStartInterval: unversioned.Duration{Duration: 0 * time.Second},
|
||||
EnableGarbageCollector: false,
|
||||
ConcurrentGCSyncs: 5,
|
||||
ClusterSigningCertFile: "/etc/kubernetes/ca/ca.pem",
|
||||
ClusterSigningKeyFile: "/etc/kubernetes/ca/ca.key",
|
||||
},
|
||||
}
|
||||
s.LeaderElection.LeaderElect = true
|
||||
return &s
|
||||
}
|
||||
|
||||
@ -150,6 +153,8 @@ func (s *CMServer) AddFlags(fs *pflag.FlagSet) {
|
||||
fs.DurationVar(&s.NodeMonitorPeriod.Duration, "node-monitor-period", s.NodeMonitorPeriod.Duration,
|
||||
"The period for syncing NodeStatus in NodeController.")
|
||||
fs.StringVar(&s.ServiceAccountKeyFile, "service-account-private-key-file", s.ServiceAccountKeyFile, "Filename containing a PEM-encoded private RSA key used to sign service account tokens.")
|
||||
fs.StringVar(&s.ClusterSigningCertFile, "cluster-signing-cert-file", s.ClusterSigningCertFile, "Filename containing a PEM-encoded X509 CA certificate used to issue cluster-scoped certificates")
|
||||
fs.StringVar(&s.ClusterSigningKeyFile, "cluster-signing-key-file", s.ClusterSigningKeyFile, "Filename containing a PEM-encoded RSA or ECDSA private key used to sign cluster-scoped certificates")
|
||||
fs.BoolVar(&s.EnableProfiling, "profiling", true, "Enable profiling via web interface host:port/debug/pprof/")
|
||||
fs.StringVar(&s.ClusterName, "cluster-name", s.ClusterName, "The instance prefix for the cluster")
|
||||
fs.StringVar(&s.ClusterCIDR, "cluster-cidr", s.ClusterCIDR, "CIDR Range for Pods in cluster.")
|
||||
|
||||
@ -23,7 +23,6 @@ package main
|
||||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
"runtime"
|
||||
|
||||
"k8s.io/kubernetes/cmd/kube-controller-manager/app"
|
||||
"k8s.io/kubernetes/cmd/kube-controller-manager/app/options"
|
||||
@ -40,7 +39,6 @@ func init() {
|
||||
}
|
||||
|
||||
func main() {
|
||||
runtime.GOMAXPROCS(runtime.NumCPU())
|
||||
s := options.NewCMServer()
|
||||
s.AddFlags(pflag.CommandLine)
|
||||
|
||||
|
||||
@ -22,10 +22,11 @@ import (
|
||||
"os"
|
||||
|
||||
"fmt"
|
||||
"github.com/spf13/pflag"
|
||||
"k8s.io/kubernetes/pkg/util/validation"
|
||||
_ "net/http/pprof"
|
||||
"strings"
|
||||
|
||||
"github.com/spf13/pflag"
|
||||
"k8s.io/kubernetes/pkg/util/validation"
|
||||
)
|
||||
|
||||
type KubeDNSConfig struct {
|
||||
|
||||
@ -19,7 +19,6 @@ package main
|
||||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
"runtime"
|
||||
|
||||
"k8s.io/kubernetes/cmd/kube-proxy/app"
|
||||
"k8s.io/kubernetes/cmd/kube-proxy/app/options"
|
||||
@ -36,7 +35,6 @@ func init() {
|
||||
}
|
||||
|
||||
func main() {
|
||||
runtime.GOMAXPROCS(runtime.NumCPU())
|
||||
config := options.NewProxyConfig()
|
||||
config.AddFlags(pflag.CommandLine)
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@ limitations under the License.
|
||||
package app
|
||||
|
||||
import (
|
||||
"github.com/docker/docker/pkg/term"
|
||||
"os"
|
||||
|
||||
"k8s.io/kubernetes/pkg/kubectl/cmd"
|
||||
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
|
||||
@ -28,8 +28,6 @@ WARNING: this logic is duplicated, with minor changes, in cmd/hyperkube/kubectl.
|
||||
Any salient changes here will need to be manually reflected in that file.
|
||||
*/
|
||||
func Run() error {
|
||||
// need to use term.StdStreams to get the right IO refs on Windows
|
||||
stdin, stdout, stderr := term.StdStreams()
|
||||
cmd := cmd.NewKubectlCommand(cmdutil.NewFactory(nil), stdin, stdout, stderr)
|
||||
cmd := cmd.NewKubectlCommand(cmdutil.NewFactory(nil), os.Stdin, os.Stdout, os.Stderr)
|
||||
return cmd.Execute()
|
||||
}
|
||||
|
||||
@ -18,13 +18,11 @@ package main
|
||||
|
||||
import (
|
||||
"os"
|
||||
"runtime"
|
||||
|
||||
"k8s.io/kubernetes/cmd/kubectl/app"
|
||||
)
|
||||
|
||||
func main() {
|
||||
runtime.GOMAXPROCS(runtime.NumCPU())
|
||||
if err := app.Run(); err != nil {
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
@ -179,5 +179,6 @@ func (s *KubeletServer) AddFlags(fs *pflag.FlagSet) {
|
||||
fs.StringVar(&s.EvictionSoftGracePeriod, "eviction-soft-grace-period", s.EvictionSoftGracePeriod, "A set of eviction grace periods (e.g. memory.available=1m30s) that correspond to how long a soft eviction threshold must hold before triggering a pod eviction.")
|
||||
fs.DurationVar(&s.EvictionPressureTransitionPeriod.Duration, "eviction-pressure-transition-period", s.EvictionPressureTransitionPeriod.Duration, "Duration for which the kubelet has to wait before transitioning out of an eviction pressure condition.")
|
||||
fs.Int32Var(&s.EvictionMaxPodGracePeriod, "eviction-max-pod-grace-period", s.EvictionMaxPodGracePeriod, "Maximum allowed grace period (in seconds) to use when terminating pods in response to a soft eviction threshold being met. If negative, defer to pod specified value.")
|
||||
fs.StringVar(&s.EvictionMinimumReclaim, "eviction-minimum-reclaim", s.EvictionMinimumReclaim, "A set of minimum reclaims (e.g. imagefs.available=2Gi) that describes the minimum amount of resource the kubelet will reclaim when performing a pod eviction if that resource is under pressure.")
|
||||
fs.Int32Var(&s.PodsPerCore, "pods-per-core", s.PodsPerCore, "Number of Pods per core that can run on this Kubelet. The total number of Pods on this Kubelet cannot exceed max-pods, so max-pods will be used if this calculation results in a larger number of Pods allowed on the Kubelet. A value of 0 disables this limit.")
|
||||
}
|
||||
|
||||
@ -187,7 +187,7 @@ func UnsecuredKubeletConfig(s *options.KubeletServer) (*KubeletConfig, error) {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
thresholds, err := eviction.ParseThresholdConfig(s.EvictionHard, s.EvictionSoft, s.EvictionSoftGracePeriod)
|
||||
thresholds, err := eviction.ParseThresholdConfig(s.EvictionHard, s.EvictionSoft, s.EvictionSoftGracePeriod, s.EvictionMinimumReclaim)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
@ -23,7 +23,6 @@ package main
|
||||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
"runtime"
|
||||
|
||||
"k8s.io/kubernetes/cmd/kubelet/app"
|
||||
"k8s.io/kubernetes/cmd/kubelet/app/options"
|
||||
@ -35,7 +34,6 @@ import (
|
||||
)
|
||||
|
||||
func main() {
|
||||
runtime.GOMAXPROCS(runtime.NumCPU())
|
||||
s := options.NewKubeletServer()
|
||||
s.AddFlags(pflag.CommandLine)
|
||||
|
||||
|
||||
@ -18,7 +18,6 @@ package main
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"runtime"
|
||||
|
||||
"k8s.io/kubernetes/pkg/api"
|
||||
"k8s.io/kubernetes/pkg/client/record"
|
||||
@ -83,7 +82,6 @@ func (c *HollowNodeConfig) createClientFromFile() (*client.Client, error) {
|
||||
}
|
||||
|
||||
func main() {
|
||||
runtime.GOMAXPROCS(runtime.NumCPU())
|
||||
|
||||
config := HollowNodeConfig{}
|
||||
config.addFlags(pflag.CommandLine)
|
||||
|
||||
@ -102,20 +102,39 @@ func (ds *discoverySummarizerServer) indexHandler(w http.ResponseWriter, r *http
|
||||
func (ds *discoverySummarizerServer) summarizeGroupVersionsHandler(path string) func(http.ResponseWriter, *http.Request) {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
var apiGroupList *unversioned.APIGroupList
|
||||
// TODO: We can cache and parallelize the calls to all servers.
|
||||
// TODO: We can cache calls to all servers.
|
||||
groups := make(chan *unversioned.APIGroupList)
|
||||
errorChannel := make(chan error)
|
||||
for _, serverAddress := range ds.groupVersionPaths[path] {
|
||||
groupList, err := ds.getAPIGroupList(serverAddress + path)
|
||||
if err != nil {
|
||||
addr := serverAddress
|
||||
go func(groups chan *unversioned.APIGroupList, error_channel chan error) {
|
||||
groupList, err := ds.getAPIGroupList(addr + path)
|
||||
if err != nil {
|
||||
errorChannel <- err
|
||||
return
|
||||
}
|
||||
groups <- groupList
|
||||
return
|
||||
}(groups, errorChannel)
|
||||
}
|
||||
|
||||
var groupList *unversioned.APIGroupList
|
||||
var err error
|
||||
for range ds.groupVersionPaths[path] {
|
||||
select {
|
||||
case groupList = <-groups:
|
||||
if apiGroupList == nil {
|
||||
apiGroupList = &unversioned.APIGroupList{}
|
||||
*apiGroupList = *groupList
|
||||
} else {
|
||||
apiGroupList.Groups = append(apiGroupList.Groups, groupList.Groups...)
|
||||
}
|
||||
case err = <-errorChannel:
|
||||
ds.writeErr(http.StatusBadGateway, err, w)
|
||||
return
|
||||
}
|
||||
if apiGroupList == nil {
|
||||
apiGroupList = &unversioned.APIGroupList{}
|
||||
*apiGroupList = *groupList
|
||||
} else {
|
||||
apiGroupList.Groups = append(apiGroupList.Groups, groupList.Groups...)
|
||||
}
|
||||
}
|
||||
|
||||
ds.writeRawJSON(http.StatusOK, *apiGroupList, w)
|
||||
return
|
||||
}
|
||||
|
||||
@ -17,4 +17,4 @@ limitations under the License.
|
||||
// Package discoverysummarizer contains code for the discovery summarizer
|
||||
// (program to summarize discovery information from all federated api servers)
|
||||
// as per https://github.com/kubernetes/kubernetes/blob/master/docs/proposals/federated-api-servers.md
|
||||
package discoverysummarizer
|
||||
package discoverysummarizer // import "k8s.io/kubernetes/cmd/kubernetes-discovery/discoverysummarizer"
|
||||
|
||||
@ -15,4 +15,4 @@ limitations under the License.
|
||||
*/
|
||||
|
||||
// +groupName=testgroup.k8s.io
|
||||
package testgroup
|
||||
package testgroup // import "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io"
|
||||
|
||||
@ -28,4 +28,4 @@ limitations under the License.
|
||||
// package. Additionally, all naming systems in the Context will be added as
|
||||
// functions to the parsed template, so that they can be called directly from
|
||||
// your templates!
|
||||
package generator
|
||||
package generator // import "k8s.io/kubernetes/cmd/libs/go2idl/generator"
|
||||
|
||||
@ -213,9 +213,41 @@ func (v *optionalItemsVisitor) Visit(n ast.Node) ast.Visitor {
|
||||
}
|
||||
}
|
||||
case *ast.IfStmt:
|
||||
if b, ok := t.Cond.(*ast.BinaryExpr); ok && b.Op == token.EQL {
|
||||
if isFieldSelector(b.X, "m", "Items") && isIdent(b.Y, "nil") {
|
||||
b.X = &ast.StarExpr{X: &ast.Ident{Name: "m"}}
|
||||
switch cond := t.Cond.(type) {
|
||||
case *ast.BinaryExpr:
|
||||
if cond.Op == token.EQL {
|
||||
if isFieldSelector(cond.X, "m", "Items") && isIdent(cond.Y, "nil") {
|
||||
cond.X = &ast.StarExpr{X: &ast.Ident{Name: "m"}}
|
||||
}
|
||||
}
|
||||
}
|
||||
if t.Init != nil {
|
||||
// Find form:
|
||||
// if err := m[len(m.Items)-1].Unmarshal(data[iNdEx:postIndex]); err != nil {
|
||||
// return err
|
||||
// }
|
||||
switch s := t.Init.(type) {
|
||||
case *ast.AssignStmt:
|
||||
if call, ok := s.Rhs[0].(*ast.CallExpr); ok {
|
||||
if sel, ok := call.Fun.(*ast.SelectorExpr); ok {
|
||||
if x, ok := sel.X.(*ast.IndexExpr); ok {
|
||||
// m[] -> (*m)[]
|
||||
if sel2, ok := x.X.(*ast.SelectorExpr); ok {
|
||||
if ident, ok := sel2.X.(*ast.Ident); ok && ident.Name == "m" {
|
||||
x.X = &ast.StarExpr{X: &ast.Ident{Name: "m"}}
|
||||
}
|
||||
}
|
||||
// len(m.Items) -> len(*m)
|
||||
if bin, ok := x.Index.(*ast.BinaryExpr); ok {
|
||||
if call2, ok := bin.X.(*ast.CallExpr); ok && len(call2.Args) == 1 {
|
||||
if isFieldSelector(call2.Args[0], "m", "Items") {
|
||||
call2.Args[0] = &ast.StarExpr{X: &ast.Ident{Name: "m"}}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
case *ast.IndexExpr:
|
||||
|
||||
@ -28,4 +28,4 @@ limitations under the License.
|
||||
//
|
||||
// Additionally, a "RawNamer" can optionally keep track of what needs to be
|
||||
// imported.
|
||||
package namer
|
||||
package namer // import "k8s.io/kubernetes/cmd/libs/go2idl/namer"
|
||||
|
||||
@ -16,4 +16,4 @@ limitations under the License.
|
||||
|
||||
// Package parser provides code to parse go files, type-check them, extract the
|
||||
// types.
|
||||
package parser
|
||||
package parser // import "k8s.io/kubernetes/cmd/libs/go2idl/parser"
|
||||
|
||||
@ -16,4 +16,4 @@ limitations under the License.
|
||||
|
||||
// Package types contains go type information, packaged in a way that makes
|
||||
// auto-generation convenient, whether by template or straight go functions.
|
||||
package types
|
||||
package types // import "k8s.io/kubernetes/cmd/libs/go2idl/types"
|
||||
|
||||
@ -26,15 +26,15 @@ const unversionedWarningTag = "UNVERSIONED_WARNING"
|
||||
const unversionedWarningPre = `
|
||||
<!-- BEGIN STRIP_FOR_RELEASE -->
|
||||
|
||||
<img src="http://kubernetes.io/img/warning.png" alt="WARNING"
|
||||
<img src="http://kubernetes.io/kubernetes/img/warning.png" alt="WARNING"
|
||||
width="25" height="25">
|
||||
<img src="http://kubernetes.io/img/warning.png" alt="WARNING"
|
||||
<img src="http://kubernetes.io/kubernetes/img/warning.png" alt="WARNING"
|
||||
width="25" height="25">
|
||||
<img src="http://kubernetes.io/img/warning.png" alt="WARNING"
|
||||
<img src="http://kubernetes.io/kubernetes/img/warning.png" alt="WARNING"
|
||||
width="25" height="25">
|
||||
<img src="http://kubernetes.io/img/warning.png" alt="WARNING"
|
||||
<img src="http://kubernetes.io/kubernetes/img/warning.png" alt="WARNING"
|
||||
width="25" height="25">
|
||||
<img src="http://kubernetes.io/img/warning.png" alt="WARNING"
|
||||
<img src="http://kubernetes.io/kubernetes/img/warning.png" alt="WARNING"
|
||||
width="25" height="25">
|
||||
|
||||
<h2>PLEASE NOTE: This document applies to the HEAD of the source tree</h2>
|
||||
|
||||
@ -80,15 +80,15 @@ func TestMakeUnversionedWarning(t *testing.T) {
|
||||
`
|
||||
<!-- BEGIN STRIP_FOR_RELEASE -->
|
||||
|
||||
<img src="http://kubernetes.io/img/warning.png" alt="WARNING"
|
||||
<img src="http://kubernetes.io/kubernetes/img/warning.png" alt="WARNING"
|
||||
width="25" height="25">
|
||||
<img src="http://kubernetes.io/img/warning.png" alt="WARNING"
|
||||
<img src="http://kubernetes.io/kubernetes/img/warning.png" alt="WARNING"
|
||||
width="25" height="25">
|
||||
<img src="http://kubernetes.io/img/warning.png" alt="WARNING"
|
||||
<img src="http://kubernetes.io/kubernetes/img/warning.png" alt="WARNING"
|
||||
width="25" height="25">
|
||||
<img src="http://kubernetes.io/img/warning.png" alt="WARNING"
|
||||
<img src="http://kubernetes.io/kubernetes/img/warning.png" alt="WARNING"
|
||||
width="25" height="25">
|
||||
<img src="http://kubernetes.io/img/warning.png" alt="WARNING"
|
||||
<img src="http://kubernetes.io/kubernetes/img/warning.png" alt="WARNING"
|
||||
width="25" height="25">
|
||||
|
||||
<h2>PLEASE NOTE: This document applies to the HEAD of the source tree</h2>
|
||||
@ -115,15 +115,15 @@ Documentation for other releases can be found at
|
||||
`
|
||||
<!-- BEGIN STRIP_FOR_RELEASE -->
|
||||
|
||||
<img src="http://kubernetes.io/img/warning.png" alt="WARNING"
|
||||
<img src="http://kubernetes.io/kubernetes/img/warning.png" alt="WARNING"
|
||||
width="25" height="25">
|
||||
<img src="http://kubernetes.io/img/warning.png" alt="WARNING"
|
||||
<img src="http://kubernetes.io/kubernetes/img/warning.png" alt="WARNING"
|
||||
width="25" height="25">
|
||||
<img src="http://kubernetes.io/img/warning.png" alt="WARNING"
|
||||
<img src="http://kubernetes.io/kubernetes/img/warning.png" alt="WARNING"
|
||||
width="25" height="25">
|
||||
<img src="http://kubernetes.io/img/warning.png" alt="WARNING"
|
||||
<img src="http://kubernetes.io/kubernetes/img/warning.png" alt="WARNING"
|
||||
width="25" height="25">
|
||||
<img src="http://kubernetes.io/img/warning.png" alt="WARNING"
|
||||
<img src="http://kubernetes.io/kubernetes/img/warning.png" alt="WARNING"
|
||||
width="25" height="25">
|
||||
|
||||
<h2>PLEASE NOTE: This document applies to the HEAD of the source tree</h2>
|
||||
|
||||
@ -32,8 +32,7 @@ Conduct may be permanently removed from the project team.
|
||||
This code of conduct applies both within project spaces and in public spaces
|
||||
when an individual is representing the project or its community.
|
||||
|
||||
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by
|
||||
opening an issue or contacting one or more of the project maintainers.
|
||||
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting a Kubernetes maintainer, Sarah Novotny <sarahnovotny@google.com>, and/or Dan Kohn <dan@linuxfoundation.org>.
|
||||
|
||||
This Code of Conduct is adapted from the Contributor Covenant
|
||||
(http://contributor-covenant.org), version 1.2.0, available at
|
||||
|
||||
@ -19,7 +19,6 @@ package main
|
||||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
"runtime"
|
||||
|
||||
"k8s.io/kubernetes/pkg/healthz"
|
||||
"k8s.io/kubernetes/pkg/util"
|
||||
@ -36,7 +35,6 @@ func init() {
|
||||
}
|
||||
|
||||
func main() {
|
||||
runtime.GOMAXPROCS(runtime.NumCPU())
|
||||
|
||||
s := controllermanager.NewCMServer()
|
||||
s.AddFlags(pflag.CommandLine)
|
||||
|
||||
@ -19,7 +19,6 @@ package main
|
||||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
"runtime"
|
||||
|
||||
"github.com/spf13/pflag"
|
||||
"k8s.io/kubernetes/contrib/mesos/pkg/executor/service"
|
||||
@ -30,7 +29,6 @@ import (
|
||||
)
|
||||
|
||||
func main() {
|
||||
runtime.GOMAXPROCS(runtime.NumCPU())
|
||||
|
||||
s := service.NewKubeletExecutorServer()
|
||||
s.AddFlags(pflag.CommandLine)
|
||||
|
||||
@ -19,7 +19,6 @@ package main
|
||||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
"runtime"
|
||||
|
||||
"github.com/spf13/pflag"
|
||||
"k8s.io/kubernetes/contrib/mesos/pkg/hyperkube"
|
||||
@ -30,7 +29,6 @@ import (
|
||||
)
|
||||
|
||||
func main() {
|
||||
runtime.GOMAXPROCS(runtime.NumCPU())
|
||||
s := service.NewSchedulerServer()
|
||||
s.AddStandaloneFlags(pflag.CommandLine)
|
||||
|
||||
|
||||
@ -21,4 +21,4 @@ limitations under the License.
|
||||
// the upstream hyperkube module is not reusable.
|
||||
//
|
||||
// TODO(jdef,sttts): refactor upstream cmd/hyperkube to be reusable with the necessary mesos changes
|
||||
package main
|
||||
package main // import "k8s.io/kubernetes/contrib/mesos/cmd/km"
|
||||
|
||||
@ -25,7 +25,6 @@ import (
|
||||
"io/ioutil"
|
||||
"os"
|
||||
"path"
|
||||
"runtime"
|
||||
|
||||
"k8s.io/kubernetes/pkg/util"
|
||||
"k8s.io/kubernetes/pkg/version/verflag"
|
||||
@ -177,7 +176,6 @@ func (hk *HyperKube) Run(args []string) error {
|
||||
|
||||
// RunToExit will run the hyperkube and then call os.Exit with an appropriate exit code.
|
||||
func (hk *HyperKube) RunToExit(args []string) {
|
||||
runtime.GOMAXPROCS(runtime.NumCPU())
|
||||
err := hk.Run(args)
|
||||
if err != nil {
|
||||
fmt.Fprint(os.Stderr, err.Error())
|
||||
|
||||
@ -16,4 +16,4 @@ limitations under the License.
|
||||
|
||||
// Package assert is an utility package containing reusable testing functionality
|
||||
// extending github.com/stretchr/testify/assert
|
||||
package assert
|
||||
package assert // import "k8s.io/kubernetes/contrib/mesos/pkg/assert"
|
||||
|
||||
@ -16,4 +16,4 @@ limitations under the License.
|
||||
|
||||
// Package backoff provides backoff functionality with a simple API.
|
||||
// Originally copied from Kubernetes: plugin/pkg/scheduler/factory/factory.go
|
||||
package backoff
|
||||
package backoff // import "k8s.io/kubernetes/contrib/mesos/pkg/backoff"
|
||||
|
||||
@ -69,6 +69,11 @@ import (
|
||||
"github.com/spf13/pflag"
|
||||
)
|
||||
|
||||
const (
|
||||
// Jitter used when starting controller managers
|
||||
ControllerStartJitter = 1.0
|
||||
)
|
||||
|
||||
// CMServer is the main context object for the controller manager.
|
||||
type CMServer struct {
|
||||
*options.CMServer
|
||||
@ -172,12 +177,17 @@ func (s *CMServer) Run(_ []string) error {
|
||||
}
|
||||
|
||||
if s.AllocateNodeCIDRs && s.ConfigureCloudRoutes {
|
||||
routes, ok := cloud.Routes()
|
||||
if !ok {
|
||||
glog.Fatal("Cloud provider must support routes if configure-cloud-routes is set")
|
||||
if cloud == nil {
|
||||
glog.Warning("configure-cloud-routes is set, but no cloud provider specified. Will not configure cloud provider routes.")
|
||||
} else if routes, ok := cloud.Routes(); !ok {
|
||||
glog.Warning("configure-cloud-routes is set, but cloud provider does not support routes. Will not configure cloud provider routes.")
|
||||
} else {
|
||||
routeController := routecontroller.New(routes, clientset.NewForConfigOrDie(restclient.AddUserAgent(kubeconfig, "route-controller")), s.ClusterName, clusterCIDR)
|
||||
routeController.Run(s.NodeSyncPeriod.Duration)
|
||||
time.Sleep(wait.Jitter(s.ControllerStartInterval.Duration, ControllerStartJitter))
|
||||
}
|
||||
routeController := routecontroller.New(routes, clientset.NewForConfigOrDie(restclient.AddUserAgent(kubeconfig, "route-controller")), s.ClusterName, clusterCIDR)
|
||||
routeController.Run(s.NodeSyncPeriod.Duration)
|
||||
} else {
|
||||
glog.Infof("Will not configure cloud provider routes for allocate-node-cidrs: %v, configure-cloud-routes: %v.", s.AllocateNodeCIDRs, s.ConfigureCloudRoutes)
|
||||
}
|
||||
|
||||
resourceQuotaControllerClient := clientset.NewForConfigOrDie(restclient.AddUserAgent(kubeconfig, "resource-quota-controller"))
|
||||
@ -268,14 +278,14 @@ func (s *CMServer) Run(_ []string) error {
|
||||
|
||||
if containsResource(resources, "replicasets") {
|
||||
glog.Infof("Starting ReplicaSet controller")
|
||||
go replicaset.NewReplicaSetController(clientset.NewForConfigOrDie(restclient.AddUserAgent(kubeconfig, "replicaset-controller")), s.resyncPeriod, replicaset.BurstReplicas, int(s.LookupCacheSizeForRS)).
|
||||
go replicaset.NewReplicaSetControllerFromClient(clientset.NewForConfigOrDie(restclient.AddUserAgent(kubeconfig, "replicaset-controller")), s.resyncPeriod, replicaset.BurstReplicas, int(s.LookupCacheSizeForRS)).
|
||||
Run(int(s.ConcurrentRSSyncs), wait.NeverStop)
|
||||
}
|
||||
}
|
||||
|
||||
provisioner, err := kubecontrollermanager.NewVolumeProvisioner(cloud, s.VolumeConfiguration)
|
||||
if err != nil {
|
||||
glog.Fatal("A Provisioner could not be created, but one was expected. Provisioning will not work. This functionality is considered an early Alpha version.")
|
||||
glog.Fatalf("A Provisioner could not be created: %v, but one was expected. Provisioning will not work. This functionality is considered an early Alpha version.", err)
|
||||
}
|
||||
|
||||
volumeController := persistentvolumecontroller.NewPersistentVolumeController(
|
||||
|
||||
@ -17,4 +17,4 @@ limitations under the License.
|
||||
// Package controllermanager is largely a clone of the upstream implementation,
|
||||
// with additional functionality to select between stock or a customized
|
||||
// endpoints controller.
|
||||
package controllermanager
|
||||
package controllermanager // import "k8s.io/kubernetes/contrib/mesos/pkg/controllermanager"
|
||||
|
||||
@ -15,4 +15,4 @@ limitations under the License.
|
||||
*/
|
||||
|
||||
// Package election provides interfaces used for master election.
|
||||
package election
|
||||
package election // import "k8s.io/kubernetes/contrib/mesos/pkg/election"
|
||||
|
||||
@ -15,4 +15,4 @@ limitations under the License.
|
||||
*/
|
||||
|
||||
// Package config contains executor configuration constants.
|
||||
package config
|
||||
package config // import "k8s.io/kubernetes/contrib/mesos/pkg/executor/config"
|
||||
|
||||
@ -18,4 +18,4 @@ limitations under the License.
|
||||
Package executor includes a mesos executor, which contains
|
||||
a kubelet as its member to manage containers.
|
||||
*/
|
||||
package executor
|
||||
package executor // import "k8s.io/kubernetes/contrib/mesos/pkg/executor"
|
||||
|
||||
@ -15,4 +15,4 @@ limitations under the License.
|
||||
*/
|
||||
|
||||
// Package messages exposes executor event/message names as constants.
|
||||
package messages
|
||||
package messages // import "k8s.io/kubernetes/contrib/mesos/pkg/executor/messages"
|
||||
|
||||
@ -15,4 +15,4 @@ limitations under the License.
|
||||
*/
|
||||
|
||||
// Package service contains the cmd/k8sm-executor glue code.
|
||||
package service
|
||||
package service // import "k8s.io/kubernetes/contrib/mesos/pkg/executor/service"
|
||||
|
||||
@ -18,4 +18,4 @@ limitations under the License.
|
||||
// kubernetes-mesos components into a single binary form, providing a
|
||||
// simple mechanism for intra-component discovery as per the original
|
||||
// Kubernetes hyperkube package.
|
||||
package hyperkube
|
||||
package hyperkube // import "k8s.io/kubernetes/contrib/mesos/pkg/hyperkube"
|
||||
|
||||
@ -15,4 +15,4 @@ limitations under the License.
|
||||
*/
|
||||
|
||||
// Package config contains minion configuration constants.
|
||||
package config
|
||||
package config // import "k8s.io/kubernetes/contrib/mesos/pkg/minion/config"
|
||||
|
||||
@ -15,4 +15,4 @@ limitations under the License.
|
||||
*/
|
||||
|
||||
// Package minion contains the executor and proxy bootstrap code for a Mesos slave
|
||||
package minion
|
||||
package minion // import "k8s.io/kubernetes/contrib/mesos/pkg/minion"
|
||||
|
||||
@ -17,4 +17,4 @@ limitations under the License.
|
||||
// Package tasks provides an API for supervising system processes as Task's.
|
||||
// It provides stronger guarantees with respect to process lifecycle than a
|
||||
// standalone kubelet running static pods.
|
||||
package tasks
|
||||
package tasks // import "k8s.io/kubernetes/contrib/mesos/pkg/minion/tasks"
|
||||
|
||||
@ -15,4 +15,4 @@ limitations under the License.
|
||||
*/
|
||||
|
||||
// Package node provides utilities to create and update nodes
|
||||
package node
|
||||
package node // import "k8s.io/kubernetes/contrib/mesos/pkg/node"
|
||||
|
||||
@ -15,4 +15,4 @@ limitations under the License.
|
||||
*/
|
||||
|
||||
// Package offers contains code that manages Mesos offers.
|
||||
package offers
|
||||
package offers // import "k8s.io/kubernetes/contrib/mesos/pkg/offers"
|
||||
|
||||
@ -16,4 +16,4 @@ limitations under the License.
|
||||
|
||||
// Package metrics defines and exposes instrumentation metrics related to
|
||||
// Mesos offers.
|
||||
package metrics
|
||||
package metrics // import "k8s.io/kubernetes/contrib/mesos/pkg/offers/metrics"
|
||||
|
||||
@ -16,4 +16,4 @@ limitations under the License.
|
||||
|
||||
// podutil contains utilities for reading, writing and filtering streams
|
||||
// and lists of api.Pod objects.
|
||||
package podutil
|
||||
package podutil // import "k8s.io/kubernetes/contrib/mesos/pkg/podutil"
|
||||
|
||||
@ -16,4 +16,4 @@ limitations under the License.
|
||||
|
||||
// Package proc provides opinionated utilities for processing background
|
||||
// operations and future errors, somewhat inspired by libprocess.
|
||||
package proc
|
||||
package proc // import "k8s.io/kubernetes/contrib/mesos/pkg/proc"
|
||||
|
||||
@ -15,4 +15,4 @@ limitations under the License.
|
||||
*/
|
||||
|
||||
// Package profile contains reusable code for profiling Go programs with pprof.
|
||||
package profile
|
||||
package profile // import "k8s.io/kubernetes/contrib/mesos/pkg/profile"
|
||||
|
||||
@ -16,4 +16,4 @@ limitations under the License.
|
||||
|
||||
// Package queue provides several queue implementations, originally
|
||||
// inspired by Kubernetes pkg/client/cache/fifo.
|
||||
package queue
|
||||
package queue // import "k8s.io/kubernetes/contrib/mesos/pkg/queue"
|
||||
|
||||
@ -16,4 +16,4 @@ limitations under the License.
|
||||
|
||||
// Some file descriptor manipulation funcs (Unix-Only), inspired by
|
||||
// https://github.com/skarnet/execline/blob/master/src/execline/redirfd.c
|
||||
package redirfd
|
||||
package redirfd // import "k8s.io/kubernetes/contrib/mesos/pkg/redirfd"
|
||||
|
||||
@ -16,4 +16,4 @@ limitations under the License.
|
||||
|
||||
// Package runtime provides utilities for semaphores (chan struct{}),
|
||||
// a simple Latch implementation, and metrics for reporting handled panics.
|
||||
package runtime
|
||||
package runtime // import "k8s.io/kubernetes/contrib/mesos/pkg/runtime"
|
||||
|
||||
@ -15,4 +15,4 @@ limitations under the License.
|
||||
*/
|
||||
|
||||
// Package algorithm implements the SchedulerAlgorithm
|
||||
package algorithm
|
||||
package algorithm // import "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/components/algorithm"
|
||||
|
||||
@ -16,4 +16,4 @@ limitations under the License.
|
||||
|
||||
// Package podschedulers defines an interface (w/ implementations) for matching
|
||||
// pods against offers.
|
||||
package podschedulers
|
||||
package podschedulers // import "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/components/algorithm/podschedulers"
|
||||
|
||||
@ -16,4 +16,4 @@ limitations under the License.
|
||||
|
||||
// Package binder implements the Binder which launched a task and let the
|
||||
// executor do the actual binding.
|
||||
package binder
|
||||
package binder // import "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/components/binder"
|
||||
|
||||
@ -17,4 +17,4 @@ limitations under the License.
|
||||
// Package controller implements the scheduling controller which waits for pod
|
||||
// events from the queuer (i.e. from the apiserver), passes them to the
|
||||
// SchedulerAlgorithm and in case of success to the binder which does the launch.
|
||||
package controller
|
||||
package controller // import "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/components/controller"
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user