Commit ce546ff2 authored by George Papathanail's avatar George Papathanail
Browse files

Merge branch 'fix/helm-kind-1-1' into 'develop' 

Fix/helm kind 1 1

See merge request !6
parents 57e957ad bfb0ba0c

environments/kind/values.yaml

+6 −0
Original line number Diff line number Diff line
@@ -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

    env:

      federationManagerHost: "http://federation-manager.oop.svc.cluster.local:8989/operatorplatform/federation/v1"

oop-platform-chart/charts/federation-manager/templates/federation-manager-configmap.yaml

+5 −0
Original line number Diff line number Diff line
@@ -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 }}

oop-platform-chart/charts/federation-manager/templates/federation-manager-deployment.yaml

+3 −0
Original line number Diff line number Diff line
@@ -60,6 +60,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 }}

oop-platform-chart/charts/federation-manager/values.yaml

+7 −2
Original line number Diff line number Diff line
@@ -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"

oop-platform-chart/charts/oeg/values.yaml

+2 −2
Original line number Diff line number Diff line
@@ -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