From 3ba1dc6b7dc50715a5fdfd50341061feccbf032b Mon Sep 17 00:00:00 2001 From: Pablo Acevedo Montserrat Date: Wed, 27 Aug 2025 12:23:13 +0200 Subject: [PATCH 1/2] OCPBUGS-60833: Fix router access logs container name --- assets/components/openshift-router/deployment.yaml | 2 +- .../011-ingress-deployment-access-logging.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/components/openshift-router/deployment.yaml b/assets/components/openshift-router/deployment.yaml index 4a7520c32e..af1f48f67f 100644 --- a/assets/components/openshift-router/deployment.yaml +++ b/assets/components/openshift-router/deployment.yaml @@ -219,7 +219,7 @@ spec: args: - -v=4 {{- if and .AccessLoggingEnabled (not .AccessLoggingSyslogAddress) }} - - name: access-logs + - name: logs imagePullPolicy: IfNotPresent terminationMessagePolicy: FallbackToLogsOnError image: '{{ .ReleaseImage.haproxy_router }}' diff --git a/scripts/auto-rebase/manifests_patches/011-ingress-deployment-access-logging.patch b/scripts/auto-rebase/manifests_patches/011-ingress-deployment-access-logging.patch index 8bb6df79c5..b9517e5751 100644 --- a/scripts/auto-rebase/manifests_patches/011-ingress-deployment-access-logging.patch +++ b/scripts/auto-rebase/manifests_patches/011-ingress-deployment-access-logging.patch @@ -78,7 +78,7 @@ index 916e4b601..9261e3700 100644 args: - -v=4 + {{- if and .AccessLoggingEnabled (not .AccessLoggingSyslogAddress) }} -+ - name: access-logs ++ - name: logs + imagePullPolicy: IfNotPresent + terminationMessagePolicy: FallbackToLogsOnError + image: '{{ .ReleaseImage.haproxy_router }}' From 26fb6121e7f75045638ce3a350770f0bb6b8c9d2 Mon Sep 17 00:00:00 2001 From: Pablo Acevedo Montserrat Date: Wed, 27 Aug 2025 17:26:29 +0200 Subject: [PATCH 2/2] OCPBUGS-60833: Fix router test container name --- test/suites/router/router.robot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/suites/router/router.robot b/test/suites/router/router.robot index 6e62151f20..2d7553517d 100644 --- a/test/suites/router/router.robot +++ b/test/suites/router/router.robot @@ -431,5 +431,5 @@ Delete Custom CA Secret Check Access Logs [Documentation] Retrieve and check if a pattern appears in the router's access logs. [Arguments] ${pattern} - ${logs}= Oc Logs deployment/router-default -c access-logs openshift-ingress + ${logs}= Oc Logs deployment/router-default -c logs openshift-ingress Should Contain ${logs} ${pattern}