From 5afa0f597aaee707f64aec788dbdbad7421c1dbe Mon Sep 17 00:00:00 2001 From: papathanail Date: Mon, 11 May 2026 14:36:36 +0300 Subject: [PATCH 1/2] fix: remove keycloak container from federation-pod, update values to point the correct keycloak disable artefact-manager in federation manager values --- environments/kind/values.yaml | 3 ++ .../federation-manager-deployment.yaml | 33 ++----------------- .../charts/federation-manager/values.yaml | 2 +- oop-platform-chart/charts/oeg/values.yaml | 2 +- 4 files changed, 8 insertions(+), 32 deletions(-) diff --git a/environments/kind/values.yaml b/environments/kind/values.yaml index 0417047..45c7e75 100644 --- a/environments/kind/values.yaml +++ b/environments/kind/values.yaml @@ -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: 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..3afe450 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 @@ -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: diff --git a/oop-platform-chart/charts/federation-manager/values.yaml b/oop-platform-chart/charts/federation-manager/values.yaml index d367c72..4768b0e 100644 --- a/oop-platform-chart/charts/federation-manager/values.yaml +++ b/oop-platform-chart/charts/federation-manager/values.yaml @@ -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: "" diff --git a/oop-platform-chart/charts/oeg/values.yaml b/oop-platform-chart/charts/oeg/values.yaml index bea2440..7e1d5ea 100644 --- a/oop-platform-chart/charts/oeg/values.yaml +++ b/oop-platform-chart/charts/oeg/values.yaml @@ -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 -- GitLab From 0713993e754629011596cb2b51a2938500a9f1db Mon Sep 17 00:00:00 2001 From: papathanail Date: Wed, 20 May 2026 15:51:31 +0300 Subject: [PATCH 2/2] fix: remove comments from federation-manager-deployment --- .../templates/federation-manager-deployment.yaml | 10 ---------- 1 file changed, 10 deletions(-) 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 3afe450..7e33ed5 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 @@ -57,10 +57,6 @@ spec: containers: - - ##################################################################### - # 1) FEDERATION MANAGER MAIN CONTAINER - ##################################################################### - name: federation-manager image: "{{ .Values.federationManager.image.repository }}:{{ .Values.federationManager.image.tag }}" imagePullPolicy: {{ .Values.federationManager.image.pullPolicy }} @@ -75,9 +71,6 @@ spec: resources: {{- toYaml .Values.federationManager.resources | nindent 12 }} - ##################################################################### - # 2) OPENVPN SIDECAR CONTAINER - ##################################################################### {{- if .Values.openvpn.enabled }} - name: openvpn image: "{{ .Values.openvpn.image.repository }}:{{ .Values.openvpn.image.tag }}" @@ -122,9 +115,6 @@ spec: - NET_ADMIN {{- end }} - ####################################################################### - # VOLUME DEFINITIONS - ####################################################################### volumes: - name: config emptyDir: {} -- GitLab