Skip to content

Commit b4739b5

Browse files
mikedanesemikedanese
committed
Revert "Merge pull request kubernetes#22893 from Q-Lee/nanny-heapster"
This reverts commit 1f8773e, reversing changes made to 9dfbcae.
1 parent 590038d commit b4739b5

File tree

6 files changed

+21
-250
lines changed

6 files changed

+21
-250
lines changed

‎cluster/addons/cluster-monitoring/google/heapster-controller.yaml

+5-64
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
{% set metrics_memory = "200Mi" -%}
22
{% set eventer_memory = "200Mi" -%}
3-
{% set metrics_memory_per_node = 4 -%}
4-
{% set eventer_memory_per_node = 500 -%}
53
{% set num_nodes = pillar.get('num_nodes', -1) -%}
64
{% if num_nodes >= 0 -%}
7-
{% set metrics_memory = (200 + num_nodes * metrics_memory_per_node)|string + "Mi" -%}
8-
{% set eventer_memory = (200 * 1024 + num_nodes * eventer_memory_per_node)|string + "Ki" -%}
5+
{% set metrics_memory = (200 + num_nodes * 4)|string + "Mi" -%}
6+
{% set eventer_memory = (200 * 1024 + num_nodes * 500)|string + "Ki" -%}
97
{% endif -%}
108

11-
apiVersion: extensions/v1beta1
12-
kind: Deployment
9+
apiVersion: v1
10+
kind: ReplicationController
1311
metadata:
1412
name: heapster-v1.1.0-beta1
1513
namespace: kube-system
@@ -19,8 +17,7 @@ metadata:
1917
spec:
2018
replicas: 1
2119
selector:
22-
matchLabels:
23-
k8s-app: heapster
20+
k8s-app: heapster
2421
template:
2522
metadata:
2623
labels:
@@ -65,62 +62,6 @@ spec:
6562
- name: ssl-certs
6663
mountPath: /etc/ssl/certs
6764
readOnly: true
68-
- image: gcr.io/google_containers/addon-resizer:1.0
69-
name: heapster-nanny
70-
resources:
71-
limits:
72-
cpu: 50m
73-
memory: 100Mi
74-
requests:
75-
cpu: 50m
76-
memory: 100Mi
77-
env:
78-
- name: MY_POD_NAME
79-
valueFrom:
80-
fieldRef:
81-
fieldPath: metadata.name
82-
- name: MY_POD_NAMESPACE
83-
valueFrom:
84-
fieldRef:
85-
fieldPath: metadata.namespace
86-
command:
87-
- /pod_nanny
88-
- --cpu=100m
89-
- --extra-cpu=0m
90-
- --memory={{ metrics_memory }}
91-
- --extra-memory={{metrics_memory_per_node}}Mi
92-
- --threshold=5
93-
- --deployment=heapster-v1.1.0-beta1
94-
- --container=heapster
95-
- --poll-period=300000
96-
- image: gcr.io/google_containers/addon-resizer:1.0
97-
name: eventer-nanny
98-
resources:
99-
limits:
100-
cpu: 50m
101-
memory: 100Mi
102-
requests:
103-
cpu: 50m
104-
memory: 100Mi
105-
env:
106-
- name: MY_POD_NAME
107-
valueFrom:
108-
fieldRef:
109-
fieldPath: metadata.name
110-
- name: MY_POD_NAMESPACE
111-
valueFrom:
112-
fieldRef:
113-
fieldPath: metadata.namespace
114-
command:
115-
- /pod_nanny
116-
- --cpu=100m
117-
- --extra-cpu=0m
118-
- --memory={{eventer_memory}}
119-
- --extra-memory={{eventer_memory_per_node}}Ki
120-
- --threshold=5
121-
- --deployment=heapster-v1.1.0-beta1
122-
- --container=eventer
123-
- --poll-period=300000
12465
volumes:
12566
- name: ssl-certs
12667
hostPath:

‎cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml

