Skip to content

[1.12] Porting eventing 4640 to Serverless Operator #746

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 2 commits into from
Dec 10, 2020
Merged

[1.12] Porting eventing 4640 to Serverless Operator #746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35bcf78
Adding patch for 4640
matzew Dec 9, 2020
2e01d34
running 'make generated-files'
matzew Dec 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions ...ift-knative-operator/cmd/operator/kodata/knative-eventing/0.18.6/3-in-memory-channel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,6 +565,14 @@ spec:
metadata:
labels: *labels
spec:
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- podAffinityTerm:
labelSelector:
matchLabels: *labels
topologyKey: kubernetes.io/hostname
weight: 100
serviceAccountName: imc-dispatcher
containers:
- name: dispatcher
Expand Down
19 changes: 19 additions & 0 deletions openshift-knative-operator/hack/005-imc-pod_anti_affinity.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
diff --git a/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.18.6/3-in-memory-channel.yaml b/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.18.6/3-in-memory-channel.yaml
index 4a976467..c7f7cfef 100644
--- a/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.18.6/3-in-memory-channel.yaml
+++ b/openshift-knative-operator/cmd/operator/kodata/knative-eventing/0.18.6/3-in-memory-channel.yaml
@@ -565,6 +565,14 @@ spec:
metadata:
labels: *labels
spec:
+ affinity:
+ podAntiAffinity:
+ preferredDuringSchedulingIgnoredDuringExecution:
+ - podAffinityTerm:
+ labelSelector:
+ matchLabels: *labels
+ topologyKey: kubernetes.io/hostname
+ weight: 100
serviceAccountName: imc-dispatcher
containers:
- name: dispatcher
3 changes: 3 additions & 0 deletions openshift-knative-operator/hack/update-manifests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,6 @@ git apply "$root/openshift-knative-operator/hack/002-openshift-eventing-role.pat

# SRVKE-654: relax the MT adapter replica
git apply "$root/openshift-knative-operator/hack/004-eventing-pingsource-one-replica.patch"

# Apply port of 4640 to Serverless Operator
git apply "$root/openshift-knative-operator/hack/005-imc-pod_anti_affinity.patch"