cluster/apps/default/huginn/agent-helm-release.yaml

@@ -1,41 +0,0 @@
-# yaml-language-server: $schema=https://raw.githubusercontent.com/bjw-s/helm-charts/main/charts/other/app-template/schemas/helmrelease-helm-v2beta2.schema.json
-apiVersion: helm.toolkit.fluxcd.io/v2beta2
-kind: HelmRelease
-metadata:
-  name: huginn-agent
-  namespace: default
-spec:
-  interval: 5m
-  chart:
-    spec:
-      chart: app-template
-      version: 3.1.0
-      sourceRef:
-        kind: HelmRepository
-        name: bjws-charts
-        namespace: flux-system
-
-  values:
-    controllers:
-      main:
-        replicas: 1
-
-        pod:
-          securityContext:
-            runAsNonRoot: true
-
-        containers:
-          main:
-            image:
-              repository: ghcr.io/huginn/huginn-single-process
-              tag: 5a1509b51188e0d16868be893c983d6fcfd232a5
-
-            command:
-            - /scripts/init
-            - bin/threaded.rb
-
-            envFrom:
-              - secretRef:
-                  name: huginn-env
-              - configMapRef:
-                  name: huginn-env

cluster/apps/default/huginn/env-configmap.yaml

@@ -1,20 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: huginn-env
-  namespace: default
-data:
-  DATABASE_ADAPTER: postgresql
-  DATABASE_HOST: postgresql.database
-  DATABASE_PORT: "5432"
-
-  DATABASE_NAME: huginn
-  DATABASE_RECONNECT: "true"
-  # Specified in huginn-env secret
-  # DATABASE_USERNAME:
-  # DATABASE_PASSWORD:
-
-  #TIMEZONE: ${SERVER_TIMEZONE}
-  USE_GRAPHVIZ_DOT: dot
-  USE_EVERNOTE_SANDBOX: "false" # set to production
-  RAILS_ENV: production

cluster/apps/default/huginn/helm-release.yaml

@@ -29,14 +29,31 @@ spec:
         containers:
           main:
             image:
-              repository: ghcr.io/huginn/huginn-single-process
+              repository: ghcr.io/huginn/huginn
-              tag: 5a1509b51188e0d16868be893c983d6fcfd232a5
+              tag: 0533a3768537f7a6a157227bfd9a9caefada768f
+
+            command:
+            - /scripts/init
+            - bin/threaded.rb
+
+            env:
+              DATABASE_ADAPTER: postgresql
+              DATABASE_HOST: postgresql.database
+              DATABASE_PORT: 5432
+
+              DATABASE_NAME: huginn
+              DATABASE_RECONNECT: true
+              # Specified in huginn-env
+              # DATABASE_USERNAME:
+              # DATABASE_PASSWORD:
+
+              #TIMEZONE: ${SERVER_TIMEZONE}
+              USE_GRAPHVIZ_DOT: dot
+              USE_EVERNOTE_SANDBOX: false # set to production
 
             envFrom:
               - secretRef:
                   name: huginn-env
-              - configMapRef:
-                  name: huginn-env
 
     service:
       app:

cluster/apps/default/huginn/kustomization.yaml

@@ -1,7 +1,5 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- ./env-configmap.sops.yaml
 - ./env-secret.sops.yaml
 - ./helm-release.yaml
-- ./agent-helm-release.yaml