Commit Graph

7522 Commits

Author SHA1 Message Date
Kubernetes Submit Queue
93055c7730
Merge pull request #65330 from freehan/neg-rate-limit
Automatic merge from submit-queue (batch tested with PRs 59214, 65330). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

add rate limiting for NEG calls

```release-note
None
```
2018-06-25 18:19:04 -07:00
Kevin W Monroe
0eeb34382b one more lint fix for sshl_chain_completion 2018-06-25 15:14:49 -05:00
Kevin W Monroe
428a63e9a1 lint fixes for goal state checks 2018-06-25 15:06:06 -05:00
Kubernetes Submit Queue
3079c1df2f
Merge pull request #65389 from Random-Liu/add-crictl-into-sudoer-path
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Add /home/kubernetes/bin into sudoers path, so that `sudo crictl` works.

Add `/home/kubernetes/bin` to sudoers path, so that user can call `sudo crictl` directly.

Without this fix, user has to either use the full path `sudo /home/kubernetes/bin/crictl` or switch to root, which is not a good user experience.

/cc @yujuhong @feiskyer @filbranden @kubernetes/sig-node-pr-reviews @kubernetes/sig-gcp-pr-reviews 
**Release note**:

```release-note
User can now use `sudo crictl` on GCE cluster.
```
2018-06-23 00:00:53 -07:00
Lantao Liu
2af997470f Add /home/kubernetes/bin into sudoers path, so that sudo crictl works. 2018-06-22 17:10:55 -07:00
Jeff Grafton
23ceebac22 Run hack/update-bazel.sh 2018-06-22 16:22:57 -07:00
Minhan Xia
760e17542c add rate limiting for NEG calls 2018-06-22 11:16:07 -07:00
Kubernetes Submit Queue
e467e9abb7
Merge pull request #64721 from Cynerva/gkk/audit
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

juju: Add audit support to kubernetes-master charm

**What this PR does / why we need it**:

This PR adds audit configuration support to the kubernetes-master charm. Specifically, it enables audit logging by default, and adds two new config options: `audit-policy` and `audit-webhook-config`.

**Release note**:

```release-note
NONE
```
2018-06-22 08:45:35 -07:00
Kubernetes Submit Queue
b48339704f
Merge pull request #65024 from jingax10/calico_custom_branch
Automatic merge from submit-queue (batch tested with PRs 65024, 65287, 65345, 64693, 64941). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Add a helper function to customize K8s addon yamls and use it to customize Calico addons on GKE

**What this PR does / why we need it**:

Allow customizing Calico addon in GCP. With #65022, this allows us to do a couple of things:, e.g., run Calico 3.0+ on GCP, use a non-default MTU etc.

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

**Special notes for your reviewer**:

**Release note**:

```release-note
NONE
```
2018-06-22 06:10:10 -07:00
Kubernetes Submit Queue
5bde5a5ac8
Merge pull request #63845 from paulgear/master
Automatic merge from submit-queue (batch tested with PRs 65301, 65291, 65307, 63845, 65313). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Add option to control SSL chain completion

**What this PR does / why we need it**:

This adds templated support to the kubernetes-worker juju charm for the --enable-ssl-chain-completion option on the ingress proxy.  It defaults to false, to ensure that production sites are not reliant on OCSP or DNS in order to function.

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

**Special notes for your reviewer**:

**Release note**:

```release-note
kubernetes-worker juju charm: Added support for setting the --enable-ssl-chain-completion option on the ingress proxy.  "action required": if your installation relies on supplying incomplete certificate chains and using OCSP to fill them in, you must set "ingress-ssl-chain-completion" to "true" in your juju configuration.
```
2018-06-22 03:08:17 -07:00
Kubernetes Submit Queue
ea0c683e2d
Merge pull request #65301 from wojtek-t/heapster_node_first
Automatic merge from submit-queue (batch tested with PRs 65301, 65291, 65307, 63845, 65313). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Create heapster node first

