chore(master): merge maint-0.9

chore(maint-0.9): release 0.9.4 (reanahub#768) fix(reana-dev): correctly handle missing changelog of components (reanahub#858) fix(helm): allow interactive-session-cleanup job to access RWC (reanahub#853) feat(helm): release check on most-supported Kubernetes version (reanahub#848) docs(helm): clarify secrets-related warning in README (reanahub#847) feat(helm): allow only reana-server to connect to reana-cache (reanahub#847) feat(helm): support password-protected rabbitmq (reanahub#847) feat(helm): support password-protected redis (reanahub#847) feat(scripts): upgrade to Jupyter SciPy 7.2.2 notebook (reanahub#846)
tiborsimko · Dec 18, 2024 · 39d6f2f · 39d6f2f
2 parents 430e2e4 + b4d1864
commit 39d6f2f
Show file tree

Hide file tree

Showing 13 changed files with 262 additions and 27 deletions.
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "0.9.3"
+  ".": "0.9.4"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/helm/reana/Chart.yaml b/helm/reana/Chart.yaml
@@ -27,8 +27,8 @@ keywords:
   - cwl
   - reusable-science
 type: application
-version: 0.9.3
-kubeVersion: ">= 1.21.0-0 < 1.32.0-0"
+version: 0.9.4
+kubeVersion: ">= 1.21.0-0"
 dependencies:
   - name: traefik
     version: 31.1.0

diff --git a/helm/reana/README.md b/helm/reana/README.md
diff --git a/helm/reana/templates/reana-cache.yaml b/helm/reana/templates/reana-cache.yaml
@@ -13,6 +13,23 @@ spec:
     targetPort: 6379
     protocol: TCP
 ---
+apiVersion: networking.k8s.io/v1
+kind: NetworkPolicy
+metadata:
+  name: {{ include "reana.prefix" . }}-cache
+  namespace: {{ .Release.Namespace }}
+spec:
+  podSelector:
+    matchLabels:
+      app: {{ include "reana.prefix" . }}-cache
+  policyTypes:
+    - Ingress
+  ingress:
+    - from:
+        - podSelector:
+            matchLabels:
+              app: {{ include "reana.prefix" . }}-server
+---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -31,6 +48,15 @@ spec:
       containers:
       - name: cache
         image: docker.io/library/redis:5.0.5
+        env:
+          - name: REANA_CACHE_PASSWORD
+            valueFrom:
+              secretKeyRef:
+                name: {{ include "reana.prefix" . }}-cache-secrets
+                key: password
+        args:
+          - "--requirepass"
+          - "$(REANA_CACHE_PASSWORD)"
         ports:
         - containerPort: 6379
       {{- if .Values.node_label_infrastructure }}

diff --git a/helm/reana/templates/reana-message-broker.yaml b/helm/reana/templates/reana-message-broker.yaml
@@ -56,11 +56,26 @@ spec:
       - name: message-broker
         image: {{ .Values.components.reana_message_broker.image }}
         imagePullPolicy: {{ .Values.components.reana_message_broker.imagePullPolicy }}
+        env:
+        - name: RABBIT_MQ_USER
+          valueFrom:
+            secretKeyRef:
+              name: {{ include "reana.prefix" . }}-message-broker-secrets
+              key: user
+        - name: RABBIT_MQ_PASS
+          valueFrom:
+            secretKeyRef:
+              name: {{ include "reana.prefix" . }}-message-broker-secrets
+              key: password
         ports:
         - containerPort: 5672
           name: tcp
         - containerPort: 15672
           name: management
+        command:
+        - "/start.sh"
+        - "$(RABBIT_MQ_USER)"
+        - "$(RABBIT_MQ_PASS)"
         volumeMounts:
         - mountPath: /var/lib/rabbitmq/mnesia
           subPath: rabbitmq/mnesia

diff --git a/helm/reana/templates/reana-server.yaml b/helm/reana/templates/reana-server.yaml
@@ -171,6 +171,21 @@ spec:
               secretKeyRef:
                 name: {{ include "reana.prefix" . }}-secrets
                 key: REANA_SECRET_KEY
+          - name: REANA_CACHE_PASSWORD
+            valueFrom:
+              secretKeyRef:
+                name: {{ include "reana.prefix" . }}-cache-secrets
+                key: password
+          - name: RABBIT_MQ_USER
+            valueFrom:
+              secretKeyRef:
+                name: {{ include "reana.prefix" . }}-message-broker-secrets
+                key: user
+          - name: RABBIT_MQ_PASS
+            valueFrom:
+              secretKeyRef:
+                name: {{ include "reana.prefix" . }}-message-broker-secrets
+                key: password
           {{- if .Values.debug.enabled }}
           # Disable CORS in development environment, for example
           # to connect from an external React application.
@@ -294,6 +309,16 @@ spec:
               name: {{ include "reana.prefix" $ }}-login-provider-secrets
               key: PROVIDER_SECRETS
         {{- end }}
+        - name: RABBIT_MQ_USER
+          valueFrom:
+            secretKeyRef:
+              name: {{ include "reana.prefix" . }}-message-broker-secrets
+              key: user
+        - name: RABBIT_MQ_PASS
+          valueFrom:
+            secretKeyRef:
+              name: {{ include "reana.prefix" . }}-message-broker-secrets
+              key: password
       volumes:
       - name: reana-shared-volume
         {{- if not (eq .Values.shared_storage.backend "hostpath") }}

diff --git a/helm/reana/templates/reana-workflow-controller.yaml b/helm/reana/templates/reana-workflow-controller.yaml
@@ -192,7 +192,7 @@ spec:
             value: {{ .Values.dask.cluster_default_single_worker_memory | default "2Gi" }}
           - name: REANA_DASK_CLUSTER_MAX_SINGLE_WORKER_MEMORY
             value: {{ .Values.dask.cluster_max_single_worker_memory | default "8Gi" }}
-          {{- end }}        
+          {{- end }}
           {{- if .Values.reana_hostname }}
           - name: REANA_HOSTNAME
             value: {{ .Values.reana_hostname }}
@@ -238,6 +238,16 @@ spec:
               secretKeyRef:
                 name: {{ include "reana.prefix" . }}-db-secrets
                 key: password
+          - name: RABBIT_MQ_USER
+            valueFrom:
+              secretKeyRef:
+                name: {{ include "reana.prefix" . }}-message-broker-secrets
+                key: user
+          - name: RABBIT_MQ_PASS
+            valueFrom:
+              secretKeyRef:
+                name: {{ include "reana.prefix" . }}-message-broker-secrets
+                key: password
           {{- if $opensearchEnabled }}
           - name: REANA_OPENSEARCH_PASSWORD
             valueFrom:
@@ -310,6 +320,16 @@ spec:
             secretKeyRef:
               name: {{ include "reana.prefix" . }}-cern-gitlab-secrets
               key: REANA_GITLAB_HOST
+        - name: RABBIT_MQ_USER
+          valueFrom:
+            secretKeyRef:
+              name: {{ include "reana.prefix" . }}-message-broker-secrets
+              key: user
+        - name: RABBIT_MQ_PASS
+          valueFrom:
+            secretKeyRef:
+              name: {{ include "reana.prefix" . }}-message-broker-secrets
+              key: password
       volumes:
       - name: reana-shared-volume
         {{- if not (eq .Values.shared_storage.backend "hostpath") }}

diff --git a/helm/reana/templates/secrets.yaml b/helm/reana/templates/secrets.yaml
@@ -1,6 +1,29 @@
 ---
 apiVersion: v1
 kind: Secret
+metadata:
+  name: {{ include "reana.prefix" . }}-cache-secrets
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    "helm.sh/resource-policy": keep
+type: Opaque
+data:
+  password: {{ .Values.secrets.cache.password | default "" | b64enc | quote }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "reana.prefix" . }}-message-broker-secrets
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    "helm.sh/resource-policy": keep
+type: Opaque
+data:
+  user: {{ .Values.secrets.message_broker.user | default "test" | b64enc | quote }}
+  password: {{ .Values.secrets.message_broker.password | default "1234" | b64enc | quote }}
+---
+apiVersion: v1
+kind: Secret
 metadata:
   name: {{ include "reana.prefix" . }}-cern-sso-secrets
   namespace: {{ .Release.Namespace }}

