Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Release 1.2 cherry pick batch #23006

Merged
merged 10 commits into from
Mar 15, 2016
Merged

Release 1.2 cherry pick batch #23006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
569c8fe
Merge pull request #21899 from zmerlynn/update-spark
Mar 12, 2016
be2ad9e
Merge pull request #22940 from mwielgus/heapster-adjustments
Mar 14, 2016
507e7a7
Merge pull request #22746 from deads2k/fix-discover-config
Mar 14, 2016
d9fb979
Merge pull request #22956 from caesarxuchao/generate-api-docs
Mar 14, 2016
f12f696
Merge pull request #22951 from derekwaynecarr/flake_ns
Mar 15, 2016
910e640
Merge pull request #22959 from ArtfulCoder/dnsconformtest
Mar 15, 2016
56a204a
Merge pull request #22899 from justinsb/aws_fix_e2e
Mar 15, 2016
da39b67
Merge pull request #22958 from jlowdermilk/run-test
Mar 15, 2016
e42c5c0
Merge pull request #22971 from andyzheng0831/fix
Mar 15, 2016
36c3c9b
versionize docs for release-1.2 after picks
eparis Mar 15, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 11 additions & 9 deletions cluster/addons/cluster-monitoring/google/heapster-controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
{% set heapster_memory = "200Mi" -%}
{% set metrics_memory = "200Mi" -%}
{% set eventer_memory = "200Mi" -%}
{% set num_nodes = pillar.get('num_nodes', -1) -%}
{% if num_nodes >= 0 -%}
{% set heapster_memory = (200 + num_nodes * 3)|string + "Mi" -%}
{% set metrics_memory = (200 + num_nodes * 4)|string + "Mi" -%}
{% set eventer_memory = (200 * 1024 + num_nodes * 500)|string + "Ki" -%}
{% endif -%}

apiVersion: v1
kind: ReplicationController
metadata:
name: heapster-v1.0.0-beta1
name: heapster-v1.0.0-beta2
namespace: kube-system
labels:
k8s-app: heapster
Expand All @@ -23,16 +25,16 @@ spec:
kubernetes.io/cluster-service: "true"
spec:
containers:
- image: gcr.io/google_containers/heapster:v1.0.0-beta1
- image: gcr.io/google_containers/heapster:v1.0.0-beta2
name: heapster
resources:
# keep request = limit to keep this container in guaranteed class
limits:
cpu: 100m
memory: {{ heapster_memory }}
memory: {{ metrics_memory }}
requests:
cpu: 100m
memory: {{ heapster_memory }}
memory: {{ metrics_memory }}
command:
- /heapster
- --source=kubernetes.summary_api:''
Expand All @@ -42,16 +44,16 @@ spec:
- name: ssl-certs
mountPath: /etc/ssl/certs
readOnly: true
- image: gcr.io/google_containers/heapster:v1.0.0-beta1
- image: gcr.io/google_containers/heapster:v1.0.0-beta2
name: eventer
resources:
# keep request = limit to keep this container in guaranteed class
limits:
cpu: 100m
memory: {{ heapster_memory }}
memory: {{ eventer_memory }}
requests:
cpu: 100m
memory: {{ heapster_memory }}
memory: {{ eventer_memory }}
command:
- /eventer
- --source=kubernetes:''
Expand Down
20 changes: 11 additions & 9 deletions cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
{% set heapster_memory = "200Mi" -%}
{% set metrics_memory = "200Mi" -%}
{% set eventer_memory = "200Mi" -%}
{% set num_nodes = pillar.get('num_nodes', -1) -%}
{% if num_nodes >= 0 -%}
{% set heapster_memory = (200 + num_nodes * 3)|string + "Mi" -%}
{% set metrics_memory = (200 + num_nodes * 4)|string + "Mi" -%}
{% set eventer_memory = (200000 + num_nodes * 500)|string + "Ki" -%}
{% endif -%}

