new release + partial support for rabbitmq

kerberos-io · Mar 24, 2023 · 529ba9e · 529ba9e
1 parent 1caee76
commit 529ba9e
Show file tree

Hide file tree

Showing 18 changed files with 266 additions and 68 deletions.
diff --git a/charts/hub/Chart.yaml b/charts/hub/Chart.yaml
@@ -16,7 +16,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.42.0
+version: 0.43.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/hub/templates/kerberos-hub/hub-api.yaml b/charts/hub/templates/kerberos-hub/hub-api.yaml
@@ -124,10 +124,10 @@ spec:
         - name: hub-api
           image: "{{ .Values.kerberoshub.api.repository }}:{{ .Values.kerberoshub.api.tag }}"
           imagePullPolicy: {{ .Values.kerberoshub.api.pullPolicy }}
+          {{- with .Values.kerberoshub.api.resources }}
           resources:
-            requests:
-              memory: 100Mi
-              cpu: 50m
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           ports:
             - containerPort: 80
               name: http  

diff --git a/charts/hub/templates/kerberos-hub/hub-cleanup.yaml b/charts/hub/templates/kerberos-hub/hub-cleanup.yaml
@@ -26,10 +26,10 @@ spec:
         - name: hub-cleanup
           image: "{{ .Values.kerberoshub.cleanup.repository }}:{{ .Values.kerberoshub.cleanup.tag }}"
           imagePullPolicy: {{ .Values.kerberoshub.cleanup.pullPolicy }}
+          {{- with .Values.kerberoshub.cleanup.resources }}
           resources:
-            requests:
-              memory: 10Mi
-              cpu: 10m
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           env:
             - name: MAX_DAYS
               value: "30"

diff --git a/charts/hub/templates/kerberos-hub/hub-frontend-demo.yaml b/charts/hub/templates/kerberos-hub/hub-frontend-demo.yaml
@@ -90,10 +90,10 @@ spec:
       - name: hub-frontend-demo
         image: "{{ .Values.kerberoshub.frontend.repository }}:{{ .Values.kerberoshub.frontend.tag }}"
         imagePullPolicy: {{ .Values.kerberoshub.frontend.pullPolicy }}
+        {{- with .Values.kerberoshub.frontend.resources }}
         resources:
-          requests:
-            memory: 10Mi
-            cpu: 10m
+          {{- toYaml . | nindent 12 }}
+        {{- end }}
         ports:
         - containerPort: 80
           name: http

diff --git a/charts/hub/templates/kerberos-hub/hub-frontend.yaml b/charts/hub/templates/kerberos-hub/hub-frontend.yaml
@@ -111,10 +111,10 @@ spec:
       - name: hub-frontend
         image: "{{ .Values.kerberoshub.frontend.repository }}:{{ .Values.kerberoshub.frontend.tag }}"
         imagePullPolicy: {{ .Values.kerberoshub.frontend.pullPolicy }}
+        {{- with .Values.kerberoshub.frontend.resources }}
         resources:
-          requests:
-            memory: 10Mi
-            cpu: 10m
+          {{- toYaml . | nindent 12 }}
+        {{- end }}
         ports:
         - containerPort: 80
           name: http

diff --git a/charts/hub/templates/kerberos-hub/hub-monitor-device.yaml b/charts/hub/templates/kerberos-hub/hub-monitor-device.yaml
@@ -30,10 +30,10 @@ spec:
         - name: hub-monitor-device
           image: "{{ .Values.kerberoshub.monitordevice.repository }}:{{ .Values.kerberoshub.monitordevice.tag }}"
           imagePullPolicy: {{ .Values.kerberoshub.monitordevice.pullPolicy }}
+          {{- with .Values.kerberoshub.monitordevice.resources }}
           resources:
-            requests:
-              memory: 10Mi
-              cpu: 10m
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           {{- with .Values.kerberoshub.monitordevice.volumeMounts}}
           volumeMounts:
             {{- toYaml . | nindent 12 }}