diff --git a/helm/reana/values.yaml b/helm/reana/values.yaml
@@ -55,6 +55,8 @@ infrastructure_storage: {}
 
 secrets:
   database: {}
+  cache: {}
+  message_broker: {}
   gitlab: {}
   cern:
     sso: {}
@@ -90,7 +92,7 @@ components:
     image: docker.io/library/postgres:12.13
   reana_server:
     imagePullPolicy: IfNotPresent
-    image: docker.io/reanahub/reana-server:0.9.3
+    image: docker.io/reanahub/reana-server:0.9.4
     environment:
       REANA_MAX_CONCURRENT_BATCH_WORKFLOWS: 30
       REANA_SCHEDULER_REQUEUE_SLEEP: 15
@@ -109,7 +111,7 @@ components:
       log_5xx: true
   reana_workflow_controller:
     imagePullPolicy: IfNotPresent
-    image: docker.io/reanahub/reana-workflow-controller:0.9.3
+    image: docker.io/reanahub/reana-workflow-controller:0.9.4
     environment:
       SHARED_VOLUME_PATH: /var/reana
       REANA_JOB_STATUS_CONSUMER_PREFETCH_COUNT: 10
@@ -118,22 +120,22 @@ components:
       REANA_OPENSEARCH_CA_CERTS: "/code/certs/ca.crt"
       REANA_OPENSEARCH_USER: reana
   reana_workflow_engine_cwl:
