[FIX] add changes for orb-live (#13)

* [FIX] adding redis-sinker, seting exact images tag * [FIX] app version
orb-community · Mar 23, 2022 · d741566 · d741566
1 parent 11d4ddb
commit d741566
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 13 deletions.
diff --git a/charts/orb/Chart.yaml b/charts/orb/Chart.yaml
@@ -10,8 +10,8 @@ name: orb
 description: Orb Observability Platform
 icon: https://avatars1.githubusercontent.com/u/13207490
 type: application
-version: 1.0.13
-appVersion: "0.9.0"
+version: 1.0.14
+appVersion: "0.14.0"
 home: https://getorb.io
 sources:
   - https://hub.docker.com/u/ns1labs/
@@ -70,6 +70,6 @@ dependencies:
   - name: redis
     version: "14.8.8"
     repository: "@bitnami"
-    alias: redis-mqtt
-    condition: redis-mqtt.enabled
+    alias: redis-sinker
+    condition: redis-sinker.enabled
 
diff --git a/charts/orb/templates/auth-deployment.yaml b/charts/orb/templates/auth-deployment.yaml
@@ -54,7 +54,7 @@ spec:
                 secretKeyRef:
                   name: {{ .Values.auth.jwt.secretName }}
                   key: {{ .Values.auth.jwt.secretKey }}
-          image: "{{ default .Values.defaults.image.mfRepository .Values.auth.image.repository }}/auth:{{ default .Values.defaults.image.mfTag .Values.auth.image.tag }}"
+          image: "{{ default .Values.defaults.image.mfRepository .Values.auth.image.repository }}/{{ default .Values.auth.image.name }}:{{ default .Values.defaults.image.mfTag .Values.auth.image.tag }}"
           imagePullPolicy: {{ default .Values.defaults.image.pullPolicy .Values.users.image.pullPolicy }}
           name: {{ .Release.Name }}-auth
           ports:

diff --git a/charts/orb/templates/fleet-deployment.yaml b/charts/orb/templates/fleet-deployment.yaml
@@ -71,7 +71,7 @@ spec:
               value:
                 http://{{ .Release.Name }}-things:{{ .Values.things.httpPort }}
 
-          image: "{{ default .Values.defaults.image.repository }}/orb-fleet:{{ default .Values.defaults.image.tag }}"
+          image: "{{ default .Values.defaults.image.repository .Values.fleet.image.repository }}/{{ default .Values.fleet.image.name }}:{{ default .Values.defaults.image.tag .Values.fleet.image.tag }}"
           imagePullPolicy: {{ default .Values.defaults.image.pullPolicy .Values.fleet.image.pullPolicy }}
           name: {{ .Release.Name }}-fleet
           ports:

diff --git a/charts/orb/templates/policies-deployment.yaml b/charts/orb/templates/policies-deployment.yaml
@@ -67,7 +67,7 @@ spec:
             - name: MF_AUTH_GRPC_URL
               value:
                 {{ .Release.Name }}-envoy:{{ .Values.auth.grpcPort }}
-          image: "{{ default .Values.defaults.image.repository }}/orb-policies:{{ default .Values.defaults.image.tag }}"
+          image: "{{ default .Values.defaults.image.repository .Values.policies.image.repository }}/{{ default .Values.policies.image.name }}:{{ default .Values.defaults.image.tag .Values.policies.image.tag }}"
           imagePullPolicy: {{ default .Values.defaults.image.pullPolicy .Values.policies.image.pullPolicy }}
           name: {{ .Release.Name }}-policies
           ports:

diff --git a/charts/orb/templates/sinker-deployment.yaml b/charts/orb/templates/sinker-deployment.yaml
@@ -36,6 +36,12 @@ spec:
             {{ else }}
               value: {{ .Values.sinker.redisESHost }}:{{ .Values.sinker.redisESPort }}
             {{ end }}
+            - name: ORB_SINKER_CACHE_URL
+            {{ if not .Values.sinker.redisCacheHost }}
+              value: {{ .Release.Name }}-redis-sinker-master:{{ .Values.sinker.redisCachePort }}
+            {{ else }}
+              value: {{ .Values.sinker.redisCacheHost }}:{{ .Values.sinker.redisCachePort }}
+            {{ end }}
             - name: ORB_FLEET_GRPC_URL
               value:
                 {{ .Release.Name }}-envoy:{{ .Values.fleet.grpcPort }}
@@ -55,7 +61,7 @@ spec:
             - name: MF_AUTH_GRPC_URL
               value:
                 {{ .Release.Name }}-envoy:{{ .Values.auth.grpcPort }}
-          image: "{{ default .Values.defaults.image.repository }}/orb-sinker:{{ default .Values.defaults.image.tag }}"
+          image: "{{ default .Values.defaults.image.repository .Values.sinker.image.repository }}/{{ default .Values.sinker.image.name }}:{{ default .Values.defaults.image.tag .Values.sinker.image.tag }}"
           imagePullPolicy: {{ default .Values.defaults.image.pullPolicy .Values.sinker.image.pullPolicy }}
           name: {{ .Release.Name }}-sinker
           ports:

diff --git a/charts/orb/templates/sinks-deployment.yaml b/charts/orb/templates/sinks-deployment.yaml
@@ -61,7 +61,7 @@ spec:
             - name: MF_AUTH_GRPC_URL
               value:
                 {{ .Release.Name }}-envoy:{{ .Values.auth.grpcPort }}
-          image: "{{ default .Values.defaults.image.repository }}/orb-sinks:{{ default .Values.defaults.image.tag }}"
+          image: "{{ default .Values.defaults.image.repository .Values.sinks.image.repository }}/{{ default .Values.sinks.image.name }}:{{ default .Values.defaults.image.tag .Values.sinks.image.tag }}"
           imagePullPolicy: {{ default .Values.defaults.image.pullPolicy .Values.sinks.image.pullPolicy }}
           name: {{ .Release.Name }}-sinks
           ports:

diff --git a/charts/orb/templates/users-deployment.yaml b/charts/orb/templates/users-deployment.yaml
@@ -85,7 +85,7 @@ spec:
             - name: MF_EMAIL_TEMPLATE
               value: "/email.tmpl"
             {{- end }}
-          image: "{{ default .Values.defaults.image.mfRepository .Values.users.image.repository }}/users:{{ default .Values.defaults.image.mfTag .Values.users.image.tag }}"
+          image: "{{ default .Values.defaults.image.mfRepository .Values.users.image.repository }}/{{ default .Values.users.image.name }}:{{ default .Values.defaults.image.mfTag .Values.users.image.tag }}"
           imagePullPolicy: {{ default .Values.defaults.image.pullPolicy .Values.users.image.pullPolicy }}
           name: {{ .Release.Name }}-users
           ports:

diff --git a/charts/orb/values.yaml b/charts/orb/values.yaml
@@ -53,7 +53,11 @@ mqtt:
   redisCacheHost: "" # Set this field with host if you want to point to external database such as Elasticache
 
 users:
-  image: { }
+  image:
+    name: "users"
+    pullPolicy: "IfNotPresent"
+    repository: "mainflux"
+    tag: "0.12.1"
   dbPort: 5432
   dbHost: "" # Set this field with host if you want to point to external database such as RDS
   httpPort: 8180
@@ -105,6 +109,8 @@ sinker:
   httpPort: 8201
   redisESPort: 6379
   redisESHost: "" # Set this field with host if you want to point to external database such as Elasticache
+  redisCachePort: 6379
+  redisCacheHost: "" # Set this field with host if you want to point to external database such as Elasticache
   metadata:
     annotations: { }
 
@@ -123,7 +129,11 @@ things:
     annotations: { }
 
 auth:
-  image: { }
+  image:
+    name: "auth"
+    pullPolicy: "IfNotPresent"
+    repository: "mainflux"
+    tag: "0.12.1"
   dbPort: 5432
   dbHost: "" # Set this field with host if you want to point to external database such as RDS
   grpcPort: 8181
@@ -236,7 +246,7 @@ redis-streams:
   auth:
     enabled: false
 
-redis-mqtt:
+redis-sinker:
   enabled: true # dependency install, disable if you want to use external services
   volumePermissions:
     enabled: true