apiVersion: v1
kind: ReplicationController
metadata:
name: heapster-v1.0.0-beta1
name: heapster-v1.0.0-beta2
namespace: kube-system
labels:
k8s-app: heapster
Expand All @@ -23,16 +25,16 @@ spec:
kubernetes.io/cluster-service: "true"
spec:
containers:
- image: gcr.io/google_containers/heapster:v1.0.0-beta1
- image: gcr.io/google_containers/heapster:v1.0.0-beta2
name: heapster
resources:
# keep request = limit to keep this container in guaranteed class
limits:
cpu: 100m
memory: {{ heapster_memory }}
memory: {{ metrics_memory }}
requests:
cpu: 100m
memory: {{ heapster_memory }}
memory: {{ metrics_memory }}
command:
- /heapster
- --source=kubernetes.summary_api:''
Expand All @@ -43,16 +45,16 @@ spec:
- name: ssl-certs
mountPath: /etc/ssl/certs
readOnly: true
- image: gcr.io/google_containers/heapster:v1.0.0-beta1
- image: gcr.io/google_containers/heapster:v1.0.0-beta2
name: eventer
resources:
# keep request = limit to keep this container in guaranteed class
limits:
cpu: 100m
memory: {{ heapster_memory }}
memory: {{ eventer_memory }}
requests:
cpu: 100m
memory: {{ heapster_memory }}
memory: {{ eventer_memory }}
command:
- /eventer
- --source=kubernetes:''
Expand Down
20 changes: 11 additions & 9 deletions cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
{% set heapster_memory = "200Mi" -%}
{% set metrics_memory = "200Mi" -%}
{% set eventer_memory = "200Mi" -%}
{% set num_nodes = pillar.get('num_nodes', -1) -%}
{% if num_nodes >= 0 -%}
{% set heapster_memory = (200 + num_nodes * 3)|string + "Mi" -%}
{% set metrics_memory = (200 + num_nodes * 4)|string + "Mi" -%}
{% set eventer_memory = (200 * 1024 + num_nodes * 500)|string + "Ki" -%}
{% endif -%}

apiVersion: v1
kind: ReplicationController
metadata:
name: heapster-v1.0.0-beta1
name: heapster-v1.0.0-beta2
namespace: kube-system
labels:
k8s-app: heapster
Expand All @@ -23,31 +25,31 @@ spec:
kubernetes.io/cluster-service: "true"
spec:
containers:
- image: gcr.io/google_containers/heapster:v1.0.0-beta1
- image: gcr.io/google_containers/heapster:v1.0.0-beta2
name: heapster
resources:
# keep request = limit to keep this container in guaranteed class
limits:
cpu: 100m
memory: {{ heapster_memory }}
memory: {{ metrics_memory }}
requests:
cpu: 100m
memory: {{ heapster_memory }}
memory: {{ metrics_memory }}
command:
- /heapster
- --source=kubernetes.summary_api:''
- --sink=influxdb:http://monitoring-influxdb:8086
- --metric_resolution=60s
- image: gcr.io/google_containers/heapster:v1.0.0-beta1
- image: gcr.io/google_containers/heapster:v1.0.0-beta2
name: eventer
resources:
# keep request = limit to keep this container in guaranteed class
limits:
cpu: 100m
memory: {{ heapster_memory }}
memory: {{ eventer_memory }}
requests:
cpu: 100m
memory: {{ heapster_memory }}
memory: {{ eventer_memory }}
command:
- /eventer
- --source=kubernetes:''
Expand Down
12 changes: 6 additions & 6 deletions cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{% set heapster_memory = "200Mi" -%}
{% set metrics_memory = "200Mi" -%}
{% set num_nodes = pillar.get('num_nodes', -1) -%}
{% if num_nodes >= 0 -%}
{% set heapster_memory = (200 + num_nodes * 3)|string + "Mi" -%}
{% set metrics_memory = (200 + num_nodes * 4)|string + "Mi" -%}
{% endif -%}

