From 2528b5770861c78494887b91fc69344a06f33571 Mon Sep 17 00:00:00 2001 From: Philipp Thun Date: Mon, 1 Jul 2024 15:43:14 +0200 Subject: [PATCH] Re-add dummy redis job --- jobs/cloud_controller_ng/spec | 2 +- jobs/redis/monit | 1 + jobs/redis/spec | 6 ++++++ spec/cloud_controller_ng/cloud_controller_ng_spec.rb | 4 ++-- 4 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 jobs/redis/monit create mode 100644 jobs/redis/spec diff --git a/jobs/cloud_controller_ng/spec b/jobs/cloud_controller_ng/spec index fdea0c42aa..006a95f61e 100644 --- a/jobs/cloud_controller_ng/spec +++ b/jobs/cloud_controller_ng/spec @@ -1239,7 +1239,7 @@ properties: default: false cc.experimental.use_redis: - description: "Use co-deployed Redis for rate limiting and metrics. If the Puma webserver is enabled, Redis will automatically be used." + description: "Use co-deployed Valkey (Redis fork) for rate limiting and metrics. If the Puma webserver is enabled, Valkey will automatically be used." default: false cc.puma.workers: diff --git a/jobs/redis/monit b/jobs/redis/monit new file mode 100644 index 0000000000..b7db25411d --- /dev/null +++ b/jobs/redis/monit @@ -0,0 +1 @@ +# Empty diff --git a/jobs/redis/spec b/jobs/redis/spec new file mode 100644 index 0000000000..ac834fa210 --- /dev/null +++ b/jobs/redis/spec @@ -0,0 +1,6 @@ +--- +name: redis + +templates: [] + +properties: {} diff --git a/spec/cloud_controller_ng/cloud_controller_ng_spec.rb b/spec/cloud_controller_ng/cloud_controller_ng_spec.rb index 236bd7a557..c4c69f8938 100644 --- a/spec/cloud_controller_ng/cloud_controller_ng_spec.rb +++ b/spec/cloud_controller_ng/cloud_controller_ng_spec.rb @@ -567,9 +567,9 @@ module Test end end - describe 'redis config' do + describe 'valkey config' do context 'when the puma webserver is used' do - it 'renders the redis socket into the ccng config' do + it 'renders the valkey socket into the ccng config' do merged_manifest_properties['cc']['experimental'] = { 'use_puma_webserver' => true } template_hash = YAML.safe_load(template.render(merged_manifest_properties, consumes: links)) expect(template_hash['redis']['socket']).to eq('/var/vcap/data/valkey/valkey.sock')