From 305ad66bf5518cdb67a2cc0b8ab819a1bd0fe63f Mon Sep 17 00:00:00 2001 From: Todd Short Date: Tue, 1 Jul 2025 17:08:01 -0400 Subject: [PATCH] Use metadata to determine namespace in args Use an env to get the metadata.namespace, and then use a variable in the arguments to get the value. Avoids putting the namespace into the manifest. Signed-off-by: Todd Short --- config/base/catalogd/manager/manager.yaml | 7 ++++++- manifests/experimental-e2e.yaml | 6 +++++- manifests/experimental.yaml | 7 ++++++- manifests/standard-e2e.yaml | 6 +++++- manifests/standard.yaml | 7 ++++++- 5 files changed, 28 insertions(+), 5 deletions(-) diff --git a/config/base/catalogd/manager/manager.yaml b/config/base/catalogd/manager/manager.yaml index 9772ed63bb..370813592d 100644 --- a/config/base/catalogd/manager/manager.yaml +++ b/config/base/catalogd/manager/manager.yaml @@ -46,7 +46,12 @@ spec: args: - --leader-elect - --metrics-bind-address=:7443 - - --external-address=catalogd-service.olmv1-system.svc + - --external-address=catalogd-service.$(POD_NAMESPACE).svc + env: + - name: POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace image: controller:latest name: manager volumeMounts: diff --git a/manifests/experimental-e2e.yaml b/manifests/experimental-e2e.yaml index 5f402d7fc7..abe72dbfb5 100644 --- a/manifests/experimental-e2e.yaml +++ b/manifests/experimental-e2e.yaml @@ -1595,7 +1595,7 @@ spec: - args: - --leader-elect - --metrics-bind-address=:7443 - - --external-address=catalogd-service.olmv1-system.svc + - --external-address=catalogd-service.$(POD_NAMESPACE).svc - --feature-gates=APIV1MetasHandler=true - --tls-cert=/var/certs/tls.crt - --tls-key=/var/certs/tls.key @@ -1605,6 +1605,10 @@ spec: env: - name: GOCOVERDIR value: /e2e-coverage + - name: POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace image: quay.io/operator-framework/catalogd:devel imagePullPolicy: IfNotPresent livenessProbe: diff --git a/manifests/experimental.yaml b/manifests/experimental.yaml index a231cc41ed..17f7f26737 100644 --- a/manifests/experimental.yaml +++ b/manifests/experimental.yaml @@ -1572,13 +1572,18 @@ spec: - args: - --leader-elect - --metrics-bind-address=:7443 - - --external-address=catalogd-service.olmv1-system.svc + - --external-address=catalogd-service.$(POD_NAMESPACE).svc - --feature-gates=APIV1MetasHandler=true - --tls-cert=/var/certs/tls.crt - --tls-key=/var/certs/tls.key - --pull-cas-dir=/var/ca-certs command: - ./catalogd + env: + - name: POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace image: quay.io/operator-framework/catalogd:devel imagePullPolicy: IfNotPresent livenessProbe: diff --git a/manifests/standard-e2e.yaml b/manifests/standard-e2e.yaml index 58c819ee5e..f400d4eee4 100644 --- a/manifests/standard-e2e.yaml +++ b/manifests/standard-e2e.yaml @@ -1588,7 +1588,7 @@ spec: - args: - --leader-elect - --metrics-bind-address=:7443 - - --external-address=catalogd-service.olmv1-system.svc + - --external-address=catalogd-service.$(POD_NAMESPACE).svc - --tls-cert=/var/certs/tls.crt - --tls-key=/var/certs/tls.key - --pull-cas-dir=/var/ca-certs @@ -1597,6 +1597,10 @@ spec: env: - name: GOCOVERDIR value: /e2e-coverage + - name: POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace image: quay.io/operator-framework/catalogd:devel imagePullPolicy: IfNotPresent livenessProbe: diff --git a/manifests/standard.yaml b/manifests/standard.yaml index 3df2fdb15f..139d7bb654 100644 --- a/manifests/standard.yaml +++ b/manifests/standard.yaml @@ -1565,12 +1565,17 @@ spec: - args: - --leader-elect - --metrics-bind-address=:7443 - - --external-address=catalogd-service.olmv1-system.svc + - --external-address=catalogd-service.$(POD_NAMESPACE).svc - --tls-cert=/var/certs/tls.crt - --tls-key=/var/certs/tls.key - --pull-cas-dir=/var/ca-certs command: - ./catalogd + env: + - name: POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace image: quay.io/operator-framework/catalogd:devel imagePullPolicy: IfNotPresent livenessProbe: