From 7aefd4384f5766469f6ad589f61a7ef7aba77cd6 Mon Sep 17 00:00:00 2001 From: poorndm Date: Wed, 10 Dec 2025 14:04:25 +0530 Subject: [PATCH 1/5] Replace KeyDb dependency with Valkey Signed-off-by: poorndm --- omnibus/config/software/server-complete.rb | 2 +- .../infra-server/templates/default/sv-redis_lb-run.erb | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/omnibus/config/software/server-complete.rb b/omnibus/config/software/server-complete.rb index 9ea5712e65..d77ab14716 100644 --- a/omnibus/config/software/server-complete.rb +++ b/omnibus/config/software/server-complete.rb @@ -31,7 +31,7 @@ # the backend dependency "postgresql96-bin" # for upgrading 9.6 -> 13 dependency "postgresql13" -dependency "keydb" # dynamic routing controls +dependency "valkey" # dynamic routing controls dependency "haproxy" dependency "opensearch" # used by search diff --git a/omnibus/files/server-ctl-cookbooks/infra-server/templates/default/sv-redis_lb-run.erb b/omnibus/files/server-ctl-cookbooks/infra-server/templates/default/sv-redis_lb-run.erb index e3f3a8e3b0..12ca872d1d 100644 --- a/omnibus/files/server-ctl-cookbooks/infra-server/templates/default/sv-redis_lb-run.erb +++ b/omnibus/files/server-ctl-cookbooks/infra-server/templates/default/sv-redis_lb-run.erb @@ -1,4 +1,3 @@ #!/bin/sh exec 2>&1 -exec /opt/<%= ChefUtils::Dist::Org::LEGACY_CONF_DIR %>/embedded/bin/veil-env-helper -f /etc/<%= ChefUtils::Dist::Org::LEGACY_CONF_DIR %>/private-<%= ChefUtils::Dist::Infra::SHORT %>-secrets.json -s REDIS_PASSWORD=redis_lb.password -- chpst -P -o 131071 -u <%= node["private_chef"]["user"]["username"] %> -U <%= node["private_chef"]["user"]["username"] %> -o 100000 env HOME="<%= node["private_chef"]["redis_lb"]["dir"] %>" /opt/<%= ChefUtils::Dist::Org::LEGACY_CONF_DIR %>/embedded/bin/keydb-server <%= File.join(node["private_chef"]["redis_lb"]["dir"], "etc", "redis.conf") %> --requirepass "${REDIS_PASSWORD}" - +exec /opt/<%= ChefUtils::Dist::Org::LEGACY_CONF_DIR %>/embedded/bin/veil-env-helper -f /etc/<%= ChefUtils::Dist::Org::LEGACY_CONF_DIR %>/private-<%= ChefUtils::Dist::Infra::SHORT %>-secrets.json -s REDIS_PASSWORD=redis_lb.password -- chpst -P -o 131071 -u <%= node["private_chef"]["user"]["username"] %> -U <%= node["private_chef"]["user"]["username"] %> -o 100000 env HOME="<%= node["private_chef"]["redis_lb"]["dir"] %>" /opt/<%= ChefUtils::Dist::Org::LEGACY_CONF_DIR %>/embedded/bin/valkey-server <%= File.join(node["private_chef"]["redis_lb"]["dir"], "etc", "redis.conf") %> --requirepass "${REDIS_PASSWORD}" From 6928e2a39a111626df319fc517000edf4d5056cb Mon Sep 17 00:00:00 2001 From: poorndm Date: Wed, 10 Dec 2025 14:11:51 +0530 Subject: [PATCH 2/5] Update omnibus-s/w version to latest Signed-off-by: poorndm --- omnibus/Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index ef4245c75f..a6c9bd1d9e 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -10,10 +10,10 @@ GIT GIT remote: https://github.com/chef/omnibus-software.git - revision: 0cb128b237c26b5796370b761adbd499f71e5413 + revision: d6fce7b6c5e6a9ba1f3a21eef2b2be8ee778391f branch: main specs: - omnibus-software (25.10.350) + omnibus-software (25.10.358) omnibus (>= 9.0.0) GIT From 884629f4495ab0d8e32c85257ab2f91618775630 Mon Sep 17 00:00:00 2001 From: poorndm Date: Wed, 10 Dec 2025 14:19:53 +0530 Subject: [PATCH 3/5] version correction Signed-off-by: poorndm --- omnibus/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index a6c9bd1d9e..2ec38df15d 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -13,7 +13,7 @@ GIT revision: d6fce7b6c5e6a9ba1f3a21eef2b2be8ee778391f branch: main specs: - omnibus-software (25.10.358) + omnibus-software (25.10.357) omnibus (>= 9.0.0) GIT From 0937da02c8f95bd44e5a90a29e65dbf4f0e5398f Mon Sep 17 00:00:00 2001 From: poorndm Date: Wed, 10 Dec 2025 14:27:04 +0530 Subject: [PATCH 4/5] Version correction Signed-off-by: poorndm --- omnibus/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 2ec38df15d..a6c9bd1d9e 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -13,7 +13,7 @@ GIT revision: d6fce7b6c5e6a9ba1f3a21eef2b2be8ee778391f branch: main specs: - omnibus-software (25.10.357) + omnibus-software (25.10.358) omnibus (>= 9.0.0) GIT From 76207eda0fa7e48b0e025535bb794b073aceb7f3 Mon Sep 17 00:00:00 2001 From: poorndm Date: Wed, 10 Dec 2025 15:05:46 +0530 Subject: [PATCH 5/5] Version correction Signed-off-by: poorndm --- omnibus/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index a6c9bd1d9e..d9c343a573 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -13,7 +13,7 @@ GIT revision: d6fce7b6c5e6a9ba1f3a21eef2b2be8ee778391f branch: main specs: - omnibus-software (25.10.358) + omnibus-software (25.12.358) omnibus (>= 9.0.0) GIT