Skip to content

Commit 6fec43e

Browse files
committed
Update withHttpConfig() to accept a config that can be patched
1 parent 35a483d commit 6fec43e

File tree

2 files changed

+2
-11
lines changed

2 files changed

+2
-11
lines changed

static-exporter/jsonnetfile.json

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,6 @@
11
{
22
"version": 1,
33
"dependencies": [
4-
{
5-
"source": {
6-
"git": {
7-
"remote": "https://github.com/grafana/jsonnet-libs.git",
8-
"subdir": ""
9-
}
10-
},
11-
"version": "static-exporters-add-content-type-headers"
12-
},
134
{
145
"source": {
156
"git": {

static-exporter/main.libsonnet

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@ local k = import 'ksonnet-util/kausal.libsonnet';
4848
),
4949
}),
5050

51-
withHttpConfig():: {
51+
withHttpConfig(config=(importstr 'httpd.conf')):: {
5252
local configMap = k.core.v1.configMap,
5353
local volumeMount = k.core.v1.volumeMount,
5454
httpdConfig:
5555
configMap.new(self.name, 'httpd-config')
5656
+ configMap.withData({
57-
'httpd.conf': importstr 'httpd.conf',
57+
'httpd.conf': config,
5858
}),
5959
deployment+:
6060
k.util.configMapVolumeMount(self.httpdConfig, '/usr/local/apache2/conf/httpd.conf', volumeMount.withSubPath('httpd.conf')),

0 commit comments

Comments
 (0)