Skip to content

Commit

Permalink
Merge pull request #272 from Ajpantuso/apantuso/ensure_webhooks_on_se…
Browse files Browse the repository at this point in the history
…parate_nodes

fix: ensure webhook can deploy on separate nodes for 2 infra node clusters
  • Loading branch information
openshift-merge-robot authored Nov 16, 2022
2 parents aba8eda + 6b381dc commit d3ef905
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 32 deletions.
18 changes: 8 additions & 10 deletions config/deploy/webhook/deployment.yaml.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,14 @@ spec:
- key: node-role.kubernetes.io/infra
operator: Exists
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app.kubernetes.io/name
operator: In
values:
- addon-operator-webhook-server
topologyKey: "kubernetes.io/hostname"
requiredDuringSchedulingIgnoredDuringExecution:
- labelSelector:
matchExpressions:
- key: app.kubernetes.io/name
operator: In
values:
- addon-operator-webhook-server
topologyKey: "kubernetes.io/hostname"
tolerations:
- effect: NoSchedule
key: node-role.kubernetes.io/infra
Expand Down
20 changes: 9 additions & 11 deletions config/olm/addon-operator.csv.tpl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ spec:
secretName: metrics-server-cert
- name: addon-operator-webhooks
spec:
replicas: 3
replicas: 2
selector:
matchLabels:
app.kubernetes.io/name: addon-operator-webhook-server
Expand All @@ -248,16 +248,14 @@ spec:
- key: node-role.kubernetes.io/infra
operator: Exists
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- podAffinityTerm:
labelSelector:
matchExpressions:
- key: app.kubernetes.io/name
operator: In
values:
- addon-operator-webhook-server
topologyKey: kubernetes.io/hostname
weight: 100
requiredDuringSchedulingIgnoredDuringExecution:
- labelSelector:
matchExpressions:
- key: app.kubernetes.io/name
operator: In
values:
- addon-operator-webhook-server
topologyKey: "kubernetes.io/hostname"
containers:
- image: quay.io/openshift/addon-operator-webhook:latest
livenessProbe:
Expand Down
20 changes: 9 additions & 11 deletions config/openshift/manifests/addon-operator.csv.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ spec:
secretName: metrics-server-cert
- name: addon-operator-webhooks
spec:
replicas: 3
replicas: 2
selector:
matchLabels:
app.kubernetes.io/name: addon-operator-webhook-server
Expand All @@ -248,16 +248,14 @@ spec:
- key: node-role.kubernetes.io/infra
operator: Exists
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- podAffinityTerm:
labelSelector:
matchExpressions:
- key: app.kubernetes.io/name
operator: In
values:
- addon-operator-webhook-server
topologyKey: kubernetes.io/hostname
weight: 100
requiredDuringSchedulingIgnoredDuringExecution:
- labelSelector:
matchExpressions:
- key: app.kubernetes.io/name
operator: In
values:
- addon-operator-webhook-server
topologyKey: kubernetes.io/hostname
containers:
- image: quay.io/openshift/addon-operator-webhook:latest
livenessProbe:
Expand Down

0 comments on commit d3ef905

Please sign in to comment.