diff --git a/02_deployHono/.terraform.lock.hcl b/02_deployHono/.terraform.lock.hcl index cfbd684..7cef7b4 100644 --- a/02_deployHono/.terraform.lock.hcl +++ b/02_deployHono/.terraform.lock.hcl @@ -2,76 +2,76 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/gavinbunney/kubectl" { - version = "1.11.2" + version = "1.11.3" constraints = "~> 1.11.2" hashes = [ - "h1:uQDaJ53RC6Hi0sOvU1JvtOwqgB+avUEGsbTi6drPdKM=", - "zh:2704e82e97a1fec9e119d197bfee83ef2050d0b1d3aea64517d718bc7c000bb4", - "zh:4aec4e54845fb37f93eceb482200e32f3fd0c5c93008d5bd8893bc22322d037e", - "zh:4af21a6633d47d672741a369962e5c430b59a145174683de8e7c74dcf893c49c", - "zh:52aee101052a31f406a07b7bca3137b8939af222c2e12a25583492db67d912b9", - "zh:7dc6e91bc288df6a6345eda384820baa42ac30fd10cad8036e930d3021a36c64", - "zh:b4da54afc5722cbf8180794417dee24ba13f89f1c66a8e96bb6ffa9f4f563fe6", - "zh:c04f10b5713c5672158c72d761130a83af01982688028f48702d01c91e4c1b43", - "zh:cf452160b4af1e92a25b57cb178fcdf3400a0ae29dd7345343e09b8fdb41c148", - "zh:e2b928794ac74697b17422984c64771123b85b7cee906d8d4684655590fda91a", + "h1:Y8vG2NUMAYmLEENjvbPYQ3LoX1l8E6j8FsVd42jBwaw=", + "zh:1c39f53104fcb4160af27f23e4bc4f9603635595d30fc22ea5ff9ae112c084a2", + "zh:4a4592e1ccb6b1bd690ce8c8714a22c3c370c4a2e80a78ed7eea881c155bfff2", + "zh:56cf0a32fba0f7c5ab9a6a51edffd872cb016ccce1f8eb33a2b5b68d43a44872", + "zh:57157ea46930149e2078f04f13dd7eec819d0f2aa599ca5f9a6693b63274c379", + "zh:64503c42309dfaa4ee37ea52ef2c094dbd198d21cf5929e219e51ed84a9ab98e", + "zh:ac94f1cdb753f55d8767ae983a17fda84dd3f45b7e4680b5c73c88cd828f7e29", + "zh:ce0c4af206f23e2cebfd2946c38c2cdc2488f36a6ea973ee85a8ba09e6c42a58", + "zh:d7c419ac48bd9ccb304963a132c604d0827a1fabe0be53ecd5d4a9f8cf6addaf", + "zh:f58ee3bee5562d70c50156fb88263cbea3ac928cdfdda2a8f123634dad8ff255", ] } provider "registry.terraform.io/hashicorp/azurerm" { - version = "2.68.0" - constraints = "~> 2.68.0" + version = "2.94.0" + constraints = "~> 2.94.0" hashes = [ - "h1:Lj4Y/Lk1HRuqKJ65ZqeDUoxzclaJ3v9adY0e3z4Ct9o=", - "zh:14cc2c3ba90502a5e90d4613009bcc04e501d33b465a86993b5fa6872999aa6f", - "zh:2255e52492c44a69a3fb86dfa423cb3a2e631921ca824ebfc31d74eeae3766ee", - "zh:3273178a271c07bc311c8c58e44d29a1550f1dc89f1414cda5e876dae47c0528", - "zh:3b8801c74d73f1f315bab3eaf671b7568cc2ba3952add695fd0a1891726bbb23", - "zh:4c5026d6b79cb55b480d7baa283e81a5ae6e652eb57f58e7ab35cbbd5b3eb4c5", - "zh:579597d018c97250d67eb14f258fab9c19c371740d2b805fc5d2ea2db19d65be", - "zh:63bdae0defc6362d2f09cee39435440e8ddf4252393cfc9fbb90f754c7aa3934", - "zh:7b95116f8d06977bf2dc2b90398f75f84be33a06aca0a1803b733add9f3c3241", - "zh:a5d9bda38157222305f15930176fbc5ebc72442d71301b7cc66125575c3c0d2c", - "zh:bce7701a8e460680f9be910dea3f35411df6bc620d82ba5f134d2b1abf27fc77", - "zh:f076a031e155bb63d028136ebccceacf08f32a1218eadbec7a41dbe4f3ac1214", + "h1:iuMLg+/otmiIJ1Uas5W2aOd7XWwjn3K+yD6d6cOliC4=", + "zh:02d710ecca217193a18e50e9c203575584a316f1ddab84315ed39b3c6095626c", + "zh:02fffe19fd902f9f655ac351a3e9ab568554410d0b3e60df9bd1a5307bc4616d", + "zh:0cb8e9c834790834f16e74539245f022bc485d3c683099aa169e55b8cc3bbb69", + "zh:13484f97f7a8d194dd57e4332817bde5c7e1bb7b000846ba7232c7da9478f3a8", + "zh:17bf1c0716c7df1919c884e84b66e59d30d95ab169d72c9bbb33ed196dc16f22", + "zh:1f152c660c33217c55f933eafac0ca2c08a532e9ec2f9d64f3039f638334bca1", + "zh:ba344559c2db93dd21e2038b21d92978558247a44ba01b1e1672279083a7708b", + "zh:bf08d097cbea5eed1bd2bdc5e447f162393f12eed5d9b9aaf2dc6c9d402858c6", + "zh:c5268e5093a2fa17f68c97f7a9934c95645e71538e10d2edd919b91c96060bfd", + "zh:d5cffe43a8015ca2ab910eac307203d5bc361f565d2ac4d38231a854555b1403", + "zh:e71fb62706200765e3d571f4c34d17f0ab803e01fc592a48445b7b1a7b4cd98c", ] } provider "registry.terraform.io/hashicorp/helm" { - version = "2.2.0" - constraints = "~> 2.2.0" + version = "2.4.1" + constraints = "~> 2.4.1" hashes = [ - "h1:rxDS2QQuG/M9aRSKlvW2oHsp5eGAoB1J9KZthCOVbeQ=", - "zh:01341dd1e9cc7e7f6999e11e7473bcdca2dd72dd27f91beed1f4fb599a15dfba", - "zh:20e86c9eccd3a81ef5ac243af31b61fc4d2d679437384bd0870e92fa1b3ed6c9", - "zh:22a71127c5dbea4f62edb5bcf00b5c163de04aa19d45a7a1f621f973ffd09d20", - "zh:28ab7c84a5f8ed82fc520668db93d650571ddf59d98845cb18a1fa1a7888efc0", - "zh:3985a30929ad8fdc6b94f0e1cbd62a63db75ee961b8ba7db1cf4bfd29e8009ff", - "zh:477d92e26ba0c906087a5dd827ac3917dad7d5af770ee0ab4b08d0f273150586", - "zh:750928ec5ef54b2090bd6a6d8a19630a8712bbbccc0429251e88ccd361c1d3c0", - "zh:a615841fd90094bddc1269127e501fa60453c441b9548ff73752fe14efc38ed0", - "zh:e762aca7883374fa255efba50f5bdf791fece7d61e3920e593fb1a2cbb598981", - "zh:f76f372ead52948ca53610b371cb80c80ebcf058ef0a5c0ce9f0ce38dcc9a8eb", - "zh:fa36fe93ed977f4478cc6547ec3c45c28e56f10632e85446b0c3d71449f8c4bb", + "h1:Gqwrr+yKWR79esN39X9eRCddxMNapmaGMynLfjrUJJo=", + "zh:07517b24ea2ce4a1d3be3b88c3efc7fb452cd97aea8fac93ca37a08a8ec06e14", + "zh:11ef6118ed03a1b40ff66adfe21b8707ece0568dae1347ddfbcff8452c0655d5", + "zh:1ae07e9cc6b088a6a68421642c05e2fa7d00ed03e9401e78c258cf22a239f526", + "zh:1c5b4cd44033a0d7bf7546df930c55aa41db27b70b3bca6d145faf9b9a2da772", + "zh:256413132110ddcb0c3ea17c7b01123ad2d5b70565848a77c5ccc22a3f32b0dd", + "zh:4ab46fd9aadddef26604382bc9b49100586647e63ef6384e0c0c3f010ff2f66e", + "zh:5a35d23a9f08c36fceda3cef7ce2c7dc5eca32e5f36494de695e09a5007122f0", + "zh:8e9823a1e5b985b63fe283b755a821e5011a58112447d42fb969c7258ed57ed3", + "zh:8f79722eba9bf77d341edf48a1fd51a52d93ec31d9cac9ba8498a3a061ea4a7f", + "zh:b2ea782848b10a343f586ba8ee0cf4d7ff65aa2d4b144eea5bbd8f9801b54c67", + "zh:e72d1ccf8a75d8e8456c6bb4d843fd4deb0e962ad8f167fa84cf17f12c12304e", ] } provider "registry.terraform.io/hashicorp/kubernetes" { - version = "2.3.2" - constraints = "~> 2.3.2" + version = "2.7.1" + constraints = "~> 2.7.1" hashes = [ - "h1:X+wKrZNYF+qtoBNcMD3cL0+bXSWUDZ7RpHm+2vAwvhE=", - "zh:10f71c170be13538374a4b9553fcb3d98a6036bcd1ca5901877773116c3f828e", - "zh:11d2230e531b7480317e988207a73cb67b332f225b0892304983b19b6014ebe0", - "zh:3317387a9a6cc27fd7536b8f3cad4b8a9285e9461f125c5a15d192cef3281856", - "zh:458a9858362900fbe97e00432ae8a5bef212a4dacf97a57ede7534c164730da4", - "zh:50ea297007d9fe53e5411577f87a4b13f3877ce732089b42f938430e6aadff0d", - "zh:56705c959e4cbea3b115782d04c62c68ac75128c5c44ee7aa4043df253ffbfe3", - "zh:7eb3722f7f036e224824470c3e0d941f1f268fcd5fa2f8203e0eee425d0e1484", - "zh:9f408a6df4d74089e6ce18f9206b06b8107ddb57e2bc9b958a6b7dc352c62980", - "zh:aadd25ccc3021040808feb2645779962f638766eb583f586806e59f24dde81bb", - "zh:b101c3456e4309b09aab129b0118561178c92cb4be5d96dec553189c3084dca1", - "zh:ec08478573b4953764099fbfd670fae81dc24b60e467fb3b023e6fab50b70a9e", + "h1:Df9MZxqgXueXVObeAiPPDQ5aLwQ2bJ2r1gul/IYSxeg=", + "zh:0da320fd81ece6696f7cceda35e459ee97cae8955088af38fc7f2feab1dce924", + "zh:37d304b8b992518c9c12e8f10437b9d4a0cc5a823c9421ac794ad2347c4d1122", + "zh:3d4e12fb9588c3b2e782d392fea758c6982e5d653154bec951e949155bcbc169", + "zh:6bb32b8d5cccf3e3ae7c124ed27df76dc7653ca760c132addeee15272630c930", + "zh:94775153b90e285876fc17261e8f5338a1ff732f4133336cc68754acb74570b6", + "zh:a665d1336765cdf8620a8797fd4e7e3cecf789e96e59ba80634336a4390df377", + "zh:aa8b35e9958cb89f01c115e8866a07d5468fb53f1c227d673e94f7ee8fb76242", + "zh:b7a571336387d773a74ed6eefa3843ff78d3662f2745c99c95008002a1341662", + "zh:c50d661782175d50ea4952fe943b0e4a3e33c27aa69e5ff21b3cbfa513e90d0a", + "zh:e0999b349cc772c75876adbc2a13b5dc256d3ecd7e4aa91baee5fdfcecaa7465", + "zh:e1399aec06a7aa98e9b0f64b4281697247f338a8a40b79f5f6ebfd43bf4ce1e2", ] } diff --git a/02_deployHono/main.tf b/02_deployHono/main.tf index 8cf47f0..ac4ab80 100644 --- 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 index 580b25a..8b62e51 100644 --- a/02_deployHono/modules/hono/main.tf +++ b/02_deployHono/modules/hono/main.tf @@ -9,20 +9,6 @@ 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" { @@ -30,7 +16,7 @@ resource "helm_release" "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 index 5303931..51956ad 100644 --- 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 index c248405..ffabe25 100644 --- 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" adapters: http: enabled: false diff --git a/02_deployHono/modules/jaeger/values.yaml b/02_deployHono/modules/jaeger/values.yaml index 50e4991..0a0e3f2 100644 --- 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 index 99e6e34..b64b227 100644 --- 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