linux-bridge: use w/ openshift required-scc annotation

Signed-off-by: Miguel Duarte Barroso <[email protected]>
kubevirt · Dec 5, 2024 · c6019b7 · c6019b7
1 parent 3a61827
commit c6019b7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git 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 .EnableSCC }}
+      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
@@ -23,6 +23,7 @@ spec:
         name: bridge-marker
       annotations:
         description: Bridge marker exposes network bridges available on nodes as node resources
+        openshift.io/required-scc: "bridge-marker"
     spec:
       serviceAccountName: bridge-marker
       hostNetwork: true

diff --git a/hack/components/bump-bridge-marker.sh b/hack/components/bump-bridge-marker.sh
@@ -24,6 +24,7 @@ function __parametize_by_object() {
 				yaml-utils::update_param ${f} spec.template.spec.containers[0].imagePullPolicy  '{{ .ImagePullPolicy }}'
 				yaml-utils::update_param ${f} spec.template.spec.nodeSelector '{{ toYaml .Placement.NodeSelector | nindent 8 }}'
 				yaml-utils::set_param ${f} spec.template.spec.affinity '{{ toYaml .Placement.Affinity | nindent 8 }}'
+				yaml-utils::set_param ${f} 'spec.template.metadata.annotations."openshift.io/required-scc"' '"bridge-marker"'
 				yaml-utils::update_param ${f} spec.template.spec.tolerations '{{ toYaml .Placement.Tolerations | nindent 8 }}'
 				yaml-utils::remove_single_quotes_from_yaml ${f}
 				;;