This should help with mitigating failures like this:
https://storage.googleapis.com/kubernetes-jenkins/logs/ci-kubernetes-e2e-gce-scale-correctness/127/build-log.txt
2018-06-22 03:08:07 -07:00
Kubernetes Submit Queue
a79de78dc1
Merge pull request #64372 from monotek/fluentd-elasticsearch
Automatic merge from submit-queue (batch tested with PRs 65064, 65218, 65260, 65241, 64372). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

updated fluentd in fluentd-es-image to version 1.2.2

**What this PR does / why we need it**: Updates fluentd in fluentd-es-image to version 1.2.2.
Also updates all other used gems to most recent versions.

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

**Special notes for your reviewer**:

**Release note**:

```release-note
NONE
```
2018-06-21 21:12:22 -07:00
Kubernetes Submit Queue
a1344cb0d5
Merge pull request #65187 from kwmonroe/feature/goal-state-status
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

juju charms: set more accurate status based on goal_state

**What this PR does / why we need it**:
Use juju goal-state to report more accurate charm status.

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes https://github.com/juju-solutions/bundle-canonical-kubernetes/issues/593

**Special notes for your reviewer**:
The goal-state hook tool was released in juju 2.4.  For deployments on earlier versions of juju, this will fall back to the current status reporting behavior.

**Release note**:

```release-note
Report accurate status for kubernetes-master and -worker charms.
```
2018-06-21 19:39:57 -07:00
Kubernetes Submit Queue
bba28ecd6f
Merge pull request #65084 from x13n/fluentd-termination
Automatic merge from submit-queue (batch tested with PRs 65123, 65176, 65139, 65084, 65056). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Increase fluentd-gcp grace termination period to 1min

By default, all pods have 30s for graceful termination. This gives fluentd additional 30s to export logs e.g. when the node is shutting down.



**What this PR does / why we need it**:

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

**Special notes for your reviewer**:

**Release note**:

```release-note
fluentd-gcp grace termination period increased to 60s.
```

cc @vishh
2018-06-21 16:56:16 -07:00
Kubernetes Submit Queue
624dec20c0
Merge pull request #65139 from wojtek-t/fix_logexporter
Automatic merge from submit-queue (batch tested with PRs 65123, 65176, 65139, 65084, 65056). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Periodically fetch logexported nodes instead of sleeping
2018-06-21 16:56:13 -07:00
Kubernetes Submit Queue
7888a34f47
Merge pull request #65176 from kawych/master
Automatic merge from submit-queue (batch tested with PRs 65123, 65176, 65139, 65084, 65056). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Pass cluster_location argument to Heapster

**What this PR does / why we need it**:
Fixes Stackdriver monitoring on GCE clusters where cluster location is not a single zone, for example regional clusters.

**Release note**:
```release-note
Pass cluster_location argument to Heapster
```
2018-06-21 16:56:10 -07:00
Jing Ai
4dce8973ce Add a helper function to customize K8s addon yamls and use it to customize Calico addons on GKE. 2018-06-21 15:07:22 -07:00
Kubernetes Submit Queue
ec518c5f56
Merge pull request #65022 from jingax10/calico_addon_branch
Automatic merge from submit-queue (batch tested with PRs 64140, 64898, 65022, 65037, 65027). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Update Calico addon yamls to make it work for both 2.x and 3.x. versions.

**What this PR does / why we need it**:

Without this PR, one could not run Calico 3.0+.

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

**Special notes for your reviewer**:

**Release note**:

```release-note
NONE
```
2018-06-21 05:40:16 -07:00
Kubernetes Submit Queue
5cb2fef438
Merge pull request #64898 from johnsca/johnsca/charm-openstack-integration
Automatic merge from submit-queue (batch tested with PRs 64140, 64898, 65022, 65037, 65027). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Add charm support for OpenStack Integrator

**What this PR does / why we need it**:

Add charm support for OpenStack Integrator
Also rename interfaces for existing integrator charms




**Release note**:

```release-note
NONE
```
2018-06-21 05:40:09 -07:00
wojtekt
226aa7306c Create heapster node first 2018-06-21 11:00:18 +02:00
Kubernetes Submit Queue
edfffe5610
Merge pull request #64285 from hyperbolic2346/mwilson/nginx-image-bump
Automatic merge from submit-queue (batch tested with PRs 64285, 63660, 63661, 63662, 64883). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Mwilson/nginx image bump

