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 cherrypick batch #23024

Merged
merged 8 commits into from
Mar 16, 2016
Merged

Release 1.2 cherrypick batch #23024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c7a8125
Merge pull request #22989 from justinsb/non_masquerade_cidr_plus
Mar 15, 2016
a892c9f
Merge pull request #22942 from jsafrane/devel/aws-more-devices
Mar 15, 2016
705abe0
Merge pull request #22969 from nikhiljindal/upgradeTest
Mar 15, 2016
8603db4
Merge pull request #22993 from piosz/bump-heapster-1.0
Mar 15, 2016
066a2a7
Merge pull request #22948 from janetkuo/e2e-test-not-mutate
Mar 15, 2016
f873e76
Merge pull request #23012 from caesarxuchao/fix-22996
Mar 15, 2016
32aaa5a
Merge pull request #23005 from andyzheng0831/fix
Mar 15, 2016
fa979b3
Merge pull request #23020 from vishh/godeps-cadvisor
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
72 changes: 36 additions & 36 deletions Godeps/Godeps.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

43 changes: 22 additions & 21 deletions Godeps/_workspace/src/github.com/google/cadvisor/container/libcontainer/helpers.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 15 additions & 3 deletions Godeps/_workspace/src/github.com/google/cadvisor/container/raw/handler.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

40 changes: 2 additions & 38 deletions Godeps/_workspace/src/github.com/google/cadvisor/manager/manager.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions api/swagger-spec/extensions_v1beta1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7877,8 +7877,7 @@
"id": "v1beta1.ReplicaSetStatus",
"description": "ReplicaSetStatus represents the current status of a ReplicaSet.",
"required": [
"replicas",
"fullyLabeledReplicas"
"replicas"
],
"properties": {
"replicas": {
Expand Down
3 changes: 1 addition & 2 deletions api/swagger-spec/v1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17617,8 +17617,7 @@
"id": "v1.ReplicationControllerStatus",
"description": "ReplicationControllerStatus represents the current status of a replication controller.",
"required": [
"replicas",
"fullyLabeledReplicas"
"replicas"
],
"properties": {
"replicas": {
Expand Down
6 changes: 3 additions & 3 deletions cluster/addons/cluster-monitoring/google/heapster-controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
apiVersion: v1
kind: ReplicationController
metadata:
name: heapster-v1.0.0-beta2
name: heapster-v1.0.0
namespace: kube-system
labels:
k8s-app: heapster
Expand All @@ -25,7 +25,7 @@ spec:
kubernetes.io/cluster-service: "true"
spec:
containers:
- image: gcr.io/google_containers/heapster:v1.0.0-beta2
- image: gcr.io/google_containers/heapster:v1.0.0
name: heapster
resources:
# keep request = limit to keep this container in guaranteed class
Expand All @@ -44,7 +44,7 @@ spec:
- name: ssl-certs
mountPath: /etc/ssl/certs
readOnly: true
- image: gcr.io/google_containers/heapster:v1.0.0-beta2
- image: gcr.io/google_containers/heapster:v1.0.0
name: eventer
resources:
# keep request = limit to keep this container in guaranteed class
Expand Down
8 changes: 4 additions & 4 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
Expand Up @@ -3,13 +3,13 @@
{% set num_nodes = pillar.get('num_nodes', -1) -%}
{% if num_nodes >= 0 -%}
{% set metrics_memory = (200 + num_nodes * 4)|string + "Mi" -%}
{% set eventer_memory = (200000 + num_nodes * 500)|string + "Ki" -%}
{% set eventer_memory = (200 * 1024 + num_nodes * 500)|string + "Ki" -%}
{% endif -%}

apiVersion: v1
kind: ReplicationController
metadata:
name: heapster-v1.0.0-beta2
name: heapster-v1.0.0
namespace: kube-system
labels:
k8s-app: heapster
Expand All @@ -25,7 +25,7 @@ spec:
kubernetes.io/cluster-service: "true"
spec:
containers:
- image: gcr.io/google_containers/heapster:v1.0.0-beta2
- image: gcr.io/google_containers/heapster:v1.0.0
name: heapster
resources:
# keep request = limit to keep this container in guaranteed class
Expand All @@ -45,7 +45,7 @@ spec:
- name: ssl-certs
mountPath: /etc/ssl/certs
readOnly: true
- image: gcr.io/google_containers/heapster:v1.0.0-beta2
- image: gcr.io/google_containers/heapster:v1.0.0
name: eventer
resources:
# keep request = limit to keep this container in guaranteed class
Expand Down