removing addonResizer from ksm
the addonresizer could lead to problems with the kube-state-metrics it is also removed from the ksm maintained kubernetes manifests https://github.com/kubernetes/kube-state-metrics/pull/750 Signed-off-by: Guus van Weelden <guus.vanweelden@moia.io>
This commit is contained in:
@@ -276,7 +276,6 @@ These are the available fields with their respective default values:
|
|||||||
nodeExporter: "v0.18.1",
|
nodeExporter: "v0.18.1",
|
||||||
kubeStateMetrics: "v1.5.0",
|
kubeStateMetrics: "v1.5.0",
|
||||||
kubeRbacProxy: "v0.4.1",
|
kubeRbacProxy: "v0.4.1",
|
||||||
addonResizer: "1.8.4",
|
|
||||||
prometheusOperator: "v0.30.0",
|
prometheusOperator: "v0.30.0",
|
||||||
prometheus: "v2.10.0",
|
prometheus: "v2.10.0",
|
||||||
},
|
},
|
||||||
@@ -286,7 +285,6 @@ These are the available fields with their respective default values:
|
|||||||
alertmanager: "quay.io/prometheus/alertmanager",
|
alertmanager: "quay.io/prometheus/alertmanager",
|
||||||
kubeStateMetrics: "quay.io/coreos/kube-state-metrics",
|
kubeStateMetrics: "quay.io/coreos/kube-state-metrics",
|
||||||
kubeRbacProxy: "quay.io/coreos/kube-rbac-proxy",
|
kubeRbacProxy: "quay.io/coreos/kube-rbac-proxy",
|
||||||
addonResizer: "k8s.gcr.io/addon-resizer",
|
|
||||||
nodeExporter: "quay.io/prometheus/node-exporter",
|
nodeExporter: "quay.io/prometheus/node-exporter",
|
||||||
prometheusOperator: "quay.io/coreos/prometheus-operator",
|
prometheusOperator: "quay.io/coreos/prometheus-operator",
|
||||||
},
|
},
|
||||||
@@ -325,8 +323,6 @@ These are the available fields with their respective default values:
|
|||||||
|
|
||||||
baseCPU: '100m',
|
baseCPU: '100m',
|
||||||
baseMemory: '150Mi',
|
baseMemory: '150Mi',
|
||||||
cpuPerNode: '2m',
|
|
||||||
memoryPerNode: '30Mi',
|
|
||||||
},
|
},
|
||||||
|
|
||||||
nodeExporter+:: {
|
nodeExporter+:: {
|
||||||
|
@@ -11,20 +11,16 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
|
|||||||
|
|
||||||
baseCPU: '100m',
|
baseCPU: '100m',
|
||||||
baseMemory: '150Mi',
|
baseMemory: '150Mi',
|
||||||
cpuPerNode: '2m',
|
|
||||||
memoryPerNode: '30Mi',
|
|
||||||
},
|
},
|
||||||
|
|
||||||
versions+:: {
|
versions+:: {
|
||||||
kubeStateMetrics: 'v1.7.2',
|
kubeStateMetrics: 'v1.7.2',
|
||||||
kubeRbacProxy: 'v0.4.1',
|
kubeRbacProxy: 'v0.4.1',
|
||||||
addonResizer: '1.8.4',
|
|
||||||
},
|
},
|
||||||
|
|
||||||
imageRepos+:: {
|
imageRepos+:: {
|
||||||
kubeStateMetrics: 'quay.io/coreos/kube-state-metrics',
|
kubeStateMetrics: 'quay.io/coreos/kube-state-metrics',
|
||||||
kubeRbacProxy: 'quay.io/coreos/kube-rbac-proxy',
|
kubeRbacProxy: 'quay.io/coreos/kube-rbac-proxy',
|
||||||
addonResizer: 'k8s.gcr.io/addon-resizer',
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -181,36 +177,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
|
|||||||
container.mixin.resources.withRequests({ cpu: $._config.kubeStateMetrics.baseCPU, memory: $._config.kubeStateMetrics.baseMemory }) +
|
container.mixin.resources.withRequests({ cpu: $._config.kubeStateMetrics.baseCPU, memory: $._config.kubeStateMetrics.baseMemory }) +
|
||||||
container.mixin.resources.withLimits({ cpu: $._config.kubeStateMetrics.baseCPU, memory: $._config.kubeStateMetrics.baseMemory });
|
container.mixin.resources.withLimits({ cpu: $._config.kubeStateMetrics.baseCPU, memory: $._config.kubeStateMetrics.baseMemory });
|
||||||
|
|
||||||
local addonResizer =
|
local c = [proxyClusterMetrics, proxySelfMetrics, kubeStateMetrics];
|
||||||
container.new('addon-resizer', $._config.imageRepos.addonResizer + ':' + $._config.versions.addonResizer) +
|
|
||||||
container.withCommand([
|
|
||||||
'/pod_nanny',
|
|
||||||
'--container=kube-state-metrics',
|
|
||||||
'--cpu=' + $._config.kubeStateMetrics.baseCPU,
|
|
||||||
'--extra-cpu=' + $._config.kubeStateMetrics.cpuPerNode,
|
|
||||||
'--memory=' + $._config.kubeStateMetrics.baseMemory,
|
|
||||||
'--extra-memory=' + $._config.kubeStateMetrics.memoryPerNode,
|
|
||||||
'--threshold=5',
|
|
||||||
'--deployment=kube-state-metrics',
|
|
||||||
]) +
|
|
||||||
container.withEnv([
|
|
||||||
{
|
|
||||||
name: 'MY_POD_NAME',
|
|
||||||
valueFrom: {
|
|
||||||
fieldRef: { apiVersion: 'v1', fieldPath: 'metadata.name' },
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: 'MY_POD_NAMESPACE',
|
|
||||||
valueFrom: {
|
|
||||||
fieldRef: { apiVersion: 'v1', fieldPath: 'metadata.namespace' },
|
|
||||||
},
|
|
||||||
},
|
|
||||||
]) +
|
|
||||||
container.mixin.resources.withRequests($._config.resources['addon-resizer'].requests) +
|
|
||||||
container.mixin.resources.withLimits($._config.resources['addon-resizer'].limits);
|
|
||||||
|
|
||||||
local c = [proxyClusterMetrics, proxySelfMetrics, kubeStateMetrics, addonResizer];
|
|
||||||
|
|
||||||
deployment.new('kube-state-metrics', 1, c, podLabels) +
|
deployment.new('kube-state-metrics', 1, c, podLabels) +
|
||||||
deployment.mixin.metadata.withNamespace($._config.namespace) +
|
deployment.mixin.metadata.withNamespace($._config.namespace) +
|
||||||
|
Reference in New Issue
Block a user