**What this PR does / why we need it**:
Updating default nginx image for CDK
**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #
https://github.com/juju-solutions/bundle-canonical-kubernetes/issues/576
**Special notes for your reviewer**:

**Release note**:

```release-note
Updated default image for nginx ingress in CDK to match current Kubernetes docs.
```
2018-06-21 01:19:14 -07:00
Kubernetes Submit Queue
f5763a9702
Merge pull request #65254 from Random-Liu/update-crictl
Automatic merge from submit-queue (batch tested with PRs 65254, 64837, 64782, 64555, 64850). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Update crictl to v1.11.0.

Update `crictl` to newly released v1.11.0 version on GCE. See https://github.com/kubernetes-incubator/cri-tools/releases/tag/v1.11.0

**Release note**:

```release-note
Update crictl on GCE to v1.11.0.
```
@kubernetes/sig-node-pr-reviews @feiskyer @yujuhong @dchen1107
2018-06-20 11:28:06 -07:00
George Kraft
534275e921 juju: Add audit support to kubernetes-master charm 2018-06-20 12:18:43 -05:00
Kubernetes Submit Queue
2fb7af790d
Merge pull request #64104 from CalvinHartwell/kubelet-allow-privileged-true
Automatic merge from submit-queue (batch tested with PRs 65032, 63471, 64104, 64672, 64427). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

