Skip to content
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.

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

removing experimental annotation on multus ds config. #226

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions bindata/network/multus/multus.yaml
Expand Up @@ -20,8 +20,6 @@ spec:
component: network
type: infra
openshift.io/component: network
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
spec:
hostNetwork: true
nodeSelector:
Expand Down
3 changes: 1 addition & 2 deletions bindata/network/ovn-kubernetes/ovnkube-master.yaml
Expand Up @@ -27,14 +27,13 @@ spec:
type: infra
openshift.io/component: network
kubernetes.io/os: "linux"
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
spec:
# Requires fairly broad permissions - ability to read all services and network functions as well
# as all pods.
serviceAccountName: ovn-kubernetes-controller
hostNetwork: true
hostPID: true
priorityClassName: "system-cluster-critical"
containers:
# firewall rules for ovn - assumed to be setup
# iptables -A OS_FIREWALL_ALLOW -p tcp -m state --state NEW -m tcp --dport 6641 -j ACCEPT
Expand Down
4 changes: 1 addition & 3 deletions bindata/network/ovn-kubernetes/ovnkube-node.yaml
Expand Up @@ -27,16 +27,14 @@ spec:
type: infra
openshift.io/component: network
kubernetes.io/os: "linux"
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
spec:
# Requires fairly broad permissions - ability to read all services and network functions as well
# as all pods.
serviceAccountName: ovn-kubernetes-node
hostNetwork: true
hostPID: true
priorityClassName: "system-node-critical"
containers:

# ovsdb-server and ovs-switchd daemons
- name: ovs-daemons
image: {{.OvnImage}}
Expand Down