diff --git a/charts/hub/templates/kerberos-pipeline/pipe-analysis.yaml b/charts/hub/templates/kerberos-pipeline/pipe-analysis.yaml
@@ -26,10 +26,10 @@ spec:
       - name: pipe-analysis
         image: "{{ .Values.kerberospipeline.analysis.repository }}:{{ .Values.kerberospipeline.analysis.tag }}"
         imagePullPolicy: {{ .Values.kerberospipeline.analysis.pullPolicy }}
+        {{- with .Values.kerberospipeline.analysis.resources }}
         resources:
-          requests:
-            memory: 10Mi
-            cpu: 10m
+          {{- toYaml . | nindent 12 }}
+        {{- end }}
         env:
         - name: CLOUD_PROVIDER
           value: "{{ .Values.cloudProvider }}"
@@ -58,6 +58,16 @@ spec:
         - name: KAFKA_SECURITY
           value: "{{ .Values.kafka.security }}"
 
+        # RabbitMQ settings
+        - name: RABBITMQ_HOST
+          value: "{{ .Values.rabbitmq.host }}"
+        - name: RABBITMQ_EXCHANGE
+          value: "{{ .Values.rabbitmq.exchange }}"
+        - name: RABBITMQ_USERNAME
+          value: "{{ .Values.rabbitmq.username }}"
+        - name: RABBITMQ_PASSWORD
+          value: "{{ .Values.rabbitmq.password }}"
+
         # Kerberos Vault
         - name: KERBEROS_STORAGE_URI
           value: "{{ .Values.kerberosvault.uri }}"

diff --git a/charts/hub/templates/kerberos-pipeline/pipe-counting.yaml b/charts/hub/templates/kerberos-pipeline/pipe-counting.yaml
@@ -26,10 +26,10 @@ spec:
       - name: pipe-counting
         image: "{{ .Values.kerberospipeline.counting.repository }}:{{ .Values.kerberospipeline.counting.tag }}"
         imagePullPolicy: {{ .Values.kerberospipeline.counting.pullPolicy }}
+        {{- with .Values.kerberospipeline.counting.resources }}
         resources:
-          requests:
-            memory: 10Mi
-            cpu: 10m
+          {{- toYaml . | nindent 12 }}
+        {{- end }}
         env:
         - name: CLOUD_PROVIDER
           value: "{{ .Values.cloudProvider }}"
@@ -46,4 +46,14 @@ spec:
         - name: KAFKA_MECHANISM
           value: "{{ .Values.kafka.mechanism }}"
         - name: KAFKA_SECURITY
-          value: "{{ .Values.kafka.security }}"
+          value: "{{ .Values.kafka.security }}"
+
+        # RabbitMQ settings
+        - name: RABBITMQ_HOST
+          value: "{{ .Values.rabbitmq.host }}"
+        - name: RABBITMQ_EXCHANGE
+          value: "{{ .Values.rabbitmq.exchange }}"
+        - name: RABBITMQ_USERNAME
+          value: "{{ .Values.rabbitmq.username }}"
+        - name: RABBITMQ_PASSWORD
+          value: "{{ .Values.rabbitmq.password }}"
diff --git a/charts/hub/templates/kerberos-pipeline/pipe-dominantcolor.yaml b/charts/hub/templates/kerberos-pipeline/pipe-dominantcolor.yaml
@@ -26,10 +26,10 @@ spec:
       - name: pipe-dominantcolor
         image: "{{ .Values.kerberospipeline.dominantColor.repository }}:{{ .Values.kerberospipeline.dominantColor.tag }}"
         imagePullPolicy: {{ .Values.kerberospipeline.dominantColor.pullPolicy }}
+        {{- with .Values.kerberospipeline.dominantColor.resources }}
         resources:
-          requests:
-            memory: 512Mi
-            cpu: 500m
+          {{- toYaml . | nindent 12 }}
+        {{- end }}
         env:
         - name: CLOUD_PROVIDER
           value: "{{ .Values.cloudProvider }}"
