Merge pull request #1911 from cybertron/cleanup-keepalived

[baremetal & friends] Clean up keepalived script warnings
openshift · Jul 10, 2020 · 1be9c1c · 1be9c1c
2 parents f8ff1d1 + 406392f
commit 1be9c1c
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 0 deletions.
diff --git a/templates/master/00-master/baremetal/files/baremetal-keepalived-keepalived.yaml b/templates/master/00-master/baremetal/files/baremetal-keepalived-keepalived.yaml
@@ -2,6 +2,11 @@ mode: 0644
 path: "/etc/kubernetes/static-pod-resources/keepalived/keepalived.conf.tmpl"
 contents:
   inline: |
+    global_defs {
+        enable_script_security
+        script_user root
+    }
+
     vrrp_script chk_ocp {
         script "/usr/bin/timeout 0.9 /etc/keepalived/chk_ocp_script.sh"
         interval 1

diff --git a/templates/master/00-master/openstack/files/openstack-keepalived-keepalived.yaml b/templates/master/00-master/openstack/files/openstack-keepalived-keepalived.yaml
@@ -2,6 +2,11 @@ mode: 0644
 path: "/etc/kubernetes/static-pod-resources/keepalived/keepalived.conf.tmpl"
 contents:
   inline: |
+    global_defs {
+        enable_script_security
+        script_user root
+    }
+
     vrrp_script chk_ocp {
         script "/usr/bin/timeout 0.9 /etc/keepalived/chk_ocp_script.sh"
         interval 1

diff --git a/templates/master/00-master/ovirt/files/ovirt-keepalived-keepalived.yaml b/templates/master/00-master/ovirt/files/ovirt-keepalived-keepalived.yaml
@@ -2,6 +2,11 @@ mode: 0644
 path: "/etc/kubernetes/static-pod-resources/keepalived/keepalived.conf.tmpl"
 contents:
   inline: |
+    global_defs {
+        enable_script_security
+        script_user root
+    }
+
     vrrp_script chk_ocp {
         script "/usr/bin/timeout 0.9 /etc/keepalived/chk_ocp_script.sh"
         interval 1

diff --git a/templates/master/00-master/vsphere/files/vsphere-keepalived-keepalived.yaml b/templates/master/00-master/vsphere/files/vsphere-keepalived-keepalived.yaml
@@ -7,6 +7,11 @@ contents:
     {{ if .Infra.Status.PlatformStatus -}}
     {{ if .Infra.Status.PlatformStatus.VSphere -}}
     {{ if .Infra.Status.PlatformStatus.VSphere.APIServerInternalIP -}}
+    global_defs {
+        enable_script_security
+        script_user root
+    }
+
     vrrp_script chk_ocp {
         script "/usr/bin/timeout 0.9 /etc/keepalived/chk_ocp_script.sh"
         interval 1