Save application.yaml as Object

Author: LEDfan

src/main/kotlin/eu/openanalytics/shinyproxyoperator/components/ConfigMapFactory.kt

@@ -1,15 +1,19 @@
 package eu.openanalytics.shinyproxyoperator.components
 
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.dataformat.yaml.YAMLFactory
 import eu.openanalytics.shinyproxyoperator.controller.ShinyProxyController
 import eu.openanalytics.shinyproxyoperator.crd.ShinyProxy
 import io.fabric8.kubernetes.api.model.ConfigMap
 import io.fabric8.kubernetes.api.model.ConfigMapBuilder
 import io.fabric8.kubernetes.client.KubernetesClient
 import mu.KotlinLogging
 
+
 class ConfigMapFactory(private val kubeClient: KubernetesClient) {
 
     private val logger = KotlinLogging.logger {}
+    private val mapper = ObjectMapper(YAMLFactory())
 
     fun create(shinyProxy: ShinyProxy): ConfigMap {
         val configMapDefinition: ConfigMap = ConfigMapBuilder()
@@ -24,7 +28,7 @@ class ConfigMapFactory(private val kubeClient: KubernetesClient) {
                         .withNewUid(shinyProxy.metadata.uid)
                     .endOwnerReference()
                 .endMetadata()
-                .addToData("application-in.yml", shinyProxy.spec.applicationYaml)
+                .addToData("application-in.yml", mapper.writeValueAsString(shinyProxy.spec.applicationYaml))
                 .build()
 
         val createdConfigMap = kubeClient.configMaps().inNamespace(shinyProxy.metadata.namespace).create(configMapDefinition)

src/main/kotlin/eu/openanalytics/shinyproxyoperator/crd/ShinyProxySpec.kt

@@ -2,12 +2,13 @@ package eu.openanalytics.shinyproxyoperator.crd
 
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.databind.JsonDeserializer
+import com.fasterxml.jackson.databind.JsonNode
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize
 import io.fabric8.kubernetes.api.model.KubernetesResource
 
 @JsonDeserialize(using = JsonDeserializer.None::class)
 class ShinyProxySpec : KubernetesResource {
 
     @JsonProperty("application.yml")
-    lateinit var applicationYaml: String
+    lateinit var applicationYaml: JsonNode
 }

src/main/resources/cr.yaml

@@ -3,7 +3,7 @@ kind: ShinyProxy
 metadata:
   name: example-shinyproxy
 spec:
-  application.yml: |
+  application.yml:
     proxy:
       title: Open Analytics Shiny Proxy
       logo-url: http://www.openanalytics.eu/sites/www.openanalytics.eu/themes/oa/logo.png

src/main/resources/crd.yaml

@@ -31,7 +31,7 @@ spec:
           type: object
           properties:
             application.yml:
-              type:  string
+              type:  object
           required:
            - application.yml
         status: