Skip to content

Commit

Permalink
fix heapster issues (#953)
Browse files Browse the repository at this point in the history
  • Loading branch information
mrIncompetent committed Apr 24, 2018
1 parent 7b85ea6 commit 9e501e8
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 119 deletions.
1 change: 1 addition & 0 deletions addon-manager/addons/dashboard/dashboard-controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ spec:
protocol: TCP
args:
- --auto-generate-certificates
- --heapster-host=http://heapster:80
volumeMounts:
- name: kubernetes-dashboard-certs
mountPath: /certs
Expand Down
82 changes: 14 additions & 68 deletions addon-manager/addons/heapster/heapster-controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,6 @@ metadata:
kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile
---
apiVersion: v1
kind: ConfigMap
metadata:
name: heapster-config
namespace: kube-system
labels:
kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: EnsureExists
data:
NannyConfiguration: |-
apiVersion: nannyconfig/v1alpha1
kind: NannyConfiguration
---
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
Expand All @@ -29,69 +16,28 @@ metadata:
k8s-app: heapster
kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile
version: v1.5.0
spec:
replicas: 1
selector:
matchLabels:
k8s-app: heapster
version: v1.5.0
template:
metadata:
labels:
k8s-app: heapster
version: v1.5.0
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
spec:
serviceAccount: heapster
containers:
- image: gcr.io/google_containers/heapster-amd64:v1.5.0
name: heapster
livenessProbe:
httpGet:
path: /healthz
port: 8082
scheme: HTTP
initialDelaySeconds: 180
timeoutSeconds: 5
command:
- /heapster
- --source=kubernetes.summary_api:''
- image: gcr.io/google_containers/addon-resizer:1.8.1
name: heapster-nanny
resources:
limits:
cpu: 50m
memory: 256Mi
env:
- name: MY_POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: MY_POD_NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.namespace
volumeMounts:
- name: heapster-config-volume
mountPath: /etc/config
command:
- /pod_nanny
- --config-dir=/etc/config
- --cpu=80m
- --extra-cpu=0.5m
- --memory=140Mi
- --extra-memory=4Mi
- --threshold=5
- --deployment=heapster-v1.5.0
- --container=heapster
- --poll-period=300000
- --estimator=exponential
volumes:
- name: heapster-config-volume
configMap:
name: heapster-config
serviceAccountName: heapster
tolerations:
- key: "CriticalAddonsOnly"
operator: "Exists"
- image: gcr.io/google_containers/heapster-amd64:v1.5.2
name: heapster
livenessProbe:
httpGet:
path: /healthz
port: 8082
scheme: HTTP
initialDelaySeconds: 180
timeoutSeconds: 5
command:
- /heapster
- --source=kubernetes.summary_api:https://kubernetes.default.svc?kubeletHttps=true&kubeletPort=10250&insecure=true
- --metric-resolution=30s
47 changes: 15 additions & 32 deletions addon-manager/addons/heapster/heapster-rbac.yaml
Original file line number Diff line number Diff line change
@@ -1,58 +1,41 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: heapster-binding
labels:
kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: system:heapster
subjects:
- kind: ServiceAccount
name: heapster
namespace: kube-system
---
# Heapster's pod_nanny monitors the heapster deployment & its pod(s), and scales
# the resources of the deployment if necessary.
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
kind: ClusterRole
metadata:
name: system:pod-nanny
namespace: kube-system
labels:
kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile
name: heapster-patched
rules:
- apiGroups:
- ""
resources:
- events
- namespaces
- nodes
- nodes/stats
- pods
verbs:
- get
- list
- watch
- apiGroups:
- "extensions"
- extensions
resources:
- deployments
verbs:
- get
- update
- list
- watch
---
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
kind: ClusterRoleBinding
metadata:
name: heapster-binding
namespace: kube-system
name: heapster-patched
labels:
kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: system:pod-nanny
kind: ClusterRole
name: heapster-patched
subjects:
- kind: ServiceAccount
name: heapster
namespace: kube-system
---
14 changes: 7 additions & 7 deletions addon-manager/addons/heapster/heapster-service.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
kind: Service
apiVersion: v1
metadata:
metadata:
name: heapster
namespace: kube-system
labels:
labels:
kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile
kubernetes.io/name: "Heapster"
spec:
ports:
- port: 80
targetPort: 8082
selector:
spec:
ports:
- port: 80
targetPort: 8082
selector:
k8s-app: heapster
24 changes: 12 additions & 12 deletions config/kubermatic/static/master/versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ versions:
etcd-operator-version: v0.6.0
etcd-cluster-version: 3.2.7
kube-machine-version: v0.2.3
addon-manager-version: v1.9.4
addon-manager-version: v1.9.5
pod-network-bridge: v0.4
machine-controller-version: v0.5.1
kube-state-metrics-version: latest
Expand All @@ -40,7 +40,7 @@ versions:
etcd-operator-version: v0.6.0
etcd-cluster-version: 3.2.7
kube-machine-version: v0.2.3
addon-manager-version: v1.9.4
addon-manager-version: v1.9.5
pod-network-bridge: v0.4
machine-controller-version: v0.5.1
kube-state-metrics-version: latest
Expand All @@ -62,7 +62,7 @@ versions:
etcd-operator-version: v0.6.0
etcd-cluster-version: 3.2.7
kube-machine-version: v0.2.3
addon-manager-version: v1.9.4
addon-manager-version: v1.9.5
pod-network-bridge: v0.4
machine-controller-version: v0.5.1
kube-state-metrics-version: latest
Expand All @@ -84,7 +84,7 @@ versions:
etcd-operator-version: v0.6.0
etcd-cluster-version: 3.2.7
kube-machine-version: v0.2.3
addon-manager-version: v1.9.4
addon-manager-version: v1.9.5
pod-network-bridge: v0.4
machine-controller-version: v0.5.1
kube-state-metrics-version: latest
Expand All @@ -106,7 +106,7 @@ versions:
etcd-operator-version: v0.6.0
etcd-cluster-version: 3.2.7
kube-machine-version: v0.2.3
addon-manager-version: v1.9.4
addon-manager-version: v1.9.5
pod-network-bridge: v0.4
machine-controller-version: v0.5.1
kube-state-metrics-version: latest
Expand All @@ -128,7 +128,7 @@ versions:
etcd-operator-version: v0.6.0
etcd-cluster-version: 3.2.7
kube-machine-version: v0.2.3
addon-manager-version: v1.9.4
addon-manager-version: v1.9.5
pod-network-bridge: v0.4
machine-controller-version: v0.5.1
kube-state-metrics-version: latest
Expand All @@ -150,7 +150,7 @@ versions:
etcd-operator-version: v0.6.0
etcd-cluster-version: 3.2.7
kube-machine-version: v0.2.3
addon-manager-version: v1.9.4
addon-manager-version: v1.9.5
pod-network-bridge: v0.4
machine-controller-version: v0.5.1
kube-state-metrics-version: latest
Expand All @@ -172,7 +172,7 @@ versions:
etcd-operator-version: v0.6.0
etcd-cluster-version: 3.2.7
kube-machine-version: v0.2.3
addon-manager-version: v1.9.4
addon-manager-version: v1.9.5
pod-network-bridge: v0.4
machine-controller-version: v0.5.1
kube-state-metrics-version: latest
Expand All @@ -194,7 +194,7 @@ versions:
etcd-operator-version: v0.6.0
etcd-cluster-version: 3.2.7
kube-machine-version: v0.2.3
addon-manager-version: v1.9.4
addon-manager-version: v1.9.5
pod-network-bridge: v0.4
machine-controller-version: v0.5.1
kube-state-metrics-version: latest
Expand All @@ -216,7 +216,7 @@ versions:
etcd-operator-version: v0.6.0
etcd-cluster-version: 3.2.7
kube-machine-version: v0.2.3
addon-manager-version: v1.9.4
addon-manager-version: v1.9.5
pod-network-bridge: v0.4
machine-controller-version: v0.5.1
kube-state-metrics-version: latest
Expand All @@ -238,7 +238,7 @@ versions:
etcd-operator-version: v0.6.0
etcd-cluster-version: 3.2.7
kube-machine-version: v0.2.3
addon-manager-version: v1.9.4
addon-manager-version: v1.9.5
pod-network-bridge: v0.4
machine-controller-version: v0.5.1
kube-state-metrics-version: latest
Expand All @@ -260,7 +260,7 @@ versions:
etcd-operator-version: v0.6.0
etcd-cluster-version: 3.2.7
kube-machine-version: v0.2.3
addon-manager-version: v1.9.4
addon-manager-version: v1.9.5
pod-network-bridge: v0.4
machine-controller-version: v0.5.1
kube-state-metrics-version: latest

0 comments on commit 9e501e8

Please sign in to comment.