-    image: docker.io/reanahub/reana-workflow-engine-cwl:0.9.3
+    image: docker.io/reanahub/reana-workflow-engine-cwl:0.9.4
     environment: {}
   reana_workflow_engine_yadage:
-    image: docker.io/reanahub/reana-workflow-engine-yadage:0.9.4
+    image: docker.io/reanahub/reana-workflow-engine-yadage:0.9.5
     environment: {}
   reana_workflow_engine_serial:
-    image: docker.io/reanahub/reana-workflow-engine-serial:0.9.3
+    image: docker.io/reanahub/reana-workflow-engine-serial:0.9.4
     environment: {}
   reana_workflow_engine_snakemake:
-    image: docker.io/reanahub/reana-workflow-engine-snakemake:0.9.3
+    image: docker.io/reanahub/reana-workflow-engine-snakemake:0.9.4
     environment: {}
   reana_workflow_validator:
     image: docker.io/reanahub/reana-workflow-validator:0.95.0
     environment: {}
   reana_job_controller:
-    image: docker.io/reanahub/reana-job-controller:0.9.3
+    image: docker.io/reanahub/reana-job-controller:0.9.4
     environment: {}
   reana_message_broker:
     imagePullPolicy: IfNotPresent

diff --git a/reana/reana_dev/git.py b/reana/reana_dev/git.py
@@ -1816,7 +1816,9 @@ def get_aggregate_changelog(previous_reana_client):  # noqa: D301
         )
 
         # also add current version, as it might not be tagged yet
-        versions_to_add.add(get_current_component_version_from_source_files(component))
+        current_version = get_current_component_version_from_source_files(component)
+        if current_version != prev_version:
+            versions_to_add.add(current_version)
 
         aggregated_changelog_lines += get_formatted_changelog_lines(
             component, versions_to_add

diff --git a/reana/version.py b/reana/version.py
@@ -13,4 +13,4 @@
 
 from __future__ import absolute_import, print_function
 
-__version__ = "0.9.3"
+__version__ = "0.9.4"
diff --git a/scripts/prefetch-images.sh b/scripts/prefetch-images.sh
@@ -7,19 +7,19 @@
 # under the terms of the MIT License; see LICENSE file for more details.
 
 for image in \
-    docker.io/jupyter/scipy-notebook:notebook-6.4.5 \
     docker.io/maildev/maildev:1.1.0 \
     docker.io/library/postgres:12.13 \
     docker.io/library/redis:5.0.5 \
-    docker.io/reanahub/reana-job-controller:0.9.3 \
+    docker.io/reanahub/reana-job-controller:0.9.4 \
     docker.io/reanahub/reana-message-broker:0.9.3 \
-    docker.io/reanahub/reana-server:0.9.3 \
+    docker.io/reanahub/reana-server:0.9.4 \
     docker.io/reanahub/reana-ui:0.9.4 \
-    docker.io/reanahub/reana-workflow-controller:0.9.3 \
-    docker.io/reanahub/reana-workflow-engine-cwl:0.9.3 \
-    docker.io/reanahub/reana-workflow-engine-serial:0.9.3 \
-    docker.io/reanahub/reana-workflow-engine-snakemake:0.9.3 \
-    docker.io/reanahub/reana-workflow-engine-yadage:0.9.4; do
+    docker.io/reanahub/reana-workflow-controller:0.9.4 \
+    docker.io/reanahub/reana-workflow-engine-cwl:0.9.4 \
+    docker.io/reanahub/reana-workflow-engine-serial:0.9.4 \
+    docker.io/reanahub/reana-workflow-engine-snakemake:0.9.4 \
+    docker.io/reanahub/reana-workflow-engine-yadage:0.9.5 \
+    quay.io/jupyter/scipy-notebook:notebook-7.2.2; do
     docker pull $image
     kind load docker-image $image
 done
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,4 +13,4 @@

		from __future__ import absolute_import, print_function

		__version__ = "0.9.3"
		__version__ = "0.9.4"