@@ -46,4 +46,14 @@ spec:
         - name: KAFKA_MECHANISM
           value: "{{ .Values.kafka.mechanism }}"
         - name: KAFKA_SECURITY
-          value: "{{ .Values.kafka.security }}"
+          value: "{{ .Values.kafka.security }}"
+
+        # RabbitMQ settings
+        - name: RABBITMQ_HOST
+          value: "{{ .Values.rabbitmq.host }}"
+        - name: RABBITMQ_EXCHANGE
+          value: "{{ .Values.rabbitmq.exchange }}"
+        - name: RABBITMQ_USERNAME
+          value: "{{ .Values.rabbitmq.username }}"
+        - name: RABBITMQ_PASSWORD
+          value: "{{ .Values.rabbitmq.password }}"
diff --git a/charts/hub/templates/kerberos-pipeline/pipe-event.yaml b/charts/hub/templates/kerberos-pipeline/pipe-event.yaml
@@ -26,10 +26,10 @@ spec:
       - name: pipe-event
         image: "{{ .Values.kerberospipeline.event.repository }}:{{ .Values.kerberospipeline.event.tag }}"
         imagePullPolicy: {{ .Values.kerberospipeline.event.pullPolicy }}
+        {{- with .Values.kerberospipeline.event.resources }}
         resources:
-          requests:
-            memory: 10Mi
-            cpu: 10m
+          {{- toYaml . | nindent 12 }}
+        {{- end }}
         env:
         - name: CLOUD_PROVIDER
           value: "{{ .Values.cloudProvider }}"
@@ -56,4 +56,14 @@ spec:
         - name: KAFKA_MECHANISM
           value: "{{ .Values.kafka.mechanism }}"
         - name: KAFKA_SECURITY
-          value: "{{ .Values.kafka.security }}"
+          value: "{{ .Values.kafka.security }}"
+
+        # RabbitMQ settings
+        - name: RABBITMQ_HOST
+          value: "{{ .Values.rabbitmq.host }}"
+        - name: RABBITMQ_EXCHANGE
+          value: "{{ .Values.rabbitmq.exchange }}"
+        - name: RABBITMQ_USERNAME
+          value: "{{ .Values.rabbitmq.username }}"
+        - name: RABBITMQ_PASSWORD
+          value: "{{ .Values.rabbitmq.password }}"
diff --git a/charts/hub/templates/kerberos-pipeline/pipe-monitor.yaml b/charts/hub/templates/kerberos-pipeline/pipe-monitor.yaml
@@ -26,10 +26,10 @@ spec:
       - name: pipe-monitor
         image: "{{ .Values.kerberospipeline.monitor.repository }}:{{ .Values.kerberospipeline.monitor.tag }}"
         imagePullPolicy: {{ .Values.kerberospipeline.monitor.pullPolicy }}
+        {{- with .Values.kerberospipeline.monitor.resources }}
         resources:
-          requests:
-            memory: 10Mi
-            cpu: 10m
+          {{- toYaml . | nindent 12 }}
+        {{- end }}
         env:
         # Database
         - name: MONGODB_HOST
@@ -57,6 +57,16 @@ spec:
         - name: KAFKA_SECURITY
           value: "{{ .Values.kafka.security }}"
 
+        # RabbitMQ settings
+        - name: RABBITMQ_HOST
+          value: "{{ .Values.rabbitmq.host }}"
+        - name: RABBITMQ_EXCHANGE
+          value: "{{ .Values.rabbitmq.exchange }}"
+        - name: RABBITMQ_USERNAME
+          value: "{{ .Values.rabbitmq.username }}"
+        - name: RABBITMQ_PASSWORD
+          value: "{{ .Values.rabbitmq.password }}"
+
         # Mail settings
         - name: MAIL_PROVIDER
           value: "{{ .Values.email.provider }}"

