Merge branch 'dev' of https://github.com/RADAR-base/RADAR-Kubernetes …

…into fix-kratos-ui
RADAR-base · Jan 18, 2025 · f8a5906 · f8a5906
2 parents 1eba66f + 04cfc1d
commit f8a5906
Show file tree

Hide file tree

Showing 4 changed files with 84 additions and 3 deletions.
diff --git a/etc/base-secrets.yaml b/etc/base-secrets.yaml
@@ -175,3 +175,13 @@ velero:
           [default]
           aws_access_key_id=change_me
           aws_secret_access_key=change_me
+
+nifi:
+  properties:
+    sensitiveKey: secret
+  auth:
+    singleUser:
+      username: username
+      password: change_me
+  certManager:
+    keystorePasswd: secret
diff --git a/etc/base.yaml b/etc/base.yaml
@@ -288,13 +288,13 @@ radar_oura_connector:
 
 radar_rest_sources_authorizer:
   _install: false
-  _chart_version: 2.0.1
+  _chart_version: 2.0.2
   _extra_timeout: 0
   replicaCount: 1
 
 radar_rest_sources_backend:
   _install: false
-  _chart_version: 1.1.5
+  _chart_version: 1.1.6
   _extra_timeout: 0
   replicaCount: 1
   postgres:
@@ -564,3 +564,12 @@ velero:
         bucket: radar-base-backups
         config:
           s3Url: https://s3.amazon.com # protocol should be specified
+
+nifi:
+  _install: false
+  _chart_version: 1.2.1
+  _extra_timeout: 300
+  zookeeper:
+    enabled: false
+    url: cp-zookeeper-headless
+    port: 2181
diff --git a/etc/cp-nifi/values.yaml b/etc/cp-nifi/values.yaml
@@ -0,0 +1,41 @@
+properties:
+  isNode: true
+
+ingress:
+  enabled: true
+  path: /nifi
+  className: nginx
+  annotations:
+    nginx.ingress.kubernetes.io/app-root: /nifi
+    nginx.ingress.kubernetes.io/backend-protocol: HTTPS
+    nginx.ingress.kubernetes.io/affinity-mode: persistent
+    nginx.ingress.kubernetes.io/affinity: "cookie"
+    nginx.ingress.kubernetes.io/use-regex: "true"
+    nginx.ingress.kubernetes.io/session-cookie-path: "/"
+    cert-manager.io/cluster-issuer: letsencrypt-prod
+    nginx.ingress.kubernetes.io/configuration-snippet: |
+      proxy_set_header 'X-ProxyScheme' 'https';
+      proxy_set_header 'X-ProxyPort' '443';
+      proxy_set_header X-ProxyHost $host;
+
+service:
+  sessionAffinity: ClientIP
+  sessionAffinityConfig:
+    clientIP:
+      timeoutSeconds: 10800
+
+persistence:
+  enabled: true
+
+registry:
+    enabled: true
+
+jvmMemory: 2g
+
+resources:
+  requests:
+      cpu: 1
+      memory: 4Gi
+
+certManager:
+  enabled: true
diff --git a/helmfile.d/10-services.yaml b/helmfile.d/10-services.yaml
@@ -281,6 +281,8 @@ releases:
     set:
       - name: ingress.hosts
         values: [{{ .Values.server_name }}]
+      - name: serverName
+        value: {{ .Values.server_name }}
 
   - name: kratos
     chart: radar/kratos
@@ -947,7 +949,7 @@ releases:
     timeout: {{ add .Values.base_timeout .Values.radar_push_endpoint._extra_timeout }}
     needs:
       - management-portal
-    <<: *logFailedRelease    
+    <<: *logFailedRelease
     values:
       - {{ .Values.radar_push_endpoint | toYaml | indent 8 | trim }}
       - {{ .Values.confluent_cloud | toYaml | indent 8 | trim }}
@@ -985,3 +987,22 @@ releases:
         value: {{ dig "local" "accessKey" .Values.s3_access_key .Values.velero }}
       - name: local.secretKey
         value: {{ dig "local" "secretKey" .Values.s3_secret_key .Values.velero }}
+
+  - name: nifi
+    chart: radar/nifi
+    installed: {{ .Values.nifi._install }}
+    version: {{ .Values.nifi._chart_version }}
+    timeout: {{ add .Values.base_timeout .Values.nifi._extra_timeout }}
+    <<: *logFailedRelease
+    values:
+      - "../etc/cp-nifi/values.yaml"
+      - {{ .Values.nifi | toYaml | indent 8 | trim }}
+    set:
+      - name: ingress.hosts
+        values: [{{ .Values.server_name }}]
+      - name: ingress.tls[0].hosts
+        values: ["{{ .Values.server_name }}"]
+      - name: ingress.tls[0].secretName
+        value: nifi-crt-secret
+      - name: properties.webProxyHost
+        value: "{{ .Values.server_name }}"