diff --git a/environments/kind/values.yaml b/environments/kind/values.yaml index 0417047003b921a6de01451ab83bf272c7adf73e..f415ed39ed6c513f182a83d45a5960bd59a021b0 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/templates/federation-manager-configmap.yaml b/oop-platform-chart/charts/federation-manager/templates/federation-manager-configmap.yaml index f0e2e54d5e069c69437bd2da7ca22dc959564ca0..eed42c1e2456e413bfb017f230348579065554ed 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 8eaa7113dddf75e4a6fdc4472f5026010647dc5a..5c534badd54d909302814f192258fcaa365d4342 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 d367c72f9cde25b3bb4efc90f186a9fda76fe02a..a473435b082fa3469569518eafa5cc0ebbee72cb 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 @@ -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" diff --git a/oop-platform-chart/charts/oeg/values.yaml b/oop-platform-chart/charts/oeg/values.yaml index bea2440377d3d07275847c1f63e5f7c4fe1d9edf..2109a2d956695b08caef69de41fc4e461537afca 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 e4e8473c049ec8c39ce4c6d176faccf4d10fa2e4..9471a42c85b9ad850eaf876a48a44c0e194fa239 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 c529918cdb2728c1f26ed87ccc33086f9af7b630..bbf6f28edf4e755f3303c775153ca6caee18e5ba 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