Skip to content

Commit 305ad66

Browse files
committed
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 <[email protected]>
1 parent 5665a32 commit 305ad66

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
@@ -1595,7 +1595,7 @@ spec:
15951595
- args:
15961596
- --leader-elect
15971597
- --metrics-bind-address=:7443
1598-
- --external-address=catalogd-service.olmv1-system.svc
1598+
- --external-address=catalogd-service.$(POD_NAMESPACE).svc
15991599
- --feature-gates=APIV1MetasHandler=true
16001600
- --tls-cert=/var/certs/tls.crt
16011601
- --tls-key=/var/certs/tls.key
@@ -1605,6 +1605,10 @@ spec:
16051605
env:
16061606
- name: GOCOVERDIR
16071607
value: /e2e-coverage
1608+
- name: POD_NAMESPACE
1609+
valueFrom:
1610+
fieldRef:
1611+
fieldPath: metadata.namespace
16081612
image: quay.io/operator-framework/catalogd:devel
16091613
imagePullPolicy: IfNotPresent
16101614
livenessProbe:

manifests/experimental.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1572,13 +1572,18 @@ spec:
15721572
- args:
15731573
- --leader-elect
15741574
- --metrics-bind-address=:7443
1575-
- --external-address=catalogd-service.olmv1-system.svc
1575+
- --external-address=catalogd-service.$(POD_NAMESPACE).svc
15761576
- --feature-gates=APIV1MetasHandler=true
15771577
- --tls-cert=/var/certs/tls.crt
15781578
- --tls-key=/var/certs/tls.key
15791579
- --pull-cas-dir=/var/ca-certs
15801580
command:
15811581
- ./catalogd
1582+
env:
1583+
- name: POD_NAMESPACE
1584+
valueFrom:
1585+
fieldRef:
1586+
fieldPath: metadata.namespace
15821587
image: quay.io/operator-framework/catalogd:devel
15831588
imagePullPolicy: IfNotPresent
15841589
livenessProbe:

manifests/standard-e2e.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1588,7 +1588,7 @@ spec:
15881588
- args:
15891589
- --leader-elect
15901590
- --metrics-bind-address=:7443
1591-
- --external-address=catalogd-service.olmv1-system.svc
1591+
- --external-address=catalogd-service.$(POD_NAMESPACE).svc
15921592
- --tls-cert=/var/certs/tls.crt
15931593
- --tls-key=/var/certs/tls.key
15941594
- --pull-cas-dir=/var/ca-certs
@@ -1597,6 +1597,10 @@ spec:
15971597
env:
15981598
- name: GOCOVERDIR
15991599
value: /e2e-coverage
1600+
- name: POD_NAMESPACE
1601+
valueFrom:
1602+
fieldRef:
1603+
fieldPath: metadata.namespace
16001604
image: quay.io/operator-framework/catalogd:devel
16011605
imagePullPolicy: IfNotPresent
16021606
livenessProbe:

manifests/standard.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1565,12 +1565,17 @@ spec:
15651565
- args:
15661566
- --leader-elect
15671567
- --metrics-bind-address=:7443
1568-
- --external-address=catalogd-service.olmv1-system.svc
1568+
- --external-address=catalogd-service.$(POD_NAMESPACE).svc
15691569
- --tls-cert=/var/certs/tls.crt
15701570
- --tls-key=/var/certs/tls.key
15711571
- --pull-cas-dir=/var/ca-certs
15721572
command:
15731573
- ./catalogd
1574+
env:
1575+
- name: POD_NAMESPACE
1576+
valueFrom:
1577+
fieldRef:
1578+
fieldPath: metadata.namespace
15741579
image: quay.io/operator-framework/catalogd:devel
15751580
imagePullPolicy: IfNotPresent
15761581
livenessProbe:

0 commit comments

Comments
 (0)