Update providers and hono chart

Signed-off-by: Nindemic <[email protected]>
smaddis · Jan 31, 2022 · 3baa912 · msrn · Feb 3, 2022 · 3baa912
1 parent dd80317
commit 3baa912
Show file tree

Hide file tree

Showing 7 changed files with 77 additions and 75 deletions.
diff --git a/02_deployHono/.terraform.lock.hcl b/02_deployHono/.terraform.lock.hcl
diff --git a/02_deployHono/main.tf b/02_deployHono/main.tf
@@ -136,15 +136,15 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 2.68.0"
+      version = "~> 2.94.0"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
-      version = "~> 2.3.2"
+      version = "~> 2.7.1"
     }
     helm = {
       source  = "hashicorp/helm"
-      version = "~> 2.2.0"
+      version = "~> 2.4.1"
     }
     kubectl = {
       source  = "gavinbunney/kubectl"

diff --git a/02_deployHono/modules/hono/main.tf b/02_deployHono/modules/hono/main.tf
@@ -9,28 +9,14 @@ resource "helm_release" "mongodb-devicereg" {
   values = [
     file("${path.module}/mongo_values.yaml")
   ]
-
-  set_sensitive {
-    name  = "auth.rootPassword"
-    value = var.mongodb_rootPassword
-  }
-  set_sensitive {
-    name  = "auth.password"
-    value = var.mongodb_password
-  }
-  set_sensitive {
-    name  = "auth.username"
-    value = var.mongodb_username
-  }
-
 }
 # https://github.com/eclipse/packages/tree/83abeda25c0efd9446713aaa828ff4177ce4b27b/charts/hono
 resource "helm_release" "hono" {
   name = "hono"
 
   repository      = "https://eclipse.org/packages/charts"
   chart           = "hono"
-  version         = "1.9.8"
+  version         = "1.10.21"
   cleanup_on_fail = "true"
   depends_on      = [helm_release.mongodb-devicereg]
   values = [

diff --git a/02_deployHono/modules/hono/mongo_values.yaml b/02_deployHono/modules/hono/mongo_values.yaml
@@ -9,12 +9,25 @@ persistence:
 metrics:
   enabled: true
 auth:
-  database: "honodb"
+  enabled: true
+  rootPassword: "root-secret"
+  usernames:
+    - "device-registry@HONO"
+  passwords:
+    - "hono-secret"
+  databases:
+    - "honodb"
 volumePermissions:
   enabled: true
 service:
+  type: ClusterIP
   nameOverride: "mongodb-devicereg"
   port: 27017
+  targetPort: 27017
+useStatefulSet: false
+replicaSet:
+  enabled: false
+nameOverride: "mongodb-devicereg"
 
 #architecture: "standalone"
 #useStatefulSet: true

diff --git a/02_deployHono/modules/hono/values.yaml b/02_deployHono/modules/hono/values.yaml
@@ -9,13 +9,16 @@ grafana:
 mongodb:
   createInstance: false
 deviceRegistryExample:
-  type: "mongodb"
+  enabled: true
+  type: mongodb
   addExampleData: false
   mongoDBBasedDeviceRegistry:
     mongodb:
       host: "mongodb-devicereg"
       port: 27017
       dbName: "honodb"
+      username: "honouser"
+      password: "hono-secret"
 set_sensitive { 
   name  = "deviceRegistryExample.mongoDBBasedDeviceRegistry.mongodb.username" 
   value = var.mongodb_username 
 } 
 set_sensitive { 
   name  = "deviceRegistryExample.mongoDBBasedDeviceRegistry.mongodb.password" 
   value = var.mongodb_password 
 set_sensitive { 
   name  = "deviceRegistryExample.mongoDBBasedDeviceRegistry.mongodb.username" 
   value = var.mongodb_username 
 } 
 set_sensitive { 
   name  = "deviceRegistryExample.mongoDBBasedDeviceRegistry.mongodb.password" 
   value = var.mongodb_password 
 adapters:
   http:
     enabled: false

diff --git a/02_deployHono/modules/jaeger/values.yaml b/02_deployHono/modules/jaeger/values.yaml
@@ -3,7 +3,7 @@ jaeger:
  spec:
     strategy: allInOne
     allInOne:
-      image: jaegertracing/all-in-one:1.13
+      image: jaegertracing/all-in-one:1.26
       options:
           log-level: debug
           query:

diff --git a/02_deployHono/modules/kube_prometheus_stack/values.yaml b/02_deployHono/modules/kube_prometheus_stack/values.yaml
@@ -55,7 +55,7 @@ prometheus:
             - default
           selectors:
           - role: pod
-            label: app.kubernetes.io/instance=hono,helm.sh/chart=hono-1.9.8
+            label: app.kubernetes.io/instance=hono,helm.sh/chart=hono-1.10.20
         tls_config:
           insecure_skip_verify: true
         # https://github.com/eclipse/packages/blob/9f514b9dfd6734dfb196ba8c6b1151a431bbfd7b/charts/hono/templates/_helpers.tpl#L123-L130