Skip to content
This repository was archived by the owner on Aug 2, 2019. It is now read-only.

Commit 47dac0c

Browse files
committed
Put the hack on the controller instead of the activator
Ideally, this would be in its own operator deployment, but right now that image isn't allowed to terminate: 'Always' is the only restart policy allowed. At least, on the controller, we avoid the more likely possibility of many olm-hacks firing as a result of many activators responding to load. They're harmless, but also useless. We need "real" operators.
1 parent cb96654 commit 47dac0c

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

knative-operators.catalogsource.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3620,10 +3620,6 @@ data:
36203620
name: config-logging
36213621
- mountPath: /etc/config-observability
36223622
name: config-observability
3623-
initContainers:
3624-
- name: olm-hack
3625-
image: lachlanevenson/k8s-kubectl
3626-
args: ['apply', '-f', 'https://raw.githubusercontent.com/openshift-cloud-functions/knative-operators/master/etc/hacks/knative-serving-0.3.0.yaml']
36273623
serviceAccountName: controller
36283624
volumes:
36293625
- configMap:
@@ -3683,6 +3679,7 @@ data:
36833679
name: config-observability
36843680
optional: true
36853681
name: config-observability
3682+
36863683
- name: controller
36873684
spec:
36883685
replicas: 1
@@ -3712,6 +3709,10 @@ data:
37123709
volumeMounts:
37133710
- mountPath: /etc/config-logging
37143711
name: config-logging
3712+
initContainers:
3713+
- name: olm-hack
3714+
image: lachlanevenson/k8s-kubectl
3715+
args: ['apply', '-f', 'https://raw.githubusercontent.com/openshift-cloud-functions/knative-operators/master/etc/hacks/knative-serving-0.3.0.yaml']
37153716
serviceAccountName: controller
37163717
volumes:
37173718
- configMap:

olm-catalog/knative-serving.v0.3.0.clusterserviceversion.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -272,10 +272,6 @@ spec:
272272
name: config-logging
273273
- mountPath: /etc/config-observability
274274
name: config-observability
275-
initContainers:
276-
- name: olm-hack
277-
image: lachlanevenson/k8s-kubectl
278-
args: ['apply', '-f', 'https://raw.githubusercontent.com/openshift-cloud-functions/knative-operators/master/etc/hacks/knative-serving-0.3.0.yaml']
279275
serviceAccountName: controller
280276
volumes:
281277
- configMap:
@@ -335,6 +331,7 @@ spec:
335331
name: config-observability
336332
optional: true
337333
name: config-observability
334+
338335
- name: controller
339336
spec:
340337
replicas: 1
@@ -364,6 +361,10 @@ spec:
364361
volumeMounts:
365362
- mountPath: /etc/config-logging
366363
name: config-logging
364+
initContainers:
365+
- name: olm-hack
366+
image: lachlanevenson/k8s-kubectl
367+
args: ['apply', '-f', 'https://raw.githubusercontent.com/openshift-cloud-functions/knative-operators/master/etc/hacks/knative-serving-0.3.0.yaml']
367368
serviceAccountName: controller
368369
volumes:
369370
- configMap:

0 commit comments

Comments
 (0)