+5-64
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
{% set metrics_memory = "200Mi" -%}
22
{% set eventer_memory = "200Mi" -%}
3-
{% set metrics_memory_per_node = 4 -%}
4-
{% set eventer_memory_per_node = 500 -%}
53
{% set num_nodes = pillar.get('num_nodes', -1) -%}
64
{% if num_nodes >= 0 -%}
7-
{% set metrics_memory = (200 + num_nodes * metrics_memory_per_node)|string + "Mi" -%}
8-
{% set eventer_memory = (200 * 1024 + num_nodes * eventer_memory_per_node)|string + "Ki" -%}
5+
{% set metrics_memory = (200 + num_nodes * 4)|string + "Mi" -%}
6+
{% set eventer_memory = (200 * 1024 + num_nodes * 500)|string + "Ki" -%}
97
{% endif -%}
108

11-
apiVersion: extensions/v1beta1
12-
kind: Deployment
9+
apiVersion: v1
10+
kind: ReplicationController
1311
metadata:
1412
name: heapster-v1.1.0-beta1
1513
namespace: kube-system
@@ -19,8 +17,7 @@ metadata:
1917
spec:
2018
replicas: 1
2119
selector:
22-
matchLabels:
23-
k8s-app: heapster
20+
k8s-app: heapster
2421
template:
2522
metadata:
2623
labels:
@@ -66,62 +63,6 @@ spec:
6663
- name: ssl-certs
6764
mountPath: /etc/ssl/certs
6865
readOnly: true
69-
- image: gcr.io/google_containers/addon-resizer:1.0
70-
name: heapster-nanny
71-
resources:
72-
limits:
73-
cpu: 50m
74-
memory: 100Mi
75-
requests:
76-
cpu: 50m
77-
memory: 100Mi
78-
env:
79-
- name: MY_POD_NAME
80-
valueFrom:
81-
fieldRef:
82-
fieldPath: metadata.name
83-
- name: MY_POD_NAMESPACE
84-
valueFrom:
85-
fieldRef:
86-
fieldPath: metadata.namespace
87-
command:
88-
- /pod_nanny
89-
- --cpu=100m
90-
- --extra-cpu=0m
91-
- --memory={{ metrics_memory }}
92-
- --extra-memory={{ metrics_memory_per_node }}Mi
93-
- --threshold=5
94-
- --deployment=heapster-v1.1.0-beta1
95-
- --container=heapster
96-
- --poll-period=300000
97-
- image: gcr.io/google_containers/addon-resizer:1.0
98-
name: eventer-nanny
99-
resources:
100-
limits:
101-
cpu: 50m
102-
memory: 100Mi
103-
requests:
104-
cpu: 50m
105-
memory: 100Mi
106-
env:
107-
- name: MY_POD_NAME
108-
valueFrom:
109-
fieldRef:
110-
fieldPath: metadata.name
111-
- name: MY_POD_NAMESPACE
112-
valueFrom:
113-
fieldRef:
114-
fieldPath: metadata.namespace
115-
command:
116-
- /pod_nanny
117-
- --cpu=100m
118-
- --extra-cpu=0m
119-
- --memory={{ eventer_memory }}
120-
- --extra-memory={{ eventer_memory_per_node }}Ki
121-
- --threshold=5
122-
- --deployment=heapster-v1.1.0-beta1
123-
- --container=eventer
124-
- --poll-period=300000
12566
volumes:
12667
- name: ssl-certs
12768
hostPath:

‎cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml

+5-65
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
{% set metrics_memory = "200Mi" -%}
22
{% set eventer_memory = "200Mi" -%}
3-
{% set metrics_memory_per_node = 4 -%}
4-
{% set eventer_memory_per_node = 500 -%}
53
{% set num_nodes = pillar.get('num_nodes', -1) -%}
64
{% if num_nodes >= 0 -%}
7-
{% set metrics_memory = (200 + num_nodes * metrics_memory_per_node)|string + "Mi" -%}
8-
{% set eventer_memory = (200 * 1024 + num_nodes * eventer_memory_per_node)|string + "Ki" -%}
5+
{% set metrics_memory = (200 + num_nodes * 4)|string + "Mi" -%}
6+
{% set eventer_memory = (200 * 1024 + num_nodes * 500)|string + "Ki" -%}
97
{% endif -%}
108

