diff --git a/Makefile b/Makefile index bc6ded2dd46432310ad7494aee754020e6dd5520..b41d0c51146f11cf68d6687cc70bebb3f5579f2e 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ all: generate fmt test .PHONY: generate-in-docker generate-in-docker: @echo ">> Compiling assets and generating Kubernetes manifests" - $(CONTAINER_CMD) $(MAKE) $(MFLAGS) generate + $(CONTAINER_CMD) make $(MFLAGS) generate generate: manifests **.md @@ -42,7 +42,7 @@ test-e2e: test-in-docker: @echo ">> Compiling assets and generating Kubernetes manifests" - $(CONTAINER_CMD) $(MAKE) $(MFLAGS) test + $(CONTAINER_CMD) make $(MFLAGS) test $(JB_BINARY): go get -u github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb diff --git a/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet b/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet index 6b7f7f8a35a48559e137a8e39a6aca70e985bd8e..bc69347d47c95edccfb4a422f535851a9e477a3f 100644 --- a/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet +++ b/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet @@ -125,7 +125,7 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; // it so that the scheduler can decide if the pod is schedulable. container.withPorts(containerPort.new($._config.nodeExporter.port) + containerPort.withHostPort($._config.nodeExporter.port) + containerPort.withName('https')) + container.mixin.resources.withRequests({ cpu: '10m', memory: '20Mi' }) + - container.mixin.resources.withLimits({ cpu: '20m', memory: '40Mi' }) + + container.mixin.resources.withLimits({ cpu: '20m', memory: '60Mi' }) + container.withEnv([ip]); local c = [nodeExporter, proxy]; diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index dd279a2af6d5cbc9554a944dae1c026df52da47b..c78b87c226e574d19e41782238e40cc478b3a45b 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -8,7 +8,7 @@ "subdir": "jsonnet/kube-prometheus" } }, - "version": "81b9c9f9f6886ba1fbd61b05cdf0cc4f4d95eba8" + "version": "6562f95c143531d09d8c3d8629d8de98ab65a43d" }, { "name": "ksonnet", diff --git a/manifests/node-exporter-daemonset.yaml b/manifests/node-exporter-daemonset.yaml index f0729b5d7bd0b7ef28f24d30ae1e73ffdf8a45a0..913f90ee4eb66dd3ccec4eb67d38bbc888cd9be2 100644 --- a/manifests/node-exporter-daemonset.yaml +++ b/manifests/node-exporter-daemonset.yaml @@ -61,7 +61,7 @@ spec: resources: limits: cpu: 20m - memory: 40Mi + memory: 60Mi requests: cpu: 10m memory: 20Mi