Merge pull request #1282 from lanmarti/main

Add resource requests and limits to prometheus-adapter container
This commit is contained in:
Paweł Krupa 2021-07-27 12:36:01 +02:00 committed by GitHub
commit bbdb21f08d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 3 deletions

View File

@ -206,6 +206,7 @@ function(params) {
'--secure-port=6443', '--secure-port=6443',
'--tls-cipher-suites=' + std.join(',', pa._config.tlsCipherSuites), '--tls-cipher-suites=' + std.join(',', pa._config.tlsCipherSuites),
], ],
resources: pa._config.resources,
ports: [{ containerPort: 6443 }], ports: [{ containerPort: 6443 }],
volumeMounts: [ volumeMounts: [
{ name: 'tmpfs', mountPath: '/tmp', readOnly: false }, { name: 'tmpfs', mountPath: '/tmp', readOnly: false },

View File

@ -38,7 +38,7 @@
"subdir": "grafana-builder" "subdir": "grafana-builder"
} }
}, },
"version": "a20c679492aae363414dce23bc63da09cf8a7287", "version": "4c6f9dabceb944ce894d79eeb516c98694f5759f",
"sum": "GRf2GvwEU4jhXV+JOonXSZ4wdDv8mnHBPCQ6TUVd+g8=" "sum": "GRf2GvwEU4jhXV+JOonXSZ4wdDv8mnHBPCQ6TUVd+g8="
}, },
{ {
@ -130,7 +130,7 @@
"subdir": "documentation/prometheus-mixin" "subdir": "documentation/prometheus-mixin"
} }
}, },
"version": "79d354ad2e7c3d510a7811176d5ffcd1b29c8b77", "version": "507d61fdeb4540c34102f41b7286895ecec19324",
"sum": "G3mFWvwIrrhG6hlPz/hQdE6ZNSim88DlbSDJN7enkhY=", "sum": "G3mFWvwIrrhG6hlPz/hQdE6ZNSim88DlbSDJN7enkhY=",
"name": "prometheus" "name": "prometheus"
}, },
@ -141,7 +141,7 @@
"subdir": "mixin" "subdir": "mixin"
} }
}, },
"version": "0f5223beb7e9cb7e62f0227bf5649deb851e6112", "version": "83419bc5e3c5f667410a04c1c9920e27c3779162",
"sum": "cajthvLKDjYgYHCKQU2g/pTMRkxcbuJEvTnCyJOihl8=", "sum": "cajthvLKDjYgYHCKQU2g/pTMRkxcbuJEvTnCyJOihl8=",
"name": "thanos-mixin" "name": "thanos-mixin"
}, },

View File

@ -40,6 +40,13 @@ spec:
name: prometheus-adapter name: prometheus-adapter
ports: ports:
- containerPort: 6443 - containerPort: 6443
resources:
limits:
cpu: 250m
memory: 180Mi
requests:
cpu: 102m
memory: 180Mi
volumeMounts: volumeMounts:
- mountPath: /tmp - mountPath: /tmp
name: tmpfs name: tmpfs