changed the default value for allow-privileged for the kubelet (kuber…

**What this PR does / why we need it**:

This PR modifies the default value for the kubernetes-worker: it sets the allow-privileged kubelet value to true, based on this issue:[https://github.com/juju-solutions/bundle-canonical-kubernetes/issues/579](https://github.com/juju-solutions/bundle-canonical-kubernetes/issues/579). 

The original PR was here: [https://github.com/kubernetes/kubernetes/pull/63442](https://github.com/kubernetes/kubernetes/pull/63442) which included this change for the k8s 1.10 release. This PR incorporates this fix into the Canonical distribution of Kubernetes. 

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

This change fixes two issues: 

[https://github.com/juju-solutions/bundle-canonical-kubernetes/issues/579](https://github.com/juju-solutions/bundle-canonical-kubernetes/issues/579)
[https://github.com/rancher/rancher/issues/13612](https://github.com/rancher/rancher/issues/13612)

**Special notes for your reviewer**:

Waiting review from Canonical Kubernetes charm tea. 

**Release note**:

```release-note
The new default value for the --allow-privileged parameter of the Kubernetes-worker charm has been set to true based on changes which went into the Kubernetes 1.10 release. Before this change the default value was set to false. If you're installing Canonical Kubernetes you should expect this value to now be true by default and you should now look to use PSP (pod security policies). 
```
2018-06-20 04:23:17 -07:00
André Bauer
cee9deb12c updated gems and versions 2018-06-20 09:33:04 +02:00
Kubernetes Submit Queue
fea9a3f1c5
Merge pull request #62910 from jklare/bump_addon_fluentd-es
Automatic merge from submit-queue (batch tested with PRs 64142, 64426, 62910, 63942, 64548). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

update fluentd-elasticsearch addon

**What this PR does / why we need it**:
Elastic now provides a fully opensource version for their prebuild
docker images (elasticsearch, kibana and so on). To avoid running into
licensing conflicts for this addon example, we should rather use these
images instead of the premium ones (were we also have to disable premium
features manually right now).

This PR updates:
- fluentd from <=1.1.0 to ~>1.1.3
- elasticsearch and kibana from 5.6.2 to 6.2.4
- fluentd-elasticsearch-plugin from 2.4.1 to 2.9.1

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

https://github.com/fluent/fluentd/issues/1894

**Special notes for your reviewer**:

**Release note**:

```release-note

```
2018-06-20 00:05:14 -07:00
Kubernetes Submit Queue
efd436bb07
Merge pull request #65053 from chanjarster/master
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

fix dead links in kube-dns/README.md

**What this PR does / why we need it**:

fix dead links in kube-dns/README.md

**Which issue(s) this PR fixes**

no issue

**Special notes for your reviewer**:

**Release note**:
2018-06-19 18:48:10 -07:00
Kubernetes Submit Queue
f8b6ac6e97
Merge pull request #64871 from sebgl/patch-1
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Fix dead-link to dns-horizontal-autoscaler

**What this PR does / why we need it**:

It looks like dns-horizontal-autoscaler doesn't exist in the dns repository anymore, but one level higher.
This PR fixes the dead link.
2018-06-19 18:46:32 -07:00
Kubernetes Submit Queue
bd0ce891e4
Merge pull request #64228 from tallclair/dashboard-owners
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Update dashboard OWNERS

Update dashboard OWNERS based on @maciaszczykm 's comment: https://github.com/kubernetes/kubernetes/pull/62756#issuecomment-391453524

I pulled the list of reviewers from the @kubernetes/dashboard-maintainers list.

```release-note
NONE
```
2018-06-19 18:45:46 -07:00
Lantao Liu
e862da1709 Update crictl to v1.11.0. 2018-06-19 18:04:15 -07:00
Aleksandra Malinowska
e9611b5b00 Cluster Autoscaler 1.3.0 2018-06-19 15:58:06 +02:00
Kevin W Monroe
ace790c07a set more accurate status based on charm goal_state 2018-06-18 09:24:23 -05:00
wojtekt
43d217f904 Periodically fetch logexported nodes instead of sleeping 2018-06-18 14:29:14 +02:00
Karol Wychowaniec
eefdff659d Pass cluster_location argument to Heapster 2018-06-18 13:54:22 +02:00
Aleksandra Malinowska
4be77c5fea Update Cluster Autoscaler to v1.3.0-beta.2 2018-06-15 19:18:13 +02:00
Daniel Kłobuszewski
7773f8f5eb Increase fluentd-gcp grace termination period to 1min
By default, all pods have 30s for graceful termination. This gives fluentd additional 30s to export logs when the node is shutting down.
2018-06-14 10:44:13 +02:00
Daniel Qian
0ebcef241f fix dead links in kube-dns/README.md 2018-06-13 13:23:58 +08:00
immutablet
02e57ac118 Add kms-plugin-container.manifest to release manifest tarball. 2018-06-12 16:04:20 -07:00
Kubernetes Submit Queue
55c64a50d4
Merge pull request #65018 from shyamjvs/add-debug-logs-to-logexporter
Automatic merge from submit-queue (batch tested with PRs 64974, 65009, 65018). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Increase logexporter timeout and add debug logs

Ref - https://github.com/kubernetes/kubernetes/issues/63030#issuecomment-396335294

So it seems that logexporter isn't running on too many nodes on our 5k node cluster (~40% of nodes). As a result we fallback to ssh-based copying for so many nodes which is slow and hence the job times out. My feeling is it's because of slow scheduling of logexporter pods (and hence quite some nodes didn't even get the chance to run those pods before we delete the daemonset).

/cc @wojtek-t @krzyzacy 

```release-note
NONE
```

/sig scalability
/kind bug
/priority important-soon
/milestone v1.11
/status approved-for-milestone
2018-06-12 12:58:16 -07:00
Jing Ai
b365408e88 A few cleanups (remove duplicated env vars & unnecessary comments) on yaml files. 2018-06-12 10:53:54 -07:00
Jing Ai
4383c7d648 Update Calico addon yamls to make it work for both 2.x and 3.x. versions.
Co-authored-by: Casey Davenport <casey@tigera.io>
2018-06-12 10:00:51 -07:00
Shyam Jeedigunta
87225c0b9a Increase logexporter timeout and add debug logs 2018-06-12 16:30:04 +02:00
Kubernetes Submit Queue
8e03228c1a
Merge pull request #64643 from dashpole/memcg_poll
Automatic merge from submit-queue (batch tested with PRs 64503, 64903, 64643, 64987). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Use unix.EpollWait to determine when memcg events are available to be Read

**What this PR does / why we need it**:
This fixes a file descriptor leak introduced in https://github.com/kubernetes/kubernetes/pull/60531 when the `--experimental-kernel-memcg-notification` kubelet flag is enabled.  The root of the issue is that `unix.Read` blocks indefinitely when reading from an event file descriptor and there is nothing to read.  Since we refresh the memcg notifications, these reads accumulate until the memcg threshold is crossed, at which time all reads complete.  However, if the node never comes under memory pressure, the node can run out of file descriptors.

This PR changes the eviction manager to use `unix.EpollWait` to wait, with a 10 second timeout, for events to be available on the eventfd.  We only read from the eventfd when there is an event available to be read, preventing an accumulation of `unix.Read` threads, and allowing the event file descriptors to be reclaimed by the kernel.

This PR also breaks the creation, and updating of the memcg threshold into separate portions, and performs creation before starting the periodic synchronize calls.  It also moves the logic of configuring memory thresholds into memory_threshold_notifier into a separate file.

This also reverts https://github.com/kubernetes/kubernetes/pull/64582, as the underlying leak that caused us to disable it for testing is fixed here.

Fixes #62808

**Release note**:
```release-note
NONE
```

/sig node
/kind bug
/priority critical-urgent
2018-06-11 17:29:19 -07:00
Kubernetes Submit Queue
ec434662bd
Merge pull request #64503 from kgolab/kg-ca-rbac
Automatic merge from submit-queue (batch tested with PRs 64503, 64903, 64643, 64987). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Create system:cluster-autoscaler account & role and introduce it to C…

**What this PR does / why we need it**:

This PR adds cluster-autoscaler ClusterRole & binding, to be used by the Cluster Autoscaler (kubernetes/autoscaler repository).
It also updates GCE scripts to make CA use the cluster-autoscaler user account.

User account instead of Service account is chosen to be more in line with kube-scheduler.

**Which issue(s) this PR fixes**:

Fixes [issue 383](https://github.com/kubernetes/autoscaler/issues/383) from kubernetes/autoscaler.

**Special notes for your reviewer**:

This PR might be treated as a security fix since prior to it CA on GCE was using system:cluster-admin account, assumed due to default handling of unsecured & unauthenticated traffic over plain HTTP.

**Release note**:

```release-note
A cluster-autoscaler ClusterRole is added to cover only the functionality required by Cluster Autoscaler and avoid abusing system:cluster-admin role.

action required: Cloud providers other than GCE might want to update their deployments or sample yaml files to reuse the role created via add-on.
```
2018-06-11 17:29:13 -07:00
Kubernetes Submit Queue
de8cc31355
Merge pull request #64977 from aleksandra-malinowska/cluster-autoscaler-1.3.0-beta.1
Automatic merge from submit-queue (batch tested with PRs 64945, 64977). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Cluster Autoscaler 1.3.0-beta.1

Update Cluster Autoscaler version to 1.3.0-beta.1

```release-note
Update Cluster Autoscaler version to 1.3.0-beta.1. Release notes: https://github.com/kubernetes/autoscaler/releases/tag/cluster-autoscaler-1.3.0-beta.1
```
2018-06-11 12:38:14 -07:00
Karol Gołąb
9e2fa69d20 Limit the mounted directory to cluster-autoscaler/ 2018-06-11 21:03:47 +02:00
Aleksandra Malinowska
77a6892e92 Cluster Autoscaler 1.3.0-beta.1 2018-06-11 15:22:10 +02:00
Karol Gołąb
faa4dc39c4 Disambiguate a comment 2018-06-11 10:56:02 +02:00
Kubernetes Submit Queue
c2b27efd3b
Merge pull request #60699 from CaoShuFeng/remove-enable-custom-metrics
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

remove deprecated option '--enable-custom-metrics'

**Release note**:
```release-note
deprecated and inactive option '--enable-custom-metrics' is removed in 1.11
```
2018-06-08 11:23:02 -07:00
Karol Gołąb
f8fa60e9ea Limit access to configmaps 2018-06-08 18:02:37 +02:00