diff --git a/charts/pca-ai-serving/templates/llminferenceservice.yaml b/charts/pca-ai-serving/templates/llminferenceservice.yaml index 95fff27..a32bd26 100644 --- a/charts/pca-ai-serving/templates/llminferenceservice.yaml +++ b/charts/pca-ai-serving/templates/llminferenceservice.yaml @@ -23,8 +23,8 @@ spec: route: {} gateway: refs: - - name: {{ .Values.gatewayName | default "llm-d-gateway" }} - namespace: {{ .Values.gatewayNamespace | default .Values.namespace }} + - name: {{ (.Values.maas).gatewayName | default "maas-default-gateway" }} + namespace: {{ (.Values.maas).gatewayNamespace | default "openshift-ingress" }} template: volumes: - name: kserve-provision-location diff --git a/charts/pca-ai-serving/templates/maas-authz-envoyfilter.yaml b/charts/pca-ai-serving/templates/maas-authz-envoyfilter.yaml index 0bb1fb3..13067b4 100644 --- a/charts/pca-ai-serving/templates/maas-authz-envoyfilter.yaml +++ b/charts/pca-ai-serving/templates/maas-authz-envoyfilter.yaml @@ -1,5 +1,6 @@ {{- $maas := .Values.maas | default dict }} -{{- if $maas.enabled | default true }} +{{- if and ($maas.enabled | default true) (not ($maas.nativeAuth | default false)) }} +{{/* Skip custom PCA auth when maas.nativeAuth=true (RHOAI 3.5 MaaS handles auth natively). */}} {{- $gwNs := $maas.gatewayNamespace | default "openshift-ingress" }} {{- $gwName := $maas.gatewayName | default "maas-default-gateway" }} {{- $public := include "pca-ai-serving.maasPublicHostname" . }} diff --git a/charts/pca-ai-serving/templates/maas-crs.yaml b/charts/pca-ai-serving/templates/maas-crs.yaml index 9fcef2e..1ae7b2a 100644 --- a/charts/pca-ai-serving/templates/maas-crs.yaml +++ b/charts/pca-ai-serving/templates/maas-crs.yaml @@ -12,9 +12,9 @@ spec: modelRef: kind: LLMInferenceService name: {{ include "pca-ai-serving.model.name" . }} - {{- if $maas.hostname }} + {{- if and (not ($maas.nativeAuth | default false)) $maas.hostname }} endpointOverride: https://{{ $maas.hostname }}/v1 - {{- else }} + {{- else if not ($maas.nativeAuth | default false) }} endpointOverride: https://{{ include "pca-ai-serving.maasGatewayService" . }}/v1 {{- end }} --- @@ -38,7 +38,7 @@ spec: window: "1h" - limit: {{ ($maas.tokenLimit).daily | default 50000000 }} window: "24h" - priority: 10 + priority: {{ $maas.subscriptionPriority | default 10 }} --- apiVersion: maas.opendatahub.io/v1alpha1 kind: MaaSAuthPolicy diff --git a/charts/pca-ai-serving/templates/maas-httproute.yaml b/charts/pca-ai-serving/templates/maas-httproute.yaml index b02cba3..5548620 100644 --- a/charts/pca-ai-serving/templates/maas-httproute.yaml +++ b/charts/pca-ai-serving/templates/maas-httproute.yaml @@ -1,5 +1,6 @@ {{- $maas := .Values.maas | default dict }} -{{- if $maas.enabled | default true }} +{{- if and ($maas.enabled | default true) (not ($maas.nativeAuth | default false)) }} +{{/* Skip custom PCA HTTPRoute when maas.nativeAuth=true — RHOAI creates routes on maas-default-gateway. */}} {{- $llmdSvc := include "pca-ai-serving.llmdGatewayService" . }} {{/* MaaS Envoy talks HTTP to backends. Use llm-d :80 (HTTP listener), not :443. */}} {{- $llmdPort := 80 }} diff --git a/charts/pca-ai-serving/templates/maas-models-envoyfilter.yaml b/charts/pca-ai-serving/templates/maas-models-envoyfilter.yaml index d25dd99..2bd4a78 100644 --- a/charts/pca-ai-serving/templates/maas-models-envoyfilter.yaml +++ b/charts/pca-ai-serving/templates/maas-models-envoyfilter.yaml @@ -1,5 +1,6 @@ {{- $maas := .Values.maas | default dict }} -{{- if $maas.enabled | default true }} +{{- if and ($maas.enabled | default true) (not ($maas.nativeAuth | default false)) }} +{{/* Skip custom PCA EnvoyFilter when maas.nativeAuth=true. */}} {{- $gwNs := $maas.gatewayNamespace | default "openshift-ingress" }} {{- $gwName := $maas.gatewayName | default "maas-default-gateway" }} {{- $public := include "pca-ai-serving.maasPublicHostname" . }}