Commit 5afa0f59 authored by George Papathanail's avatar George Papathanail
Browse files

fix: remove keycloak container from federation-pod, 

update values to point the correct keycloak
disable artefact-manager in federation manager values
parent 70b6ed19

environments/kind/values.yaml

+3 −0
Original line number Diff line number Diff line
@@ -63,6 +63,9 @@ federationManager: 
      nodePort: 30989

    image:

      pullPolicy: IfNotPresent

    env:

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

      tokenEndpoint: "http://keycloak.oop.svc.cluster.local:8080/realms/federation/protocol/openid-connect/token"



  mongodb:

    persistence:

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

+3 −30
Original line number Diff line number Diff line
@@ -56,32 +56,10 @@ spec: 


      containers:



        #####################################################################

        # 1) KEYCLOAK CONTAINER  (runs INSIDE the federation-manager pod)

        #####################################################################

        - name: keycloak

          image: "{{ .Values.keycloak.image.repository }}:{{ .Values.keycloak.image.tag }}"

          imagePullPolicy: {{ .Values.keycloak.image.pullPolicy }}

          args:

            - start-dev

            - --import-realm

          env:

            - name: KC_BOOTSTRAP_ADMIN_USERNAME

              value: {{ .Values.keycloak.admin.username | quote }}

            - name: KC_BOOTSTRAP_ADMIN_PASSWORD

              value: {{ .Values.keycloak.admin.password | quote }}

            - name: KC_IMPORT

              value: /opt/keycloak/data/import/realm-import.json

          ports:

            - name: keycloak-http

              containerPort: 8080

              protocol: TCP

          volumeMounts:

            - name: realm-import

              mountPath: /opt/keycloak/data/import/





        #####################################################################

        # 2) FEDERATION MANAGER MAIN CONTAINER

        # 1) FEDERATION MANAGER MAIN CONTAINER

        #####################################################################

        - name: federation-manager

          image: "{{ .Values.federationManager.image.repository }}:{{ .Values.federationManager.image.tag }}"
@@ -98,7 +76,7 @@ spec: 
            {{- toYaml .Values.federationManager.resources | nindent 12 }}



        #####################################################################

        # 3) OPENVPN SIDECAR CONTAINER

        # 2) OPENVPN SIDECAR CONTAINER

        #####################################################################

        {{- if .Values.openvpn.enabled }}

        - name: openvpn
@@ -161,11 +139,6 @@ spec: 
            secretName: federation-manager-secrets

            defaultMode: 420



        # Keycloak realm import ConfigMap

        - name: realm-import

          configMap:

            name: keycloak-config



        {{- if .Values.openvpn.enabled }}

        - name: ovpn

          secret:

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

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ federationManager: 
    artefactManager:

      host: "artefact-manager-service.oop.svc.cluster.local"

      port: "8000"

      enabled: "true"

      enabled: "false"

      dst_registry: ""

      dst_username: ""

      dst_password: ""

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

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ oegcontroller: 
    srmHost: "http://srm:8080/srm/1.0.0"

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

    partnerApiRoot: "http://10.8.0.1:31002"

    tokenEndpoint: "http://federation-manager.oop.svc.cluster.local:8080/realms/federation/protocol/openid-connect/token"

    tokenEndpoint: "http://keycloak.oop.svc.cluster.local:8080/realms/federation/protocol/openid-connect/token"

    availZoneNotifLink: ""



# Ingress configuration