11-
apiVersion: extensions/v1beta1
12-
kind: Deployment
9+
apiVersion: v1
10+
kind: ReplicationController
1311
metadata:
1412
name: heapster-v1.1.0-beta1
1513
namespace: kube-system
@@ -19,8 +17,7 @@ metadata:
1917
spec:
2018
replicas: 1
2119
selector:
22-
matchLabels:
23-
k8s-app: heapster
20+
k8s-app: heapster
2421
template:
2522
metadata:
2623
labels:
@@ -57,60 +54,3 @@ spec:
5754
- /eventer
5855
- --source=kubernetes:''
5956
- --sink=influxdb:http://monitoring-influxdb:8086
60-
- image: gcr.io/google_containers/addon-resizer:1.0
61-
name: heapster-nanny
62-
resources:
63-
limits:
64-
cpu: 50m
65-
memory: 100Mi
66-
requests:
67-
cpu: 50m
68-
memory: 100Mi
69-
env:
70-
- name: MY_POD_NAME
71-
valueFrom:
72-
fieldRef:
73-
fieldPath: metadata.name
74-
- name: MY_POD_NAMESPACE
75-
valueFrom:
76-
fieldRef:
77-
fieldPath: metadata.namespace
78-
command:
79-
- /pod_nanny
80-
- --cpu=100m
81-
- --extra-cpu=0m
82-
- --memory={{ metrics_memory }}
83-
- --extra-memory={{ metrics_memory_per_node }}Mi
84-
- --threshold=5
85-
- --deployment=heapster-v1.1.0-beta1
86-
- --container=heapster
87-
- --poll-period=300000
88-
- image: gcr.io/google_containers/addon-resizer:1.0
89-
name: eventer-nanny
90-
resources:
91-
limits:
92-
cpu: 50m
93-
memory: 100Mi
94-
requests:
95-
cpu: 50m
96-
memory: 100Mi
97-
env:
98-
- name: MY_POD_NAME
99-
valueFrom:
100-
fieldRef:
101-
fieldPath: metadata.name
102-
- name: MY_POD_NAMESPACE
103-
valueFrom:
104-
fieldRef:
105-
fieldPath: metadata.namespace
106-
command:
107-
- /pod_nanny
108-
- --cpu=100m
109-
- --extra-cpu=0m
110-
- --memory={{ eventer_memory }}
111-
- --extra-memory={{ eventer_memory_per_node }}Ki
112-
- --threshold=5
113-
- --deployment=heapster-v1.1.0-beta1
114-
- --container=eventer
115-
- --poll-period=300000
116-

‎cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml

+4-34
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
{% set metrics_memory = "200Mi" -%}
2-
{% set metrics_memory_per_node = 4 -%}
32
{% set num_nodes = pillar.get('num_nodes', -1) -%}
43
{% if num_nodes >= 0 -%}
5-
{% set metrics_memory = (200 + num_nodes * metrics_memory_per_node)|string + "Mi" -%}
4+
{% set metrics_memory = (200 + num_nodes * 4)|string + "Mi" -%}
65
{% endif -%}
76

