diff --git a/charts/hub/Chart.yaml b/charts/hub/Chart.yaml index e1f9437..fb9e3bd 100644 --- 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.95.0 +version: 0.96.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/admin/deployment.yaml b/charts/hub/templates/admin/deployment.yaml index 5548c29..1e032e5 100644 --- a/charts/hub/templates/admin/deployment.yaml +++ b/charts/hub/templates/admin/deployment.yaml @@ -26,6 +26,8 @@ spec: containerPort: 80 protocol: TCP env: + - name: LOG_LEVEL + value: "{{ .Values.admin.logLevel }}" - name: API_URL value: "{{ .Values.kerberoshub.api.schema }}://{{ .Values.kerberoshub.api.url }}" - name: TITLE diff --git a/charts/hub/templates/kerberos-hub/hub-api.yaml b/charts/hub/templates/kerberos-hub/hub-api.yaml index 6eda544..9a3d59a 100644 --- a/charts/hub/templates/kerberos-hub/hub-api.yaml +++ b/charts/hub/templates/kerberos-hub/hub-api.yaml @@ -152,6 +152,8 @@ spec: value: "{{ .Values.environment }}" - name: READ_ONLY value: "{{ .Values.readOnly }}" + - name: LOG_LEVEL + value: "{{ .Values.kerberoshub.api.logLevel }}" - name: SUPPORT_ENABLED value: "{{ .Values.kerberoshub.support.enabled }}" - name: CLOUD_API_URL @@ -281,22 +283,6 @@ spec: - name: SLACK_USERNAME value: "{{ .Values.kerberoshub.api.slack.username }}" - # Elastic search - Kibana - - name: LOGGING_ELASTICSEARCH - value: "{{ .Values.kerberoshub.api.elasticsearch.enabled }}" - - name: LOGGING_ELASTICSEARCH_PROTOCOL - value: "{{ .Values.kerberoshub.api.elasticsearch.protocol }}" - - name: LOGGING_ELASTICSEARCH_HOST - value: "{{ .Values.kerberoshub.api.elasticsearch.host }}" - - name: LOGGING_ELASTICSEARCH_PORT - value: "{{ .Values.kerberoshub.api.elasticsearch.port }}" - - name: LOGGING_ELASTICSEARCH_INDEX - value: "{{ .Values.kerberoshub.api.elasticsearch.index }}" - - name: LOGGING_ELASTICSEARCH_USERNAME - value: "{{ .Values.kerberoshub.api.elasticsearch.username }}" - - name: LOGGING_ELASTICSEARCH_PASSWORD - value: "{{ .Values.kerberoshub.api.elasticsearch.password }}" - # Mail settings - name: MAIL_PROVIDER value: "{{ .Values.email.provider }}" diff --git a/charts/hub/templates/kerberos-hub/hub-cleanup.yaml b/charts/hub/templates/kerberos-hub/hub-cleanup.yaml index 56e22e6..3d185de 100644 --- a/charts/hub/templates/kerberos-hub/hub-cleanup.yaml +++ b/charts/hub/templates/kerberos-hub/hub-cleanup.yaml @@ -4,7 +4,7 @@ metadata: name: hub-cleanup namespace: {{ .Release.Namespace }} spec: - replicas: 1 + replicas: {{ .Values.kerberoshub.cleanup.replicas }} selector: matchLabels: app: hub-cleanup @@ -37,6 +37,8 @@ spec: - configMapRef: name: mongodb-config env: + - name: LOG_LEVEL + value: "{{ .Values.kerberoshub.cleanup.logLevel }}" - name: READ_ONLY value: "{{ .Values.readonly }}" - name: MAX_DAYS diff --git a/charts/hub/templates/kerberos-hub/hub-frontend.yaml b/charts/hub/templates/kerberos-hub/hub-frontend.yaml index 0f81411..974db6e 100644 --- a/charts/hub/templates/kerberos-hub/hub-frontend.yaml +++ b/charts/hub/templates/kerberos-hub/hub-frontend.yaml @@ -184,6 +184,8 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} env: + - name: LOG_LEVEL + value: "{{ .Values.kerberoshub.frontend.logLevel }}" - name: SSO_DOMAINS # get the domain attribute from the list of sso domains value: "{{- range .Values.kerberoshub.api.sso }}{{ .domain }};{{- end }}" diff --git a/charts/hub/templates/kerberos-hub/hub-monitor-device.yaml b/charts/hub/templates/kerberos-hub/hub-monitor-device.yaml index 095b645..5da3354 100644 --- a/charts/hub/templates/kerberos-hub/hub-monitor-device.yaml +++ b/charts/hub/templates/kerberos-hub/hub-monitor-device.yaml @@ -4,7 +4,7 @@ metadata: name: hub-monitor-device namespace: {{ .Release.Namespace }} spec: - replicas: 1 + replicas: {{ .Values.kerberoshub.monitordevice.replicas }} selector: matchLabels: app: hub-monitor-device @@ -45,6 +45,8 @@ spec: - configMapRef: name: mongodb-config env: + - name: LOG_LEVEL + value: "{{ .Values.kerberoshub.monitordevice.logLevel }}" - name: READ_ONLY value: "{{ .Values.readonly }}" # Mail settings diff --git a/charts/hub/templates/kerberos-hub/hub-reactivate-subscription.yaml b/charts/hub/templates/kerberos-hub/hub-reactivate-subscription.yaml index 7f1f8cc..dd5e7ac 100644 --- a/charts/hub/templates/kerberos-hub/hub-reactivate-subscription.yaml +++ b/charts/hub/templates/kerberos-hub/hub-reactivate-subscription.yaml @@ -4,7 +4,7 @@ metadata: name: hub-reactivate-subscription namespace: {{ .Release.Namespace }} spec: - replicas: 1 + replicas: {{ .Values.kerberoshub.reactivate.replicas }} selector: matchLabels: app: hub-reactivate-subscription @@ -33,6 +33,8 @@ spec: - configMapRef: name: mongodb-config env: + - name: LOG_LEVEL + value: "{{ .Values.kerberoshub.reactivate.logLevel }}" - name: READ_ONLY value: "{{ .Values.readonly }}" - name: AWS_ACCESS_KEY_ID diff --git a/charts/hub/templates/kerberos-pipeline/pipe-analysis.yaml b/charts/hub/templates/kerberos-pipeline/pipe-analysis.yaml index 482faff..16ffba8 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-analysis.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-analysis.yaml @@ -37,6 +37,8 @@ spec: - configMapRef: name: mongodb-config env: + - name: LOG_LEVEL + value: "{{ .Values.kerberospipeline.analysis.logLevel }}" - name: CLOUD_PROVIDER value: "{{ .Values.cloudProvider }}" - name: QUEUE_SYSTEM diff --git a/charts/hub/templates/kerberos-pipeline/pipe-counting.yaml b/charts/hub/templates/kerberos-pipeline/pipe-counting.yaml index 3f20346..883aa40 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-counting.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-counting.yaml @@ -32,6 +32,8 @@ spec: {{- toYaml . | nindent 12 }} {{- end }} env: + - name: LOG_LEVEL + value: "{{ .Values.kerberospipeline.counting.logLevel }}" - name: CLOUD_PROVIDER value: "{{ .Values.cloudProvider }}" - name: QUEUE_SYSTEM diff --git a/charts/hub/templates/kerberos-pipeline/pipe-dominantcolor.yaml b/charts/hub/templates/kerberos-pipeline/pipe-dominantcolor.yaml index 44265af..c5f1599 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-dominantcolor.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-dominantcolor.yaml @@ -32,6 +32,8 @@ spec: {{- toYaml . | nindent 12 }} {{- end }} env: + - name: LOG_LEVEL + value: "{{ .Values.kerberospipeline.dominantColor.logLevel }}" - name: CLOUD_PROVIDER value: "{{ .Values.cloudProvider }}" - name: QUEUE_SYSTEM diff --git a/charts/hub/templates/kerberos-pipeline/pipe-event.yaml b/charts/hub/templates/kerberos-pipeline/pipe-event.yaml index b66727c..00dc257 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-event.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-event.yaml @@ -39,6 +39,8 @@ spec: - configMapRef: name: mongodb-config env: + - name: LOG_LEVEL + value: "{{ .Values.kerberospipeline.event.logLevel }}" - name: READ_ONLY value: "{{ .Values.readonly }}" - name: CLOUD_PROVIDER diff --git a/charts/hub/templates/kerberos-pipeline/pipe-export.yaml b/charts/hub/templates/kerberos-pipeline/pipe-export.yaml index dd7fef0..433336c 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-export.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-export.yaml @@ -37,6 +37,8 @@ spec: - configMapRef: name: mongodb-config env: + - name: LOG_LEVEL + value: "{{ .Values.kerberospipeline.export.logLevel }}" - name: CLOUD_PROVIDER value: "{{ .Values.cloudProvider }}" - name: QUEUE_SYSTEM diff --git a/charts/hub/templates/kerberos-pipeline/pipe-notify.yaml b/charts/hub/templates/kerberos-pipeline/pipe-notify.yaml index 4e47a50..ba6444b 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-notify.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-notify.yaml @@ -45,6 +45,8 @@ spec: - configMapRef: name: mongodb-config env: + - name: LOG_LEVEL + value: "{{ .Values.kerberospipeline.notify.logLevel }}" # Queue - name: QUEUE_SYSTEM value: "{{ .Values.queueProvider }}" diff --git a/charts/hub/templates/kerberos-pipeline/pipe-sprite.yaml b/charts/hub/templates/kerberos-pipeline/pipe-sprite.yaml index 1254f28..935c57f 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-sprite.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-sprite.yaml @@ -33,6 +33,8 @@ spec: {{- toYaml . | nindent 12 }} {{- end }} env: + - name: LOG_LEVEL + value: "{{ .Values.kerberospipeline.sprite.logLevel }}" {{ if .Values.isPrivate }} - name: KERBEROS_PRIVATE_CLOUD value: "true" diff --git a/charts/hub/templates/kerberos-pipeline/pipe-throttler.yaml b/charts/hub/templates/kerberos-pipeline/pipe-throttler.yaml index 00aa296..8c0e284 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-throttler.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-throttler.yaml @@ -37,6 +37,8 @@ spec: - configMapRef: name: mongodb-config env: + - name: LOG_LEVEL + value: "{{ .Values.kerberospipeline.throttler.logLevel }}" - name: CLOUD_PROVIDER value: "{{ .Values.cloudProvider }}" - name: QUEUE_SYSTEM diff --git a/charts/hub/templates/kerberos-pipeline/pipe-thumbnail.yaml b/charts/hub/templates/kerberos-pipeline/pipe-thumbnail.yaml index 0b5ff67..b050233 100644 --- a/charts/hub/templates/kerberos-pipeline/pipe-thumbnail.yaml +++ b/charts/hub/templates/kerberos-pipeline/pipe-thumbnail.yaml @@ -32,6 +32,8 @@ spec: {{- toYaml . | nindent 12 }} {{- end }} env: + - name: LOG_LEVEL + value: "{{ .Values.kerberospipeline.thumbnail.logLevel }}" {{ if .Values.isPrivate }} - name: KERBEROS_PRIVATE_CLOUD value: "true" diff --git a/charts/hub/templates/kerberos-vault/vault-proxy.yaml b/charts/hub/templates/kerberos-vault/vault-proxy.yaml index 674038b..ae0043f 100644 --- a/charts/hub/templates/kerberos-vault/vault-proxy.yaml +++ b/charts/hub/templates/kerberos-vault/vault-proxy.yaml @@ -4,7 +4,7 @@ metadata: name: vault-proxy namespace: {{ .Release.Namespace }} spec: - replicas: 3 + replicas: {{ .Values.kerberoshub.proxy.replicas }} selector: matchLabels: app: vault-proxy @@ -31,6 +31,8 @@ spec: - containerPort: 8080 name: http env: + - name: LOG_LEVEL + value: "{{ .Values.kerberoshub.proxy.logLevel }}" # Kerberos Hub API - name: KERBEROS_API_CHECK_SUBSCRIPTION value: "{{ .Values.kerberoshub.api.schema }}://{{ .Values.kerberoshub.api.url }}/user/has-subscription" diff --git a/charts/hub/values.yaml b/charts/hub/values.yaml index 3be5084..b15abdc 100644 --- a/charts/hub/values.yaml +++ b/charts/hub/values.yaml @@ -151,6 +151,7 @@ admin: pullPolicy: IfNotPresent tag: "v1.1.0" replicas: 2 + logLevel: "info" # possible values: trace, debug, info, warn, error resources: requests: memory: 100Mi @@ -183,6 +184,7 @@ kerberoshub: pullPolicy: IfNotPresent tag: "v1.7.2" replicas: 2 + logLevel: "info" # possible values: trace, debug, info, warn, error jwtSecret: "this-is-a-secret-please-change-to-random-string" # change to a random value, this is for generating JWT tokens. schema: "https" url: "api.yourdomain.com" @@ -267,6 +269,7 @@ kerberoshub: pullPolicy: IfNotPresent tag: "v1.7.3" replicas: 2 + logLevel: "info" # possible values: trace, debug, info, warn, error schema: "https" url: "yourdomain.com" resources: @@ -468,6 +471,8 @@ kerberoshub: repository: uugai/hub-cleanup pullPolicy: IfNotPresent tag: "v1.4.1" + replicas: 1 # Number of pods for the service. + logLevel: "info" # possible values: trace, debug, info, warn, error maxDays: "365" # The maximum number of days to keep orphaned recordings. resources: requests: @@ -477,6 +482,8 @@ kerberoshub: repository: uugai/hub-monitor-device pullPolicy: IfNotPresent tag: "v1.3.0" + replicas: 1 # Number of pods for the service. + logLevel: "info" # possible values: trace, debug, info, warn, error resources: requests: memory: 10Mi @@ -492,7 +499,9 @@ kerberoshub: reactivate: repository: uugai/hub-reactivatesubscriptions pullPolicy: IfNotPresent - tag: "v1.0.2" + tag: "v1.0.2" + replicas: 1 # Number of pods for the service. + logLevel: "info" # possible values: trace, debug, info, warn, error resources: requests: memory: 10Mi @@ -510,7 +519,9 @@ kerberoshub: proxy: repository: uugai/hub-proxy pullPolicy: IfNotPresent - tag: "v1.0.0" + tag: "v1.0.0" + replicas: 1 # Number of pods for the service. + logLevel: "info" # possible values: trace, debug, info, warn, error resources: requests: memory: 10Mi @@ -524,7 +535,8 @@ kerberospipeline: repository: uugai/hub-pipeline-event pullPolicy: IfNotPresent tag: "v1.2.0" - replicas: 1 + replicas: 1 # Number of pods for the service. + logLevel: "info" # possible values: trace, debug, info, warn, error resources: requests: memory: 10Mi @@ -533,7 +545,7 @@ kerberospipeline: repository: uugai/hub-pipeline-monitor pullPolicy: IfNotPresent tag: "v1.3.5" - replicas: 1 + replicas: 1 # Number of pods for the service. resources: requests: memory: 10Mi @@ -542,7 +554,7 @@ kerberospipeline: repository: uugai/hub-pipeline-sequence pullPolicy: IfNotPresent tag: "v1.6.6" - replicas: 1 + replicas: 1 # Number of pods for the service. resources: requests: memory: 10Mi @@ -551,7 +563,8 @@ kerberospipeline: repository: uugai/hub-pipeline-throttler pullPolicy: IfNotPresent tag: "v1.2.0" - replicas: 1 + replicas: 1 # Number of pods for the service. + logLevel: "info" # possible values: trace, debug, info, warn, error resources: requests: memory: 10Mi @@ -560,7 +573,8 @@ kerberospipeline: repository: uugai/hub-pipeline-notification pullPolicy: IfNotPresent tag: "v1.0.20" - replicas: 1 + replicas: 1 # Number of pods for the service. + logLevel: "info" # possible values: trace, debug, info, warn, error resources: requests: memory: 10Mi @@ -577,7 +591,7 @@ kerberospipeline: repository: uugai/hub-pipeline-notification-test pullPolicy: IfNotPresent tag: "v1.2.1" - replicas: 1 + replicas: 1 # Number of pods for the service. resources: requests: memory: 10Mi @@ -594,7 +608,8 @@ kerberospipeline: repository: uugai/hub-pipeline-analysis pullPolicy: IfNotPresent tag: "v1.6.1" - replicas: 1 + replicas: 1 # Number of pods for the service. + logLevel: "info" # possible values: trace, debug, info, warn, error resources: requests: memory: 10Mi @@ -603,7 +618,8 @@ kerberospipeline: repository: uugai/hub-pipeline-dominantcolors pullPolicy: IfNotPresent tag: "v1.2.0" - replicas: 3 + replicas: 3 # Number of pods for the service. + logLevel: "info" # possible values: trace, debug, info, warn, resources: requests: memory: 512Mi @@ -615,7 +631,8 @@ kerberospipeline: repository: uugai/hub-pipeline-thumbnail pullPolicy: IfNotPresent tag: "v1.2.1" - replicas: 2 + replicas: 2 # Number of pods for the service. + logLevel: "info" # possible values: trace, debug, info, warn, error quality: "1" # 1 (best) - 31 (worst) width: "600" height: "-1" @@ -632,7 +649,8 @@ kerberospipeline: repository: uugai/hub-pipeline-counting pullPolicy: IfNotPresent tag: "v1.6.2" - replicas: 1 + replicas: 1 # Number of pods for the service. + logLevel: "info" # possible values: trace, debug, info, warn, resources: requests: memory: 10Mi @@ -642,7 +660,8 @@ kerberospipeline: repository: uugai/hub-pipeline-sprite pullPolicy: IfNotPresent tag: "v1.0.9" - replicas: 5 + replicas: 5 # Number of pods for the service. + logLevel: "info" # possible values: trace, debug, info, warn, interval: "1" # Number of secondes between each thumbnail in the sprite width: "240" # Should not be changed for the moment (hard coded in UI) height: "135" # Should not be changed for the moment (hard coded in UI) @@ -657,7 +676,8 @@ kerberospipeline: repository: uugai/hub-pipeline-export pullPolicy: IfNotPresent tag: "v1.0.0" - replicas: 2 + replicas: 2 # Number of pods for the service. + logLevel: "info" # possible values: trace, debug, info, warn, error resources: requests: memory: 10Mi