Commit d4d8319f authored by Paris Stentoumis's avatar Paris Stentoumis Committed by George Papathanail
Browse files

feat: added env at srm for when fm is disabled

parent a0ead352

environments/kind/values.yaml

+4 −0
Changes for environments/kind/values.yaml: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -81,6 +81,10 @@ postgresql: 


global:

  publicHost: localhost

  # No login for local kind: Keycloak and Federation Manager are not deployed;

  # OEG accepts requests without a bearer token.

  auth:

    enabled: false



keycloak:

  realms:

oop-platform-chart/charts/srm/templates/_helpers.tpl

+18 −0
Changes for oop-platform-chart/charts/srm/templates/_helpers.tpl: 18 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -63,3 +63,21 @@ Return the proper namespace 
{{- define "srm.db.waitImage" -}}

{{- dig "images" "postgres" "postgres:18.6-alpine" (.Values.global | default dict) -}}

{{- end }}



{{/*

Whether SRM should call Federation Manager over HTTP.



Mirrors the FM chart gate: when global.auth.enabled is false, FM is not

deployed, so SRM must fail-open without probing it. Override with

srmcontroller.federationManager.enabled when the FM subchart is disabled

via federation-manager.enabled while auth stays on.

Returns "true" or empty (falsy in `if`).

*/}}

{{- define "srm.federationManager.enabled" -}}

{{- $fm := .Values.srmcontroller.federationManager | default dict -}}

{{- if hasKey $fm "enabled" -}}

{{- if $fm.enabled }}true{{ end -}}

{{- else if dig "auth" "enabled" true (.Values.global | default dict) -}}

true

{{- end -}}

{{- end }}

oop-platform-chart/charts/srm/templates/srmcontroller-deployment.yaml

+2 −0
Changes for oop-platform-chart/charts/srm/templates/srmcontroller-deployment.yaml: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -92,6 +92,8 @@ spec: 
              value: {{ $c.federationManager.url | quote }}

            - name: FEDERATION_MANAGER_SETTINGS__TIMEOUT

              value: {{ $c.federationManager.timeout | toString | quote }}

            - name: FEDERATION_MANAGER_SETTINGS__ENABLED

              value: {{ include "srm.federationManager.enabled" . | default "false" | quote }}

            {{- with $c.zoneProviderName }}

            - name: ZONE_PROVIDER_NAME

              value: {{ . | quote }}

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

+3 −0
Changes for oop-platform-chart/charts/srm/values.yaml: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -41,6 +41,9 @@ srmcontroller: 
  federationManager:

    url: "http://federation-manager-internal:8083"

    timeout: 5

    # Omit to follow global.auth.enabled (FM is not deployed when auth is off).

    # Set false when federation-manager.enabled is false but auth stays on.

    # enabled: true



  zoneProviderName: ""

oop-platform-chart/values.yaml

+3 −0
Changes for oop-platform-chart/values.yaml: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -177,6 +177,9 @@ srm: 
    federationManager:

      url: "http://federation-manager-internal:8083"

      timeout: 5

      # Omit to follow global.auth.enabled. Set false if federation-manager.enabled

      # is false while auth remains enabled.

      # enabled: true

    zoneProviderName: ""

    controlPaths: []

    topology: ""