8-
apiVersion: extensions/v1beta1
9-
kind: Deployment
7+
apiVersion: v1
8+
kind: ReplicationController
109
metadata:
1110
name: heapster-v1.1.0-beta1
1211
namespace: kube-system
@@ -16,8 +15,7 @@ metadata:
1615
spec:
1716
replicas: 1
1817
selector:
19-
matchLabels:
20-
k8s-app: heapster
18+
k8s-app: heapster
2119
template:
2220
metadata:
2321
labels:
@@ -39,31 +37,3 @@ spec:
3937
- /heapster
4038
- --source=kubernetes.summary_api:''
4139
- --metric_resolution=60s
42-
- image: gcr.io/google_containers/addon-resizer:1.0
43-
name: heapster-nanny
44-
resources:
45-
limits:
46-
cpu: 50m
47-
memory: 100Mi
48-
requests:
49-
cpu: 50m
50-
memory: 100Mi
51-
env:
52-
- name: MY_POD_NAME
53-
valueFrom:
54-
fieldRef:
55-
fieldPath: metadata.name
56-
- name: MY_POD_NAMESPACE
57-
valueFrom:
58-
fieldRef:
59-
fieldPath: metadata.namespace
60-
command:
61-
- /pod_nanny
62-
- --cpu=100m
63-
- --extra-cpu=0m
64-
- --memory={{ metrics_memory }}
65-
- --extra-memory={{ metrics_memory_per_node }}Mi
66-
- --threshold=5
67-
- --deployment=heapster-v1.1.0-beta1
68-
- --container=heapster
69-
- --poll-period=300000

‎cluster/saltbase/salt/kube-addons/kube-addon-update.sh

-1
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,6 @@ function update-addons() {
481481
# That's why we pass an empty string as the version separator.
482482
# If the description differs on disk, the object should be recreated.
483483
# This is not implemented in this version.
484-
reconcile-objects ${addon_path} Deployment "" &
485484
reconcile-objects ${addon_path} Service "" &
486485
reconcile-objects ${addon_path} PersistentVolume "" &
487486
reconcile-objects ${addon_path} PersistentVolumeClaim "" &

‎test/e2e/monitoring.go

+2-22
Original file line numberDiff line numberDiff line change
@@ -102,19 +102,14 @@ func verifyExpectedRcsExistAndGetExpectedPods(c *client.Client) ([]string, error
102102
for _, rcLabel := range rcLabels {
103103
selector := labels.Set{"k8s-app": rcLabel}.AsSelector()
104104
options := api.ListOptions{LabelSelector: selector}
105-
deploymentList, err := c.Deployments(api.NamespaceSystem).List(options)
106-
if err != nil {
107-
return nil, err
108-
}
109105
rcList, err := c.ReplicationControllers(api.NamespaceSystem).List(options)
110106
if err != nil {
111107
return nil, err
112108
}
113-
if (len(rcList.Items) + len(deploymentList.Items)) != 1 {
114-
return nil, fmt.Errorf("expected to find one replica for RC or deployment with label %s but got %d",
109+
if len(rcList.Items) != 1 {
110+
return nil, fmt.Errorf("expected to find one replica for RC with label %s but got %d",
115111
rcLabel, len(rcList.Items))
116112
}
117-
// Check all the replication controllers.
118113
for _, rc := range rcList.Items {
119114
selector := labels.Set(rc.Spec.Selector).AsSelector()
120115
options := api.ListOptions{LabelSelector: selector}
@@ -129,21 +124,6 @@ func verifyExpectedRcsExistAndGetExpectedPods(c *client.Client) ([]string, error
129124
expectedPods = append(expectedPods, string(pod.UID))
130125
}
131126
}
132-
// Do the same for all deployments.
133-
for _, rc := range deploymentList.Items {
134-
selector := labels.Set(rc.Spec.Selector.MatchLabels).AsSelector()
135-
options := api.ListOptions{LabelSelector: selector}
136-
podList, err := c.Pods(api.NamespaceSystem).List(options)
137-
if err != nil {
138-
return nil, err
139-
}
140-
for _, pod := range podList.Items {
141-
if pod.DeletionTimestamp != nil {
142-
continue
143-
}
144-
expectedPods = append(expectedPods, string(pod.UID))
145-
}
146-
}
147127
}
148128
return expectedPods, nil
149129
}

0 commit comments

Comments
 (0)