From 72c72e79f81ec030129e38560cd0a97a921b27fb Mon Sep 17 00:00:00 2001 From: JMboya <44696487+JeffMboya@users.noreply.github.com> Date: Tue, 27 Aug 2024 17:51:08 +0300 Subject: [PATCH] MG-137 - Fix nil pointer error and update UI port to 9095 (#138) * chore: Fix nil pointer error and update UI port to 9095 Signed-off-by: JeffMboya * Refactor image configuration Signed-off-by: JeffMboya * chore: Update chart directory Signed-off-by: JeffMboya * Remove deleted files from mainflux directory Signed-off-by: JeffMboya --------- Signed-off-by: JeffMboya --- charts/{mainflux => magistrala}/.helmignore | 0 charts/{mainflux => magistrala}/Chart.lock | 0 charts/{mainflux => magistrala}/Chart.yaml | 0 charts/{mainflux => magistrala}/README.md | 0 charts/{mainflux => magistrala}/charts/.gitignore | 0 charts/{mainflux => magistrala}/secrets/.gitignore | 0 charts/{mainflux => magistrala}/secrets/secrets.sh | 0 charts/{mainflux => magistrala}/templates/_helpers.tpl | 0 .../templates/adapter_coap-deployment.yaml | 0 .../templates/adapter_coap-service.yaml | 0 .../templates/adapter_http-deployment.yaml | 0 .../templates/adapter_http-service.yaml | 0 .../templates/adapter_mqtt-statefulstet.yaml | 0 .../{mainflux => magistrala}/templates/auth-deployment.yaml | 0 charts/{mainflux => magistrala}/templates/auth-service.yaml | 0 .../templates/bootstrap-deployment.yaml | 0 .../templates/bootstrap-service.yaml | 0 .../templates/certs-deployment.yaml | 0 .../{mainflux => magistrala}/templates/certs-service.yaml | 0 charts/{mainflux => magistrala}/templates/envoy-config.yaml | 0 charts/{mainflux => magistrala}/templates/envoy.yaml | 0 charts/{mainflux => magistrala}/templates/ingress.yaml | 0 .../templates/invitations-deployment.yaml | 0 .../templates/invitations-service.yaml | 0 .../templates/journal-deployment.yaml | 0 .../{mainflux => magistrala}/templates/journal-service.yaml | 0 .../{mainflux => magistrala}/templates/nginx-internal.yaml | 0 .../{mainflux => magistrala}/templates/scpiedb-schema.yaml | 0 .../templates/spicedb-deployment.yaml | 0 .../templates/spicedb-envoy-config.yaml | 0 .../templates/spicedb-envoy-deployment.yaml | 0 .../templates/spicedb-envoy-service.yaml | 0 .../templates/spicedb-migration-job.yaml | 0 .../{mainflux => magistrala}/templates/spicedb-service.yaml | 0 .../templates/things-deployment.yaml | 0 .../{mainflux => magistrala}/templates/things-service.yaml | 0 .../templates/timescal-reader-service.yaml | 0 .../templates/timescale-reader-deployment.yaml | 0 .../templates/timescale-writer-deployment.yaml | 0 .../templates/timescale-writer-service.yaml | 0 .../{mainflux => magistrala}/templates/ui-deployment.yaml | 0 charts/{mainflux => magistrala}/templates/ui-service.yaml | 0 .../templates/users-deployment.yaml | 0 .../{mainflux => magistrala}/templates/users-service.yaml | 0 charts/{mainflux => magistrala}/values.yaml | 6 +++--- 45 files changed, 3 insertions(+), 3 deletions(-) rename charts/{mainflux => magistrala}/.helmignore (100%) rename charts/{mainflux => magistrala}/Chart.lock (100%) rename charts/{mainflux => magistrala}/Chart.yaml (100%) rename charts/{mainflux => magistrala}/README.md (100%) rename charts/{mainflux => magistrala}/charts/.gitignore (100%) rename charts/{mainflux => magistrala}/secrets/.gitignore (100%) rename charts/{mainflux => magistrala}/secrets/secrets.sh (100%) rename charts/{mainflux => magistrala}/templates/_helpers.tpl (100%) rename charts/{mainflux => magistrala}/templates/adapter_coap-deployment.yaml (100%) rename charts/{mainflux => magistrala}/templates/adapter_coap-service.yaml (100%) rename charts/{mainflux => magistrala}/templates/adapter_http-deployment.yaml (100%) rename charts/{mainflux => magistrala}/templates/adapter_http-service.yaml (100%) rename charts/{mainflux => magistrala}/templates/adapter_mqtt-statefulstet.yaml (100%) rename charts/{mainflux => magistrala}/templates/auth-deployment.yaml (100%) rename charts/{mainflux => magistrala}/templates/auth-service.yaml (100%) rename charts/{mainflux => magistrala}/templates/bootstrap-deployment.yaml (100%) rename charts/{mainflux => magistrala}/templates/bootstrap-service.yaml (100%) rename charts/{mainflux => magistrala}/templates/certs-deployment.yaml (100%) rename charts/{mainflux => magistrala}/templates/certs-service.yaml (100%) rename charts/{mainflux => magistrala}/templates/envoy-config.yaml (100%) rename charts/{mainflux => magistrala}/templates/envoy.yaml (100%) rename charts/{mainflux => magistrala}/templates/ingress.yaml (100%) rename charts/{mainflux => magistrala}/templates/invitations-deployment.yaml (100%) rename charts/{mainflux => magistrala}/templates/invitations-service.yaml (100%) rename charts/{mainflux => magistrala}/templates/journal-deployment.yaml (100%) rename charts/{mainflux => magistrala}/templates/journal-service.yaml (100%) rename charts/{mainflux => magistrala}/templates/nginx-internal.yaml (100%) rename charts/{mainflux => magistrala}/templates/scpiedb-schema.yaml (100%) rename charts/{mainflux => magistrala}/templates/spicedb-deployment.yaml (100%) rename charts/{mainflux => magistrala}/templates/spicedb-envoy-config.yaml (100%) rename charts/{mainflux => magistrala}/templates/spicedb-envoy-deployment.yaml (100%) rename charts/{mainflux => magistrala}/templates/spicedb-envoy-service.yaml (100%) rename charts/{mainflux => magistrala}/templates/spicedb-migration-job.yaml (100%) rename charts/{mainflux => magistrala}/templates/spicedb-service.yaml (100%) rename charts/{mainflux => magistrala}/templates/things-deployment.yaml (100%) rename charts/{mainflux => magistrala}/templates/things-service.yaml (100%) rename charts/{mainflux => magistrala}/templates/timescal-reader-service.yaml (100%) rename charts/{mainflux => magistrala}/templates/timescale-reader-deployment.yaml (100%) rename charts/{mainflux => magistrala}/templates/timescale-writer-deployment.yaml (100%) rename charts/{mainflux => magistrala}/templates/timescale-writer-service.yaml (100%) rename charts/{mainflux => magistrala}/templates/ui-deployment.yaml (100%) rename charts/{mainflux => magistrala}/templates/ui-service.yaml (100%) rename charts/{mainflux => magistrala}/templates/users-deployment.yaml (100%) rename charts/{mainflux => magistrala}/templates/users-service.yaml (100%) rename charts/{mainflux => magistrala}/values.yaml (99%) diff --git a/charts/mainflux/.helmignore b/charts/magistrala/.helmignore similarity index 100% rename from charts/mainflux/.helmignore rename to charts/magistrala/.helmignore diff --git a/charts/mainflux/Chart.lock b/charts/magistrala/Chart.lock similarity index 100% rename from charts/mainflux/Chart.lock rename to charts/magistrala/Chart.lock diff --git a/charts/mainflux/Chart.yaml b/charts/magistrala/Chart.yaml similarity index 100% rename from charts/mainflux/Chart.yaml rename to charts/magistrala/Chart.yaml diff --git a/charts/mainflux/README.md b/charts/magistrala/README.md similarity index 100% rename from charts/mainflux/README.md rename to charts/magistrala/README.md diff --git a/charts/mainflux/charts/.gitignore b/charts/magistrala/charts/.gitignore similarity index 100% rename from charts/mainflux/charts/.gitignore rename to charts/magistrala/charts/.gitignore diff --git a/charts/mainflux/secrets/.gitignore b/charts/magistrala/secrets/.gitignore similarity index 100% rename from charts/mainflux/secrets/.gitignore rename to charts/magistrala/secrets/.gitignore diff --git a/charts/mainflux/secrets/secrets.sh b/charts/magistrala/secrets/secrets.sh similarity index 100% rename from charts/mainflux/secrets/secrets.sh rename to charts/magistrala/secrets/secrets.sh diff --git a/charts/mainflux/templates/_helpers.tpl b/charts/magistrala/templates/_helpers.tpl similarity index 100% rename from charts/mainflux/templates/_helpers.tpl rename to charts/magistrala/templates/_helpers.tpl diff --git a/charts/mainflux/templates/adapter_coap-deployment.yaml b/charts/magistrala/templates/adapter_coap-deployment.yaml similarity index 100% rename from charts/mainflux/templates/adapter_coap-deployment.yaml rename to charts/magistrala/templates/adapter_coap-deployment.yaml diff --git a/charts/mainflux/templates/adapter_coap-service.yaml b/charts/magistrala/templates/adapter_coap-service.yaml similarity index 100% rename from charts/mainflux/templates/adapter_coap-service.yaml rename to charts/magistrala/templates/adapter_coap-service.yaml diff --git a/charts/mainflux/templates/adapter_http-deployment.yaml b/charts/magistrala/templates/adapter_http-deployment.yaml similarity index 100% rename from charts/mainflux/templates/adapter_http-deployment.yaml rename to charts/magistrala/templates/adapter_http-deployment.yaml diff --git a/charts/mainflux/templates/adapter_http-service.yaml b/charts/magistrala/templates/adapter_http-service.yaml similarity index 100% rename from charts/mainflux/templates/adapter_http-service.yaml rename to charts/magistrala/templates/adapter_http-service.yaml diff --git a/charts/mainflux/templates/adapter_mqtt-statefulstet.yaml b/charts/magistrala/templates/adapter_mqtt-statefulstet.yaml similarity index 100% rename from charts/mainflux/templates/adapter_mqtt-statefulstet.yaml rename to charts/magistrala/templates/adapter_mqtt-statefulstet.yaml diff --git a/charts/mainflux/templates/auth-deployment.yaml b/charts/magistrala/templates/auth-deployment.yaml similarity index 100% rename from charts/mainflux/templates/auth-deployment.yaml rename to charts/magistrala/templates/auth-deployment.yaml diff --git a/charts/mainflux/templates/auth-service.yaml b/charts/magistrala/templates/auth-service.yaml similarity index 100% rename from charts/mainflux/templates/auth-service.yaml rename to charts/magistrala/templates/auth-service.yaml diff --git a/charts/mainflux/templates/bootstrap-deployment.yaml b/charts/magistrala/templates/bootstrap-deployment.yaml similarity index 100% rename from charts/mainflux/templates/bootstrap-deployment.yaml rename to charts/magistrala/templates/bootstrap-deployment.yaml diff --git a/charts/mainflux/templates/bootstrap-service.yaml b/charts/magistrala/templates/bootstrap-service.yaml similarity index 100% rename from charts/mainflux/templates/bootstrap-service.yaml rename to charts/magistrala/templates/bootstrap-service.yaml diff --git a/charts/mainflux/templates/certs-deployment.yaml b/charts/magistrala/templates/certs-deployment.yaml similarity index 100% rename from charts/mainflux/templates/certs-deployment.yaml rename to charts/magistrala/templates/certs-deployment.yaml diff --git a/charts/mainflux/templates/certs-service.yaml b/charts/magistrala/templates/certs-service.yaml similarity index 100% rename from charts/mainflux/templates/certs-service.yaml rename to charts/magistrala/templates/certs-service.yaml diff --git a/charts/mainflux/templates/envoy-config.yaml b/charts/magistrala/templates/envoy-config.yaml similarity index 100% rename from charts/mainflux/templates/envoy-config.yaml rename to charts/magistrala/templates/envoy-config.yaml diff --git a/charts/mainflux/templates/envoy.yaml b/charts/magistrala/templates/envoy.yaml similarity index 100% rename from charts/mainflux/templates/envoy.yaml rename to charts/magistrala/templates/envoy.yaml diff --git a/charts/mainflux/templates/ingress.yaml b/charts/magistrala/templates/ingress.yaml similarity index 100% rename from charts/mainflux/templates/ingress.yaml rename to charts/magistrala/templates/ingress.yaml diff --git a/charts/mainflux/templates/invitations-deployment.yaml b/charts/magistrala/templates/invitations-deployment.yaml similarity index 100% rename from charts/mainflux/templates/invitations-deployment.yaml rename to charts/magistrala/templates/invitations-deployment.yaml diff --git a/charts/mainflux/templates/invitations-service.yaml b/charts/magistrala/templates/invitations-service.yaml similarity index 100% rename from charts/mainflux/templates/invitations-service.yaml rename to charts/magistrala/templates/invitations-service.yaml diff --git a/charts/mainflux/templates/journal-deployment.yaml b/charts/magistrala/templates/journal-deployment.yaml similarity index 100% rename from charts/mainflux/templates/journal-deployment.yaml rename to charts/magistrala/templates/journal-deployment.yaml diff --git a/charts/mainflux/templates/journal-service.yaml b/charts/magistrala/templates/journal-service.yaml similarity index 100% rename from charts/mainflux/templates/journal-service.yaml rename to charts/magistrala/templates/journal-service.yaml diff --git a/charts/mainflux/templates/nginx-internal.yaml b/charts/magistrala/templates/nginx-internal.yaml similarity index 100% rename from charts/mainflux/templates/nginx-internal.yaml rename to charts/magistrala/templates/nginx-internal.yaml diff --git a/charts/mainflux/templates/scpiedb-schema.yaml b/charts/magistrala/templates/scpiedb-schema.yaml similarity index 100% rename from charts/mainflux/templates/scpiedb-schema.yaml rename to charts/magistrala/templates/scpiedb-schema.yaml diff --git a/charts/mainflux/templates/spicedb-deployment.yaml b/charts/magistrala/templates/spicedb-deployment.yaml similarity index 100% rename from charts/mainflux/templates/spicedb-deployment.yaml rename to charts/magistrala/templates/spicedb-deployment.yaml diff --git a/charts/mainflux/templates/spicedb-envoy-config.yaml b/charts/magistrala/templates/spicedb-envoy-config.yaml similarity index 100% rename from charts/mainflux/templates/spicedb-envoy-config.yaml rename to charts/magistrala/templates/spicedb-envoy-config.yaml diff --git a/charts/mainflux/templates/spicedb-envoy-deployment.yaml b/charts/magistrala/templates/spicedb-envoy-deployment.yaml similarity index 100% rename from charts/mainflux/templates/spicedb-envoy-deployment.yaml rename to charts/magistrala/templates/spicedb-envoy-deployment.yaml diff --git a/charts/mainflux/templates/spicedb-envoy-service.yaml b/charts/magistrala/templates/spicedb-envoy-service.yaml similarity index 100% rename from charts/mainflux/templates/spicedb-envoy-service.yaml rename to charts/magistrala/templates/spicedb-envoy-service.yaml diff --git a/charts/mainflux/templates/spicedb-migration-job.yaml b/charts/magistrala/templates/spicedb-migration-job.yaml similarity index 100% rename from charts/mainflux/templates/spicedb-migration-job.yaml rename to charts/magistrala/templates/spicedb-migration-job.yaml diff --git a/charts/mainflux/templates/spicedb-service.yaml b/charts/magistrala/templates/spicedb-service.yaml similarity index 100% rename from charts/mainflux/templates/spicedb-service.yaml rename to charts/magistrala/templates/spicedb-service.yaml diff --git a/charts/mainflux/templates/things-deployment.yaml b/charts/magistrala/templates/things-deployment.yaml similarity index 100% rename from charts/mainflux/templates/things-deployment.yaml rename to charts/magistrala/templates/things-deployment.yaml diff --git a/charts/mainflux/templates/things-service.yaml b/charts/magistrala/templates/things-service.yaml similarity index 100% rename from charts/mainflux/templates/things-service.yaml rename to charts/magistrala/templates/things-service.yaml diff --git a/charts/mainflux/templates/timescal-reader-service.yaml b/charts/magistrala/templates/timescal-reader-service.yaml similarity index 100% rename from charts/mainflux/templates/timescal-reader-service.yaml rename to charts/magistrala/templates/timescal-reader-service.yaml diff --git a/charts/mainflux/templates/timescale-reader-deployment.yaml b/charts/magistrala/templates/timescale-reader-deployment.yaml similarity index 100% rename from charts/mainflux/templates/timescale-reader-deployment.yaml rename to charts/magistrala/templates/timescale-reader-deployment.yaml diff --git a/charts/mainflux/templates/timescale-writer-deployment.yaml b/charts/magistrala/templates/timescale-writer-deployment.yaml similarity index 100% rename from charts/mainflux/templates/timescale-writer-deployment.yaml rename to charts/magistrala/templates/timescale-writer-deployment.yaml diff --git a/charts/mainflux/templates/timescale-writer-service.yaml b/charts/magistrala/templates/timescale-writer-service.yaml similarity index 100% rename from charts/mainflux/templates/timescale-writer-service.yaml rename to charts/magistrala/templates/timescale-writer-service.yaml diff --git a/charts/mainflux/templates/ui-deployment.yaml b/charts/magistrala/templates/ui-deployment.yaml similarity index 100% rename from charts/mainflux/templates/ui-deployment.yaml rename to charts/magistrala/templates/ui-deployment.yaml diff --git a/charts/mainflux/templates/ui-service.yaml b/charts/magistrala/templates/ui-service.yaml similarity index 100% rename from charts/mainflux/templates/ui-service.yaml rename to charts/magistrala/templates/ui-service.yaml diff --git a/charts/mainflux/templates/users-deployment.yaml b/charts/magistrala/templates/users-deployment.yaml similarity index 100% rename from charts/mainflux/templates/users-deployment.yaml rename to charts/magistrala/templates/users-deployment.yaml diff --git a/charts/mainflux/templates/users-service.yaml b/charts/magistrala/templates/users-service.yaml similarity index 100% rename from charts/mainflux/templates/users-service.yaml rename to charts/magistrala/templates/users-service.yaml diff --git a/charts/mainflux/values.yaml b/charts/magistrala/values.yaml similarity index 99% rename from charts/mainflux/values.yaml rename to charts/magistrala/values.yaml index 8b03f675..98102167 100644 --- a/charts/mainflux/values.yaml +++ b/charts/magistrala/values.yaml @@ -161,7 +161,7 @@ mqtt: fsGroup: 10000 adapter: image: - # pullSecrets: {} + pullSecrets: {} # repository: "magistrala/mqtt" # tag: "latest" # pullPolicy: "IfNotPresent" @@ -356,7 +356,7 @@ redis-things: usePassword: false bootstrap: - # image: + image: {} # pullSecrets: {} # repository: "magistrala/bootstrap" # tag: "latest" @@ -570,7 +570,7 @@ ui: # logLevel: "info" # hostname: "" # contentTypes: "application/senml+json" - port: 3000 + port: 9095 pathPrefix: "/ui" # hostUrl: "https://domain-name" # httpAdapterUrl: "http://magistrala-adapter-http:8008"