From: Konstantin Khorenko <[email protected]>

Kubernetes checks kernel version via its config,
in Containers kernel package usually is not installed,
so most convenient place for k8s is /proc/config.gz.

https://jira.sw.ru/browse/PSBM-92107

Signed-off-by: Konstantin Khorenko <[email protected]>
(cherry picked from commit 855d50d5a08b71018bece89b3c41caaff6affd79)

Rebase part https://jira.sw.ru/browse/PSBM-127850

Signed-off-by: Alexander Mikhalitsyn <[email protected]>
---
 configs/kernel-4.18.0-x86_64-KVM-minimal.config | 4 ++--
 configs/kernel-4.18.0-x86_64-debug.config       | 3 ++-
 configs/kernel-4.18.0-x86_64.config             | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/configs/kernel-4.18.0-x86_64-KVM-minimal.config 
b/configs/kernel-4.18.0-x86_64-KVM-minimal.config
index a23ace32d1e1..1e68e175874c 100644
--- a/configs/kernel-4.18.0-x86_64-KVM-minimal.config
+++ b/configs/kernel-4.18.0-x86_64-KVM-minimal.config
@@ -153,8 +153,8 @@ CONFIG_CONTEXT_TRACKING=y
 # CONFIG_CONTEXT_TRACKING_FORCE is not set
 CONFIG_RCU_NOCB_CPU=y
 CONFIG_BUILD_BIN2C=y
-CONFIG_IKCONFIG=m
-# CONFIG_IKCONFIG_PROC is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=20
 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
diff --git a/configs/kernel-4.18.0-x86_64-debug.config 
b/configs/kernel-4.18.0-x86_64-debug.config
index 78421b428fc7..c62c4b8e5053 100644
--- a/configs/kernel-4.18.0-x86_64-debug.config
+++ b/configs/kernel-4.18.0-x86_64-debug.config
@@ -158,7 +158,8 @@ CONFIG_CONTEXT_TRACKING=y
 # CONFIG_CONTEXT_TRACKING_FORCE is not set
 CONFIG_RCU_NOCB_CPU=y
 CONFIG_BUILD_BIN2C=y
-# CONFIG_IKCONFIG is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=20
 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
diff --git a/configs/kernel-4.18.0-x86_64.config 
b/configs/kernel-4.18.0-x86_64.config
index 1cc4583aa8fd..8ebc0cba0199 100644
--- a/configs/kernel-4.18.0-x86_64.config
+++ b/configs/kernel-4.18.0-x86_64.config
@@ -155,7 +155,8 @@ CONFIG_CONTEXT_TRACKING=y
 # CONFIG_CONTEXT_TRACKING_FORCE is not set
 CONFIG_RCU_NOCB_CPU=y
 CONFIG_BUILD_BIN2C=y
-# CONFIG_IKCONFIG is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=20
 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
-- 
2.28.0

_______________________________________________
Devel mailing list
[email protected]
https://lists.openvz.org/mailman/listinfo/devel

Reply via email to