[Neutron Agent] Enable additional sec capabilities

sapcc · Nov 12, 2024 · 1be88cb · 1be88cb
1 parent 603df8a
commit 1be88cb
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 6 deletions.
diff --git a/openstack/neutron/templates/statefulset-network-agent-apod.yaml b/openstack/neutron/templates/statefulset-network-agent-apod.yaml
@@ -1,7 +1,6 @@
 {{- $envAll := . }}
 {{- if .Values.agent.apod | default false }}
 {{- if .Values.global.apods | default false }}
-{{- $release_requires_sec_cap:= or (hasPrefix "ussuri" (default .Values.imageVersion .Values.imageVersionServerAPI)) (hasPrefix "yoga" (default .Values.imageVersion .Values.imageVersionServerAPI)) -}}
 {{ range $az_long, $apods := .Values.global.apods }}
 {{ range $k, $apod := $apods }}
 {{- if not (has $apod ($.Values.disabled_network_agents | default list )) }}
@@ -163,12 +162,10 @@ spec:
             capabilities:
               add:
                 - NET_ADMIN
-{{- if $release_requires_sec_cap }}
                 - SYS_ADMIN
                 - DAC_OVERRIDE
                 - DAC_READ_SEARCH
                 - SYS_PTRACE
-{{ end }}
           resources:
 {{ toYaml $.Values.pod.resources.linuxbridge_agent | indent 12 }}
           volumeMounts:

diff --git a/openstack/neutron/templates/statefulset-network-agent.yaml b/openstack/neutron/templates/statefulset-network-agent.yaml
@@ -1,5 +1,4 @@
 {{- $envAll := . }}
-{{- $release_requires_sec_cap:= or (hasPrefix "ussuri" (default .Values.imageVersion .Values.imageVersionServerAPI)) (hasPrefix "yoga" (default .Values.imageVersion .Values.imageVersionServerAPI)) -}}
 {{- if and (.Values.agent.multus | default false) .Values.agent.controlplane }}
 {{- $az_count := len .Values.global.availability_zones -}}
 {{ range $i, $az_long := .Values.global.availability_zones | default (list (printf "%sa" $.Values.global.region) (printf "%sb" $.Values.global.region)) }}
@@ -246,12 +245,10 @@ spec:
             capabilities:
               add:
                 - NET_ADMIN
-{{- if $release_requires_sec_cap }}
                 - SYS_ADMIN
                 - DAC_OVERRIDE
                 - DAC_READ_SEARCH
                 - SYS_PTRACE
-{{ end }}
           resources:
 {{ toYaml $.Values.pod.resources.linuxbridge_agent | indent 12 }}
           volumeMounts: