Refactor CRD

Author: LEDfan

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

@@ -28,7 +28,7 @@ class ConfigMapFactory(private val kubeClient: KubernetesClient) {
                         .withNewUid(shinyProxy.metadata.uid)
                     .endOwnerReference()
                 .endMetadata()
-                .addToData("application-in.yml", mapper.writeValueAsString(shinyProxy.spec.applicationYaml))
+                .addToData("application-in.yml", mapper.writeValueAsString(shinyProxy.spec))
                 .build()
 
         val createdConfigMap = kubeClient.configMaps().inNamespace(shinyProxy.metadata.namespace).create(configMapDefinition)

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

@@ -1,8 +1,9 @@
 package eu.openanalytics.shinyproxyoperator.crd
 
+import com.fasterxml.jackson.databind.JsonNode
 import io.fabric8.kubernetes.client.CustomResource
 
 class ShinyProxy : CustomResource() {
-    lateinit var spec: ShinyProxySpec
+    lateinit var spec: JsonNode
     lateinit var status: ShinyProxyStatus
 }

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

@@ -3,46 +3,44 @@ kind: ShinyProxy
 metadata:
   name: example-shinyproxy
 spec:
-  application.yml:
-    proxy:
-      title: Open Analytics Shiny Proxy
-      logo-url: http://www.openanalytics.eu/sites/www.openanalytics.eu/themes/oa/logo.png
-      landing-page: /
-      heartbeat-rate: 10000
-      heartbeat-timeout: 60000
-      port: 8080
-      authentication: simple
-      #admin-groups: scientists
-      container-backend: kubernetes
-      #kubernetes:
-         #url: https://172.17.0.2:8443
-      # Example: 'simple' authentication configuration
-      users:
-      - name: jack
-        password: password
-        groups: scientists
-      - name: jeff
-        password: password
-        groups: mathematicians
-      # Example: 'ldap' authentication configuration
-      specs:
-      - id: 01_hello
-        display-name: Hello Application
-        description: Application which demonstrates the basics of a Shiny app
-        container-cmd: ["R", "-e", "shinyproxy::run_01_hello()"]
-        container-image: openanalytics/shinyproxy-demo
-        #kubernetes-pod-patches: |
-         #- op: replace
-           #path: /metadata/namespace
-           #value: my-namespace
-         #- op: add
-           #path: /spec/containers/0/resources
-           #value:
-             #requests:
-               #cpu: "1"
-             #limits:
-               #cpu: "1"
-      - id: 06_tabsets
-        container-cmd: ["R", "-e", "shinyproxy::run_06_tabsets()"]
-        container-image: openanalytics/shinyproxy-demo
-
+  proxy:
+    title: Open Analytics Shiny Proxy
+    logoUrl: http://www.openanalytics.eu/sites/www.openanalytics.eu/themes/oa/logo.png
+    landingPage: /
+    heartbeatRate: 10000
+    heartbeatTimeout: 60000
+    port: 8080
+    authentication: simple
+    #admin-groups: scientists
+    containerBackend: kubernetes
+    #kubernetes:
+       #url: https://172.17.0.2:8443
+    # Example: 'simple' authentication configuration
+    users:
+    - name: jack
+      password: password
+      groups: scientists
+    - name: jeff
+      password: password
+      groups: mathematicians
+    # Example: 'ldap' authentication configuration
+    specs:
+    - id: 01_hello
+      displayName: Hello Application
+      description: Application which demonstrates the basics of a Shiny app
+      containerCmd: ["R", "-e", "shinyproxy::run_01_hello()"]
+      containerImage: openanalytics/shinyproxy-demo
+      #kubernetes-pod-patches: |
+       #- op: replace
+         #path: /metadata/namespace
+         #value: my-namespace
+       #- op: add
+         #path: /spec/containers/0/resources
+         #value:
+           #requests:
+             #cpu: "1"
+           #limits:
+             #cpu: "1"
+    - id: 06_tabsets
+      container-cmd: ["R", "-e", "shinyproxy::run_06_tabsets()"]
+      container-image: openanalytics/shinyproxy-demo

src/main/resources/cr.yaml

@@ -13,6 +13,7 @@ spec:
   validation:
     openAPIV3Schema:
       description: ShinyProxy
+      type: object
       properties:
         apiVersion:
           description: 'APIVersion defines the versioned schema of this representation
@@ -26,21 +27,96 @@ spec:
           type: string
         metadata:
           type: object
+          properties:
+            name:
+              type: string
+          required:
+           - name
         spec:
-          description: ShinyProxySpec defines the desired state of ShinyProxy
+          description: Specification of the ShinyProxy (i.e. application.yml)
           type: object
           properties:
-            application.yml:
-              type:  object
+            proxy:
+              type: object
+              properties:
+                title:
+                  type: string
+                logoUrl:
+                  type: string
+                landingPage:
+                  type: string
+                heartbeatRate:
+                  type: integer
+                heartbeatTimeout:
+                  type: integer
+                port:
+                  type: integer
+                bindAddress:
+                  type: string
+                templatePath:
+                  type: string
+                adminGroups:
+                  type: array
+                authentication:
+                  type: string
+                  enum:
+                   - ldap
+                   - kerberos
+                   - keycloak
+                   - openid
+                   - saml
+                   - social
+                   - simple
+                   - none
+                containerWaitTime:
+                  type: integer
+                hideNavbar:
+                  type: boolean
+                containerBackend:
+                  type: string
+                  enum:
+                   - docker
+                   - docker-swarm
+                   - kubernetes
+                specs:
+                  type: array
+                  properties:
+                    id:
+                      type: string
+                    displayName:
+                      type: string
+                    containerCmd:
+                      type: array
+                    containerImage:
+                      type: string
+                    containerPrivileged:
+                      type: boolean
+                    containerMemoryRequest:
+                      type: string
+                    containerMemoryLimit:
+                      type: string
+                    containerCpuRequest:
+                      type: string
+                    containerCpuLimit:
+                      type: string
+                    accessGroups:
+                      type: array
+                    containerDns:
+                      type: string
+                    containerEnv:
+                      type: object
+                    containerMemory:
+                      type: string
+                    containerNetwork:
+                      type: string
+                    containerVolumes:
+                      type: array
+                  required:
+                    - id
           required:
-           - application.yml
+           - proxy
         status:
           description: ShinyProxyStatus defines the observed state of ShinyProxy
           type: object
           properties:
-            #backendImage:
-              #type: string
-            #frontendImage:
-              #type: string
-      type: object