From e30a3af731b4ccc52d89df218a5639212eceeb5e Mon Sep 17 00:00:00 2001 From: Miguel Duarte Barroso Date: Wed, 4 Dec 2024 17:14:17 +0100 Subject: [PATCH] linux-bridge: use w/ openshift required-scc annotation Signed-off-by: Miguel Duarte Barroso --- data/linux-bridge/002-linux-bridge.yaml | 6 ++++++ data/linux-bridge/003-bridge-marker.yaml | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/data/linux-bridge/002-linux-bridge.yaml b/data/linux-bridge/002-linux-bridge.yaml index c9bc7ca1c..0d91d99c1 100644 --- a/data/linux-bridge/002-linux-bridge.yaml +++ b/data/linux-bridge/002-linux-bridge.yaml @@ -21,8 +21,14 @@ spec: name: kube-cni-linux-bridge-plugin tier: node app: cni-plugins +{{ if .IsOpenshift }} annotations: + openshift.io/required-scc: "linux-bridge" description: LinuxBridge installs 'bridge' CNI on cluster nodes, so it can be later used to attach Pods/VMs to Linux bridges +{{ else }} + annotations: + description: LinuxBridge installs 'bridge' CNI on cluster nodes, so it can be later used to attach Pods/VMs to Linux bridges +{{ end }} spec: {{ if .EnableSCC }} serviceAccountName: linux-bridge diff --git a/data/linux-bridge/003-bridge-marker.yaml b/data/linux-bridge/003-bridge-marker.yaml index b258b21ce..a15f0499f 100644 --- a/data/linux-bridge/003-bridge-marker.yaml +++ b/data/linux-bridge/003-bridge-marker.yaml @@ -21,8 +21,14 @@ spec: tier: node app: bridge-marker name: bridge-marker +{{ if .IsOpenshift }} annotations: + openshift.io/required-scc: "bridge-marker" description: Bridge marker exposes network bridges available on nodes as node resources +{{ else }} + annotations: + description: Bridge marker exposes network bridges available on nodes as node resources +{{ end }} spec: serviceAccountName: bridge-marker hostNetwork: true