diff --git a/charts/hub/templates/kerberos-pipeline/pipe-notify-test.yaml b/charts/hub/templates/kerberos-pipeline/pipe-notify-test.yaml
@@ -30,10 +30,10 @@ spec:
       - name: pipe-notify-test
         image: "{{ .Values.kerberospipeline.notifyTest.repository }}:{{ .Values.kerberospipeline.notifyTest.tag }}"
         imagePullPolicy: {{ .Values.kerberospipeline.notifyTest.pullPolicy }}
+        {{- with .Values.kerberospipeline.notifyTest.resources }}
         resources:
-          requests:
-            memory: 10Mi
-            cpu: 10m
+          {{- toYaml . | nindent 12 }}
+        {{- end }}
         {{- with .Values.kerberospipeline.notifyTest.volumeMounts}}
         volumeMounts:
           {{- toYaml . | nindent 12 }}
@@ -72,6 +72,16 @@ spec:
         - name: KAFKA_SECURITY
           value: "{{ .Values.kafka.security }}"
 
+        # RabbitMQ settings
+        - name: RABBITMQ_HOST
+          value: "{{ .Values.rabbitmq.host }}"
+        - name: RABBITMQ_EXCHANGE
+          value: "{{ .Values.rabbitmq.exchange }}"
+        - name: RABBITMQ_USERNAME
+          value: "{{ .Values.rabbitmq.username }}"
+        - name: RABBITMQ_PASSWORD
+          value: "{{ .Values.rabbitmq.password }}"
+
         # Mail settings
         - name: MAIL_PROVIDER
           value: "{{ .Values.email.provider }}"

diff --git a/charts/hub/templates/kerberos-pipeline/pipe-notify.yaml b/charts/hub/templates/kerberos-pipeline/pipe-notify.yaml
@@ -30,10 +30,10 @@ spec:
       - name: pipe-notify
         image: "{{ .Values.kerberospipeline.notify.repository }}:{{ .Values.kerberospipeline.notify.tag }}"
         imagePullPolicy: {{ .Values.kerberospipeline.notify.pullPolicy }}
+        {{- with .Values.kerberospipeline.notify.resources }}
         resources:
-          requests:
-            memory: 10Mi
-            cpu: 10m
+          {{- toYaml . | nindent 12 }}
+        {{- end }}
         {{- with .Values.kerberospipeline.notify.volumeMounts}}
         volumeMounts:
           {{- toYaml . | nindent 12 }}
@@ -65,6 +65,16 @@ spec:
         - name: KAFKA_SECURITY
           value: "{{ .Values.kafka.security }}"
 
+        # RabbitMQ settings
+        - name: RABBITMQ_HOST
+          value: "{{ .Values.rabbitmq.host }}"
+        - name: RABBITMQ_EXCHANGE
+          value: "{{ .Values.rabbitmq.exchange }}"
+        - name: RABBITMQ_USERNAME
+          value: "{{ .Values.rabbitmq.username }}"
+        - name: RABBITMQ_PASSWORD
+          value: "{{ .Values.rabbitmq.password }}"
+
         # Kerberos Vault
         - name: STORAGE_URI
           value: "{{ .Values.kerberosvault.uri }}"

diff --git a/charts/hub/templates/kerberos-pipeline/pipe-sequence.yaml b/charts/hub/templates/kerberos-pipeline/pipe-sequence.yaml
@@ -26,10 +26,10 @@ spec:
       - name: pipe-sequence
         image: "{{ .Values.kerberospipeline.sequence.repository }}:{{ .Values.kerberospipeline.sequence.tag }}"
         imagePullPolicy: {{ .Values.kerberospipeline.sequence.pullPolicy }}
+        {{- with .Values.kerberospipeline.sequence.resources }}
         resources:
-          requests:
-            memory: 10Mi
-            cpu: 10m
+          {{- toYaml . | nindent 12 }}
+        {{- end }}
         env:
         - name: CLOUD_PROVIDER
           value: "{{ .Values.cloudProvider }}"
@@ -56,4 +56,14 @@ spec:
         - name: KAFKA_MECHANISM
           value: "{{ .Values.kafka.mechanism }}"
         - name: KAFKA_SECURITY
