Merge pull request #88354 from jiahuif/nodee2e-stack-protector-flags

node-e2e testing: fix alias for stack protector kernel config.
This commit is contained in:
Kubernetes Prow Robot 2020-02-21 18:31:51 -08:00 committed by GitHub
commit 26f8535838
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -49,7 +49,7 @@ kernelSpec:
- name: IP6_NF_IPTABLES - name: IP6_NF_IPTABLES
description: 'Required by kube-proxy.' description: 'Required by kube-proxy.'
- name: IP_NF_TARGET_REDIRECT - name: IP_NF_TARGET_REDIRECT
alias: aliases:
- NETFILTER_XT_TARGET_REDIRECT - NETFILTER_XT_TARGET_REDIRECT
description: 'Enabled REDIRECT: all incoming connections are mapped onto description: 'Enabled REDIRECT: all incoming connections are mapped onto
the incoming interface''s address, causing the packets to come to the the incoming interface''s address, causing the packets to come to the
@ -167,10 +167,11 @@ kernelSpec:
description: 'Enabled the SECCOMP application API.' description: 'Enabled the SECCOMP application API.'
- name: SECURITY_APPARMOR - name: SECURITY_APPARMOR
description: 'Enable for AppArmor support.' description: 'Enable for AppArmor support.'
- name: CC_STACKPROTECTOR_STRONG - name: CC_STACKPROTECTOR_STRONG # Linux kernel <= 4.17
alias: aliases:
- CONFIG_CC_STACKPROTECTOR_REGULAR - CC_STACKPROTECTOR_REGULAR # Linux kernel <= 4.17
CONFIG_CC_STACKPROTECTOR_ALL - CC_STACKPROTECTOR_ALL # Linux kernel <= 4.17
- STACKPROTECTOR_STRONG # Linux kernel >= 4.18
description: 'Add the stack buffer overflow protections.' description: 'Add the stack buffer overflow protections.'
- name: STRICT_DEVMEM - name: STRICT_DEVMEM
description: 'Required for blocking the direct physical memory access.' description: 'Required for blocking the direct physical memory access.'