Skip to content

Commit 14b3eda

Browse files
authored
Use metadata to determine namespace in args (#2072)
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 <tshort@redhat.com>
1 parent ee0d232 commit 14b3eda

File tree

5 files changed

+28
-5
lines changed

5 files changed

+28
-5
lines changed

config/base/catalogd/manager/manager.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,12 @@ spec:
4646
args:
4747
- --leader-elect
4848
- --metrics-bind-address=:7443
49-
- --external-address=catalogd-service.olmv1-system.svc
49+
- --external-address=catalogd-service.$(POD_NAMESPACE).svc
50+
env:
51+
- name: POD_NAMESPACE
52+
valueFrom:
53+
fieldRef:
54+
fieldPath: metadata.namespace
5055
image: controller:latest
5156
name: manager
5257
volumeMounts:

manifests/experimental-e2e.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1653,7 +1653,7 @@ spec:
16531653
- args:
16541654
- --leader-elect
16551655
- --metrics-bind-address=:7443
1656-
- --external-address=catalogd-service.olmv1-system.svc
1656+
- --external-address=catalogd-service.$(POD_NAMESPACE).svc
16571657
- --feature-gates=APIV1MetasHandler=true
16581658
- --tls-cert=/var/certs/tls.crt
16591659
- --tls-key=/var/certs/tls.key
@@ -1663,6 +1663,10 @@ spec:
16631663
env:
16641664
- name: GOCOVERDIR
16651665
value: /e2e-coverage
1666+
- name: POD_NAMESPACE
1667+
valueFrom:
1668+
fieldRef:
1669+
fieldPath: metadata.namespace
16661670
image: quay.io/operator-framework/catalogd:devel
16671671
imagePullPolicy: IfNotPresent
16681672
livenessProbe:

manifests/experimental.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1626,13 +1626,18 @@ spec:
16261626
- args:
16271627
- --leader-elect
16281628
- --metrics-bind-address=:7443
1629-
- --external-address=catalogd-service.olmv1-system.svc
1629+
- --external-address=catalogd-service.$(POD_NAMESPACE).svc
16301630
- --feature-gates=APIV1MetasHandler=true
16311631
- --tls-cert=/var/certs/tls.crt
16321632
- --tls-key=/var/certs/tls.key
16331633
- --pull-cas-dir=/var/ca-certs
16341634
command:
16351635
- ./catalogd
1636+
env:
1637+
- name: POD_NAMESPACE
1638+
valueFrom:
1639+
fieldRef:
1640+
fieldPath: metadata.namespace
16361641
image: quay.io/operator-framework/catalogd:devel
16371642
imagePullPolicy: IfNotPresent
16381643
livenessProbe:

manifests/standard-e2e.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1646,7 +1646,7 @@ spec:
16461646
- args:
16471647
- --leader-elect
16481648
- --metrics-bind-address=:7443
1649-
- --external-address=catalogd-service.olmv1-system.svc
1649+
- --external-address=catalogd-service.$(POD_NAMESPACE).svc
16501650
- --tls-cert=/var/certs/tls.crt
16511651
- --tls-key=/var/certs/tls.key
16521652
- --pull-cas-dir=/var/ca-certs
@@ -1655,6 +1655,10 @@ spec:
16551655
env:
16561656
- name: GOCOVERDIR
16571657
value: /e2e-coverage
1658+
- name: POD_NAMESPACE
1659+
valueFrom:
1660+
fieldRef:
1661+
fieldPath: metadata.namespace
16581662
image: quay.io/operator-framework/catalogd:devel
16591663
imagePullPolicy: IfNotPresent
16601664
livenessProbe:

manifests/standard.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1619,12 +1619,17 @@ spec:
16191619
- args:
16201620
- --leader-elect
16211621
- --metrics-bind-address=:7443
1622-
- --external-address=catalogd-service.olmv1-system.svc
1622+
- --external-address=catalogd-service.$(POD_NAMESPACE).svc
16231623
- --tls-cert=/var/certs/tls.crt
16241624
- --tls-key=/var/certs/tls.key
16251625
- --pull-cas-dir=/var/ca-certs
16261626
command:
16271627
- ./catalogd
1628+
env:
1629+
- name: POD_NAMESPACE
1630+
valueFrom:
1631+
fieldRef:
1632+
fieldPath: metadata.namespace
16281633
image: quay.io/operator-framework/catalogd:devel
16291634
imagePullPolicy: IfNotPresent
16301635
livenessProbe:

0 commit comments

Comments
 (0)