apiVersion: v1
kind: ReplicationController
metadata:
name: heapster-v1.0.0-beta1
name: heapster-v1.0.0-beta2
namespace: kube-system
labels:
k8s-app: heapster
Expand All @@ -23,16 +23,16 @@ spec:
kubernetes.io/cluster-service: "true"
spec:
containers:
- image: gcr.io/google_containers/heapster:v1.0.0-beta1
- image: gcr.io/google_containers/heapster:v1.0.0-beta2
name: heapster
resources:
# keep request = limit to keep this container in guaranteed class
limits:
cpu: 100m
memory: {{ heapster_memory }}
memory: {{ metrics_memory }}
requests:
cpu: 100m
memory: {{ heapster_memory }}
memory: {{ metrics_memory }}
command:
- /heapster
- --source=kubernetes.summary_api:''
Expand Down
7 changes: 4 additions & 3 deletions cluster/gce/trusty/configure.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,12 +254,13 @@ assemble_kubelet_flags() {
if [ -n "${KUBELET_TEST_ARGS:-}" ]; then
KUBELET_CMD_FLAGS="${KUBELET_CMD_FLAGS} ${KUBELET_TEST_ARGS}"
fi
if [ ! -z "${KUBELET_APISERVER:-}" ] && [ ! -z "${KUBELET_CERT:-}" ] && [ ! -z "${KUBELET_KEY:-}" ]; then
if [ "${KUBERNETES_MASTER:-}" = "true" ] && \
[ ! -z "${KUBELET_APISERVER:-}" ] && \
[ ! -z "${KUBELET_CERT:-}" ] && \
[ ! -z "${KUBELET_KEY:-}" ]; then
KUBELET_CMD_FLAGS="${KUBELET_CMD_FLAGS} --api-servers=https://${KUBELET_APISERVER}"
KUBELET_CMD_FLAGS="${KUBELET_CMD_FLAGS} --register-schedulable=false --reconcile-cidr=false"
KUBELET_CMD_FLAGS="${KUBELET_CMD_FLAGS} --pod-cidr=10.123.45.0/30"
else
KUBELET_CMD_FLAGS="${KUBELET_CMD_FLAGS} --pod-cidr=${MASTER_IP_RANGE}"
fi
if [ "${ENABLE_MANIFEST_URL:-}" = "true" ]; then
KUBELET_CMD_FLAGS="${KUBELET_CMD_FLAGS} --manifest-url=${MANIFEST_URL} --manifest-url-header=${MANIFEST_URL_HEADER}"
Expand Down
1 change: 1 addition & 0 deletions cluster/gce/trusty/master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ script
--system-cgroups=/system \
--runtime-cgroups=/docker-daemon \
--kubelet-cgroups=/kubelet \
--babysit-daemons=true \
${KUBELET_CMD_FLAGS} 1>>/var/log/kubelet.log 2>&1
end script

Expand Down
1 change: 1 addition & 0 deletions cluster/gce/trusty/node.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ script
--system-cgroups=/system \
--runtime-cgroups=/docker-daemon \
--kubelet-cgroups=/kubelet \
--babysit-daemons=true \
${KUBELET_CMD_FLAGS} 1>>/var/log/kubelet.log 2>&1
end script

Expand Down
2 changes: 1 addition & 1 deletion docs/admin/kubelet.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ kubelet
--volume-stats-agg-period=1m0s: Specifies interval for kubelet to calculate and cache the volume disk usage for all pods and volumes. To disable volume calculations, set to 0. Default: '1m'
```

###### Auto generated by spf13/cobra on 11-Mar-2016
###### Auto generated by spf13/cobra on 15-Mar-2016


<!-- BEGIN MUNGE: GENERATED_ANALYTICS -->
Expand Down