From 2b06e4c0f421c9b508a810e3f9d4e8293b5bda44 Mon Sep 17 00:00:00 2001 From: Sergio Gimenez Date: Thu, 7 May 2026 07:34:09 +0200 Subject: [PATCH 1/2] Fix FM helm missing srm paramenters and config --- .../templates/federation-manager-configmap.yaml | 5 +++++ .../templates/federation-manager-deployment.yaml | 3 +++ oop-platform-chart/charts/federation-manager/values.yaml | 5 +++++ 3 files changed, 13 insertions(+) diff --git a/oop-platform-chart/charts/federation-manager/templates/federation-manager-configmap.yaml b/oop-platform-chart/charts/federation-manager/templates/federation-manager-configmap.yaml index f0e2e54..eed42c1 100644 --- a/oop-platform-chart/charts/federation-manager/templates/federation-manager-configmap.yaml +++ b/oop-platform-chart/charts/federation-manager/templates/federation-manager-configmap.yaml @@ -43,6 +43,11 @@ data: client_name = {{ .Values.federationManager.config.edgeCloudPlatform.client_name }} flavour_id = {{ .Values.federationManager.config.edgeCloudPlatform.flavour_id }} + [service_resource_manager] + host = {{ .Values.federationManager.config.serviceResourceManager.host }} + port = {{ .Values.federationManager.config.serviceResourceManager.port }} + server = {{ .Values.federationManager.config.serviceResourceManager.server }} + [artefact_manager] host = {{ .Values.federationManager.config.artefactManager.host }} port = {{ .Values.federationManager.config.artefactManager.port }} diff --git a/oop-platform-chart/charts/federation-manager/templates/federation-manager-deployment.yaml b/oop-platform-chart/charts/federation-manager/templates/federation-manager-deployment.yaml index 8eaa711..5c534ba 100644 --- a/oop-platform-chart/charts/federation-manager/templates/federation-manager-deployment.yaml +++ b/oop-platform-chart/charts/federation-manager/templates/federation-manager-deployment.yaml @@ -86,6 +86,9 @@ spec: - name: federation-manager image: "{{ .Values.federationManager.image.repository }}:{{ .Values.federationManager.image.tag }}" imagePullPolicy: {{ .Values.federationManager.image.pullPolicy }} + env: + - name: FM_CONFIG_FILE + value: /usr/app/src/conf/config.cfg ports: - name: http containerPort: {{ .Values.federationManager.service.targetPort }} diff --git a/oop-platform-chart/charts/federation-manager/values.yaml b/oop-platform-chart/charts/federation-manager/values.yaml index d367c72..2314845 100644 --- a/oop-platform-chart/charts/federation-manager/values.yaml +++ b/oop-platform-chart/charts/federation-manager/values.yaml @@ -145,6 +145,11 @@ federationManager: client_name: "lite2edge" flavour_id: "default" + serviceResourceManager: + host: "srm" + port: "8080" + server: "/srm/1.0.0" + artefactManager: host: "artefact-manager-service.oop.svc.cluster.local" port: "8000" -- GitLab From bfb0ba0c5386323cd80f6cf191fe8941e9dee68b Mon Sep 17 00:00:00 2001 From: Sergio Gimenez Date: Thu, 7 May 2026 07:40:45 +0200 Subject: [PATCH 2/2] fix(images): point Helm defaults to 1.1 --- environments/kind/values.yaml | 6 ++++++ oop-platform-chart/charts/federation-manager/values.yaml | 4 ++-- oop-platform-chart/charts/oeg/values.yaml | 4 ++-- oop-platform-chart/charts/srm/values.yaml | 4 ++-- oop-platform-chart/values.yaml | 8 ++++---- 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/environments/kind/values.yaml b/environments/kind/values.yaml index 0417047..f415ed3 100644 --- a/environments/kind/values.yaml +++ b/environments/kind/values.yaml @@ -22,6 +22,8 @@ srm: type: NodePort nodePort: 32415 image: + repository: labs.etsi.org:5050/oop/code/service-resource-manager + tag: "1.1" pullPolicy: IfNotPresent env: networkAdapterName: "oai" @@ -49,6 +51,8 @@ oeg: type: NodePort nodePort: 32263 image: + repository: labs.etsi.org:5050/oop/code/open-exposure-gateway + tag: "1.1" pullPolicy: IfNotPresent federationManager: @@ -62,6 +66,8 @@ federationManager: type: NodePort nodePort: 30989 image: + repository: labs.etsi.org:5050/oop/code/federation-manager + tag: "1.1" pullPolicy: IfNotPresent mongodb: diff --git a/oop-platform-chart/charts/federation-manager/values.yaml b/oop-platform-chart/charts/federation-manager/values.yaml index 2314845..a473435 100644 --- a/oop-platform-chart/charts/federation-manager/values.yaml +++ b/oop-platform-chart/charts/federation-manager/values.yaml @@ -102,8 +102,8 @@ federationManager: image: repository: labs.etsi.org:5050/oop/code/federation-manager - tag: "1.0.0" - pullPolicy: IfNotPresent + tag: "1.1" + pullPolicy: Always service: name: federation-manager diff --git a/oop-platform-chart/charts/oeg/values.yaml b/oop-platform-chart/charts/oeg/values.yaml index bea2440..2109a2d 100644 --- a/oop-platform-chart/charts/oeg/values.yaml +++ b/oop-platform-chart/charts/oeg/values.yaml @@ -38,8 +38,8 @@ oegcontroller: image: repository: labs.etsi.org:5050/oop/code/open-exposure-gateway - tag: 1.0.0 - pullPolicy: IfNotPresent + tag: "1.1" + pullPolicy: Always service: name: oeg diff --git a/oop-platform-chart/charts/srm/values.yaml b/oop-platform-chart/charts/srm/values.yaml index e4e8473..9471a42 100644 --- a/oop-platform-chart/charts/srm/values.yaml +++ b/oop-platform-chart/charts/srm/values.yaml @@ -37,8 +37,8 @@ srmcontroller: image: repository: labs.etsi.org:5050/oop/code/service-resource-manager - tag: 1.0.0 - pullPolicy: IfNotPresent + tag: "1.1" + pullPolicy: Always service: name: srm diff --git a/oop-platform-chart/values.yaml b/oop-platform-chart/values.yaml index c529918..bbf6f28 100644 --- a/oop-platform-chart/values.yaml +++ b/oop-platform-chart/values.yaml @@ -43,8 +43,8 @@ srm: replicaCount: 1 image: repository: labs.etsi.org:5050/oop/code/service-resource-manager - tag: 1.0.0 - pullPolicy: IfNotPresent + tag: "1.1" + pullPolicy: Always service: name: srm type: ClusterIP @@ -119,8 +119,8 @@ oeg: replicaCount: 1 image: repository: labs.etsi.org:5050/oop/code/open-exposure-gateway - tag: 1.0.0 - pullPolicy: IfNotPresent + tag: "1.1" + pullPolicy: Always service: name: oeg type: ClusterIP -- GitLab