Helm cleanup

infrastructure/helm/bailo/templates/_helpers.tpl

@@ -41,17 +41,6 @@ app.kubernetes.io/name: {{ include "bailo.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "bailo.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create }}
-{{- default (include "bailo.fullname" .) .Values.serviceAccount.name }}
-{{- else }}
-{{- default "default" .Values.serviceAccount.name }}
-{{- end }}
-{{- end }}
-
 {{/*
 Mongo host defination
 */}}
@@ -69,7 +58,7 @@ Mongo host defination
 Create the mongo connection URI
 */}}
 {{- define "bailo.mongoConnectionURI" -}}
-mongodb://{{ index .Values.mongodb.auth.usernames 0 }}:${MONGO_PASSWORD}@{{ include "bailo.mongo.host" . }}
+mongodb://{{ include "bailo.mongo.host" . }}
 {{- end }}
 
 {{/*

infrastructure/helm/bailo/templates/bailo/bailo.configmap.yaml

@@ -27,27 +27,11 @@ data:
         publicKey: '/app/certs/cert.pem',
       },
 
-      s2i: {
-        path: '/s2i/s2i',
-      },
-
-      build: {
-        // Environment to build in, can be 'img' or 'openshift'
-        environment: '{{ .Values.config.build.environment }}',
-
-        // These settings only matter in OpenShift
-        openshift: {
-          // Build configs, secrets and builds will be triggered in this namespace
-          namespace: '{{ .Values.openshift.namespace }}',
-          // The name of the secret for the application to create to securely allow OpenShift to communicate with the Bailo registry
-          dockerPushSecret: '{{ .Values.openshift.dockerPushSecretName }}',
-        },
-      },
-
       mongo: {
         // A mongo connection URI, can contain usernames, passwords, replica set information, etc.
         // See: https://www.mongodb.com/docs/manual/reference/connection-string/
-        uri: 'OVERWRITTEN_BY_ENVIRONMENT_VARIABLE',
+        uri: '{{ include "bailo.mongoConnectionURI" . }}',
+        user: '{{ index .Values.mongodb.auth.usernames 0 }}',
 
         connectionOptions: {
           useFindAndModify: false,
@@ -59,29 +43,6 @@ data:
         },
       },
 
-      minio: {
-        // Connection information for an s3-compliant file store.  Settings are passed directly to 'minio', see reference for options:
-        // https://min.io/docs/minio/linux/developers/javascript/API.html#constructor
-        connection: {
-          endPoint: '{{ include "bailo.minio.host" . }}',
-          port: {{ .Values.minio.service.ports.api }},
-          useSSL: {{ .Values.minio.useSSL }},
-          accessKey: 'OVERWRITTEN_BY_ENVIRONMENT_VARIABLE',
-          secretKey: 'OVERWRITTEN_BY_ENVIRONMENT_VARIABLE',
-          region: '{{ .Values.minio.region }}',
-          partSize: {{ .Values.minio.partSizeMB }} * 1024 * 1024,
-        },
-
-        // Automatically create the upload / registry bucket if they're not found?
-        automaticallyCreateBuckets: {{ .Values.minio.createBuckets }},
-
-        // Names of buckets that Bailo uses
-        buckets: {
-          uploads: '{{ .Values.minio.uploadBucket }}',
-          registry: '{{ .Values.minio.registryBucket }}',
-        },
-      },
-
       registry: {
         connection:{
           // This is explicitly NOT using connection.protocol, as this should always be
@@ -124,25 +85,8 @@ data:
         from: '{{ .Values.config.smtp.from }}',
       },
 
-      logging: {
-        // Log out to a file
-        file: {
-          enabled: false,
-          level: 'info',
-          path: './logs/out.log',
-        },
-
-        // Log out to a stroom instance
-        stroom: {
-          enabled: {{ .Values.stroom.enabled }},
-          folder: '{{ .Values.stroom.folder }}',
-          url: '{{ .Values.stroom.url }}',
-          feed: '{{ .Values.stroom.feed }}',
-          environment: '{{ .Values.stroom.environment }}',
-          system: '{{ .Values.stroom.system }}',
-          insecure: {{ .Values.stroom.insecure }},
-          interval: {{ .Values.stroom.interval }},
-        },
+      log: {
+        level: 'info',
       },
 
       session: {
@@ -188,6 +132,7 @@ data:
           enabled: {{ .Values.config.ui.banner.enabled }},
           text: '{{ .Values.config.ui.banner.text }}',
           colour: '{{ .Values.config.ui.banner.colour }}',
+          textColor: '{{ .Values.config.ui.banner.textColor}}'         
         },
 
         // Contact details for the support team
@@ -201,28 +146,6 @@ data:
         registry: {
           host: '{{ .Values.route.appPublicRoute }}',
         },
-
-        // A configurable checkbox on the last page when uploading a model
-        uploadWarning: {
-          showWarning: true,
-          checkboxText: 'By checking here you confirm that the information is correct',
-        },
-
-        // A configurable checkbox on the last page when requesting a deployment
-        deploymentWarning: {
-          showWarning: true,
-          checkboxText: 'By checking here you confirm that the information is correct',
-        },
-
-        // The available seldon versions that can be used to build images
-        seldonVersions: [
-          {
-            name: '{{ .Values.config.s2i.name }}',
-            image: '{{ .Values.config.s2i.image }}',
-          },
-        ],
-
-        maxModelSizeGB: 50,
       },
 
       connectors: {
@@ -233,6 +156,10 @@ data:
         authorisation: {
           kind: '{{ .Values.connectors.authorisation.kind }}',
         },
+
+        audit: {
+          kind: '{{ .Values.connectors.audit.kind }}',
+        },
       },
 
       log: {
@@ -265,14 +192,9 @@ data:
 
   custom-environment-variables.cjs: |
     module.exports = {
-      minio: {
-        connection: {
-          accessKey: 'MINIO_ACCESS_KEY',
-          secretKey: 'MINIO_SECRET_KEY',
-        },
       },
       mongo: {
-        uri: 'MONGO_CONNECTION_URI',
+        pass: 'MONGO_PASSWORD',
       },
       s3: {
         credentials: {

infrastructure/helm/bailo/templates/bailo/bailo.deployment.yaml

@@ -21,7 +21,6 @@ spec:
       labels:
         name: backend
     spec:
-      serviceAccountName: {{ include "bailo.fullname" .  }}-builder
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
@@ -50,8 +49,6 @@ spec:
                 secretKeyRef:
                   name: {{ include "bailo.fullname" . }}-mongodb
                   key: mongodb-passwords
-            - name: MONGO_CONNECTION_URI
-              value: 'mongodb://{{ index .Values.mongodb.auth.usernames 0 }}:{{ index .Values.mongodb.auth.passwords 0 }}@{{ include "bailo.mongo.host" . }}'
             {{- if .Values.instrumentation.enabled }}
             - name: OTEL_EXPORTER_TOKEN
               valueFrom:

infrastructure/helm/bailo/values.yaml

@@ -222,6 +222,7 @@ config:
       enabled: false
       text: "BAILO"
       colour: "#047a06"
+      textColor: "black"
 
   smtp:
     #host: 'mail' #service name
@@ -239,17 +240,6 @@ config:
     protocol: "https"
     port: 443
 
-# logging https://github.com/gchq/stroom
-stroom:
-  enabled: false
-  url: "http://localhost:8090/stroom/datafeed"
-  folder: "./logs/stroom"
-  system: "bailo"
-  feed: "bailo"
-  environment: "Development"
-  insecure: true
-  interval: 300000
-
 # nginx.deployment registry.deployment
 nginxcert:
   cert: cert.pem #use san.cnf to create certs
@@ -262,6 +252,9 @@ connectors:
   authorisation:
     kind: 'basic'
 
+  audit:
+    kind: 'silly'
+
 instrumentation:
   enabled: false
   debug: false