Merge pull request #7 from fetch-rewards/feature/configurable-helm-chart

Feature/configurable helm chart

Author: samcorzineatfetch

charts/streamlit-chart/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
+version: 0.2.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

…it-chart/templates/launch-configmap.yaml …t/templates/launch-script-configmap.yamlcharts/streamlit-chart/templates/launch-configmap.yaml renamed to charts/streamlit-chart/templates/launch-script-configmap.yaml charts/streamlit-chart/templates/launch-configmap.yaml renamed to charts/streamlit-chart/templates/launch-script-configmap.yaml

@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: streamlit-operator-config
+  namespace: streamlit
+data:
+  config.yaml: |
+    baseDnsRecord: {{ .Values.baseDnsRecord }}
+    ingressAnnotations:
+      {{- range $key, $value := .Values.ingressAnnotations }}
+      {{ $key }} : {{ tpl $value $ }}
+      {{- end }}

charts/streamlit-chart/templates/operator-configmap.yaml

@@ -23,7 +23,7 @@ spec:
             - name: GIT_SYNC_REPO
               value: https://github.com/fetch-rewards/streamlit-operator.git
             - name: GIT_SYNC_BRANCH
-              value: feature/docker
+              value: feature/configurable-helm-chart
             - name: GIT_SYNC_ROOT
               value: /tmp/code
             - name: GIT_SYNC_DEST
@@ -36,13 +36,25 @@ spec:
       containers:
       - name: streamlit-operator
         image: python:3.8.5
+        env:
+          - name: BASE_DNS_RECORD
+            value: {{ required "Must provide a base dns to host your Streamlit apps" .Values.baseDnsRecord }}
         ports:
         - containerPort: 80
         volumeMounts:
           - name: code
             mountPath: /app
+          - name: config
+            mountPath: "/config"
+            readOnly: true
         workingDir: /app/repo/
         command: ["/app/repo/src/start.sh"]
       volumes:
         - name: code
-          emptyDir: { }
+          emptyDir: { }
+        - name: config
+          configMap:
+            name: streamlit-operator-config
+            items:
+              - key: config.yaml
+                path: config.yaml

charts/streamlit-chart/templates/operator-deployment.yaml

@@ -1,82 +1,4 @@
-# Default values for streamlit-chart.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-# replicaCount: 1
-
-# image:
-#   repository: nginx
-#   pullPolicy: IfNotPresent
-#   # Overrides the image tag whose default is the chart appVersion.
-#   tag: ""
-
-# imagePullSecrets: []
-# nameOverride: ""
-# fullnameOverride: ""
-
-# serviceAccount:
-#   # Specifies whether a service account should be created
-#   create: true
-#   # Annotations to add to the service account
-#   annotations: {}
-#   # The name of the service account to use.
-#   # If not set and create is true, a name is generated using the fullname template
-#   name: ""
-
-# podAnnotations: {}
-
-# podSecurityContext: {}
-#   # fsGroup: 2000
-
-# securityContext: {}
-#   # capabilities:
-#   #   drop:
-#   #   - ALL
-#   # readOnlyRootFilesystem: true
-#   # runAsNonRoot: true
-#   # runAsUser: 1000
-
-# service:
-#   type: ClusterIP
-#   port: 80
-
-# ingress:
-#   enabled: false
-#   className: ""
-#   annotations: {}
-#     # kubernetes.io/ingress.class: nginx
-#     # kubernetes.io/tls-acme: "true"
-#   hosts:
-#     - host: chart-example.local
-#       paths:
-#         - path: /
-#           pathType: ImplementationSpecific
-#   tls: []
-#   #  - secretName: chart-example-tls
-#   #    hosts:
-#   #      - chart-example.local
-
-# resources: {}
-#   # We usually recommend not to specify default resources and to leave this as a conscious
-#   # choice for the user. This also increases chances charts run on environments with little
-#   # resources, such as Minikube. If you do want to specify resources, uncomment the following
-#   # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-#   # limits:
-#   #   cpu: 100m
-#   #   memory: 128Mi
-#   # requests:
-#   #   cpu: 100m
-#   #   memory: 128Mi
-
-# autoscaling:
-#   enabled: false
-#   minReplicas: 1
-#   maxReplicas: 100
-#   targetCPUUtilizationPercentage: 80
-#   # targetMemoryUtilizationPercentage: 80
-
-# nodeSelector: {}
-
-# tolerations: []
-
-# affinity: {}
+#baseDnsRecord: "this-is-a-test"
+#ingressAnnotations:
+#  annotation1: "value1"
+#  annotation2: "value2"

charts/streamlit-chart/values.yaml

@@ -1,40 +1,20 @@
-import os
 import kopf
 import kubernetes
-import yaml
 
-
-def template_deployment(name, repo, branch, code_dir):
-    path = os.path.join(os.path.dirname(__file__), "templates", 'deployment.yaml')
-    tmpl = open(path, 'rt').read()
-    deployment_text = tmpl.format(
-        name=name,
-        repo=repo,
-        branch=branch,
-        code_dir=code_dir
-    )
-    deployment_data = yaml.safe_load(deployment_text)
-    return deployment_data
+from src.templating import template_deployment, template_service, template_ingress
+import os
+import yaml
+import logging
 
 
-def template_service(name):
-    path = os.path.join(os.path.dirname(__file__), "templates", 'service.yaml')
-    tmpl = open(path, 'rt').read()
-    service_text = tmpl.format(
-        name=name,
-    )
-    service_data = yaml.safe_load(service_text)
-    return service_data
+global config
 
+@kopf.on.startup()
+def configure(settings: kopf.OperatorSettings, **_):
+    global config
+    config = yaml.safe_load(open("/config/config.yaml"))
+    logging.info(f"Loaded config: {config}")
 
-def template_ingress(name):
-    path = os.path.join(os.path.dirname(__file__), "templates", 'ingress.yaml')
-    tmpl = open(path, 'rt').read()
-    ingress_text = tmpl.format(
-        name=name,
-    )
-    ingress_data = yaml.safe_load(ingress_text)
-    return ingress_data
 
 
 @kopf.on.create('streamlit-apps')
@@ -63,7 +43,7 @@ def create_fn(spec, name, namespace, logger, **kwargs):
     kopf.adopt(service_data)
 
     # Template the ingress
-    ingress_data = template_ingress(name)
+    ingress_data = template_ingress(name, config["baseDnsRecord"], config["ingressAnnotations"])
     kopf.adopt(ingress_data)
 
     api = kubernetes.client.CoreV1Api()

src/main.py

@@ -2,4 +2,4 @@
 
 
 pip install -r ./src/requirements.txt
-python -m kopf run ./src/main.py
+python -m kopf run --namespace=streamlit ./src/main.py