@@ -7,11 +7,6 @@ local k = import 'ksonnet-util/kausal.libsonnet';
77 local configMap = k.core.v1.configMap,
88 configmap:
99 configMap.new(name, self .data),
10- httpdConfig:
11- configMap.new(name + '-httpd-config' )
12- + configMap.withData({
13- 'httpd.conf' : importstr 'httpd.conf' ,
14- }),
1510
1611 local container = k.core.v1.container,
1712 container::
@@ -26,9 +21,7 @@ local k = import 'ksonnet-util/kausal.libsonnet';
2621 local volumeMount = k.core.v1.volumeMount,
2722 deployment:
2823 deployment.new(name, replicas=1 , containers=[self .container])
29- + k.util.configMapVolumeMount(self .configmap, '/usr/local/apache2/htdocs' )
30- + k.util.configMapVolumeMount(self .httpdConfig, '/usr/local/apache2/conf/httpd.conf' , volumeMount.withSubPath('httpd.conf' )),
31-
24+ + k.util.configMapVolumeMount(self .configmap, '/usr/local/apache2/htdocs' ),
3225 },
3326
3427 withData(data):: { data: data },
@@ -54,6 +47,18 @@ local k = import 'ksonnet-util/kausal.libsonnet';
5447 ),
5548 }),
5649
50+ withHttpConfig():: {
51+ local configMap = k.core.v1.configMap,
52+ local volumeMount = k.core.v1.volumeMount,
53+ httpdConfig:
54+ configMap.new('httpd-config' )
55+ + configMap.withData({
56+ 'httpd.conf' : importstr 'httpd.conf' ,
57+ }),
58+ deployment+:
59+ k.util.configMapVolumeMount(self .httpdConfig, '/usr/local/apache2/conf/httpd.conf' , volumeMount.withSubPath('httpd.conf' )),
60+ },
61+
5762 metric:: {
5863 new(name, description)::
5964 self .withName(name)
0 commit comments