-          value: "{{ .Values.kafka.security }}"
+          value: "{{ .Values.kafka.security }}"
+
+        # RabbitMQ settings
+        - name: RABBITMQ_HOST
+          value: "{{ .Values.rabbitmq.host }}"
+        - name: RABBITMQ_EXCHANGE
+          value: "{{ .Values.rabbitmq.exchange }}"
+        - name: RABBITMQ_USERNAME
+          value: "{{ .Values.rabbitmq.username }}"
+        - name: RABBITMQ_PASSWORD
+          value: "{{ .Values.rabbitmq.password }}"
diff --git a/charts/hub/templates/kerberos-pipeline/pipe-sprite.yaml b/charts/hub/templates/kerberos-pipeline/pipe-sprite.yaml
@@ -26,11 +26,11 @@ spec:
       containers:
       - name: pipe-sprite
         image: "{{ .Values.kerberospipeline.sprite.repository }}:{{ .Values.kerberospipeline.sprite.tag }}"
-        imagePullPolicy: {{ .Values.kerberospipeline.sprite.pullPolicy }}
+        imagePullPolicy: {{ .Values.kerberospipeline.sprite.pullPolicy }}        
+        {{- with .Values.kerberospipeline.sprite.resources }}
         resources:
-          requests:
-            memory: 512Mi
-            cpu: 500m
+          {{- toYaml . | nindent 12 }}
+        {{- end }}
         env:
         {{ if .Values.isPrivate }}
         - name: KERBEROS_PRIVATE_CLOUD
@@ -56,6 +56,16 @@ spec:
         - name: KAFKA_SECURITY
           value: "{{ .Values.kafka.security }}"
 
+        # RabbitMQ settings
+        - name: RABBITMQ_HOST
+          value: "{{ .Values.rabbitmq.host }}"
+        - name: RABBITMQ_EXCHANGE
+          value: "{{ .Values.rabbitmq.exchange }}"
+        - name: RABBITMQ_USERNAME
+          value: "{{ .Values.rabbitmq.username }}"
+        - name: RABBITMQ_PASSWORD
+          value: "{{ .Values.rabbitmq.password }}"
+
         # There is an option to store the sprites in a storage provider in Kerberos Vault.
         - name: VAULT_SPRITE_ENABLED
           value: "{{ .Values.kerberospipeline.sprite.enabled }}"

diff --git a/charts/hub/templates/kerberos-pipeline/pipe-throttler.yaml b/charts/hub/templates/kerberos-pipeline/pipe-throttler.yaml
@@ -26,10 +26,10 @@ spec:
       - name: pipe-throttler
         image: "{{ .Values.kerberospipeline.throttler.repository }}:{{ .Values.kerberospipeline.throttler.tag }}"
         imagePullPolicy: {{ .Values.kerberospipeline.throttler.pullPolicy }}
+        {{- with .Values.kerberospipeline.throttler.resources }}
         resources:
-          requests:
-            memory: 10Mi
-            cpu: 10m
+          {{- toYaml . | nindent 12 }}
+        {{- end }}
         env:
         - name: CLOUD_PROVIDER
           value: "{{ .Values.cloudProvider }}"
@@ -56,4 +56,14 @@ spec:
         - name: KAFKA_MECHANISM
           value: "{{ .Values.kafka.mechanism }}"
         - name: KAFKA_SECURITY
-          value: "{{ .Values.kafka.security }}"
+          value: "{{ .Values.kafka.security }}"
+
+        # RabbitMQ settings
+        - name: RABBITMQ_HOST
+          value: "{{ .Values.rabbitmq.host }}"
+        - name: RABBITMQ_EXCHANGE
+          value: "{{ .Values.rabbitmq.exchange }}"
+        - name: RABBITMQ_USERNAME
+          value: "{{ .Values.rabbitmq.username }}"
+        - name: RABBITMQ_PASSWORD
+          value: "{{ .Values.rabbitmq.password }}"