From e2391cefa013382b25ac27449fc38948fb319200 Mon Sep 17 00:00:00 2001 From: Ivo Radkov Date: Wed, 19 Feb 2025 16:25:03 +0200 Subject: [PATCH 1/3] Add the sidecar rootfs path to the windows rep --- jobs/rep_windows/spec | 3 +++ jobs/rep_windows/templates/rep.json.erb | 1 + 2 files changed, 4 insertions(+) diff --git a/jobs/rep_windows/spec b/jobs/rep_windows/spec index 4a7dfefc6f..b250e06bc4 100644 --- a/jobs/rep_windows/spec +++ b/jobs/rep_windows/spec @@ -45,6 +45,9 @@ properties: description: "Array of name:absolute_path pairs representing root filesystems preloaded onto the underlying garden" default: - windows2012R2:/tmp/windows2012R2 + diego.rep.sidecar_rootfs_path: + description: "absolute_path representing the root filesystem used for sidecar processes (ie. "/tmp/windows2012R2"). Must be one of the preloaded_rootfses paths. Leaving the default empty string is ok, as it will then select the first of he preloaded_rootfses" + default: "" diego.rep.rootfs_providers: description: "Array of schemes for which the underlying garden can support arbitrary root filesystems" default: [] diff --git a/jobs/rep_windows/templates/rep.json.erb b/jobs/rep_windows/templates/rep.json.erb index b781c563af..29b2991af3 100644 --- a/jobs/rep_windows/templates/rep.json.erb +++ b/jobs/rep_windows/templates/rep.json.erb @@ -95,6 +95,7 @@ placement_tags: p("diego.rep.placement_tags"), polling_interval: "#{p("diego.rep.polling_interval_in_seconds")}s", preloaded_root_fs: p("diego.rep.preloaded_rootfses"), + sidecar_root_fs_path: p("diego.rep.sidecar_rootfs_path"), read_work_pool_size: p("diego.executor.read_work_pool_size"), skip_cert_verify: p("diego.ssl.skip_cert_verify"), supported_providers: p("diego.rep.rootfs_providers"), From 14a104df61563eec607123c90a6e45c122b00914 Mon Sep 17 00:00:00 2001 From: Ivo Radkov Date: Thu, 20 Feb 2025 16:32:37 +0200 Subject: [PATCH 2/3] Fix linux spec description quotes --- jobs/rep/spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobs/rep/spec b/jobs/rep/spec index 29ad83e7d6..ecff35fa52 100644 --- a/jobs/rep/spec +++ b/jobs/rep/spec @@ -55,7 +55,7 @@ properties: diego.rep.preloaded_rootfses: description: "Array of name:absolute_path pairs representing root filesystems preloaded onto the underlying garden" diego.rep.sidecar_rootfs_path: - description: "absolute_path representing the root filesystem used for sidecar processes (ie. "/var/vcap/packages/cflinuxfs4/rootfs.tar"). Must be one of the preloaded_rootfses paths. Leaving the default empty string is ok, as it will then select the first of he preloaded_rootfses" + description: "absolute_path representing the root filesystem used for sidecar processes (ie. '/var/vcap/packages/cflinuxfs4/rootfs.tar'). Must be one of the preloaded_rootfses paths. Leaving the default empty string is ok, as it will then select the first of he preloaded_rootfses" default: "" diego.rep.rootfs_providers: description: "Array of schemes for which the underlying garden can support arbitrary root filesystems" From b95d38e3f3a00d95325ba4940854e4c6afeda853 Mon Sep 17 00:00:00 2001 From: Ivo Radkov Date: Thu, 20 Feb 2025 16:33:26 +0200 Subject: [PATCH 3/3] Fix windows spec description quotes --- jobs/rep_windows/spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobs/rep_windows/spec b/jobs/rep_windows/spec index b250e06bc4..d34483c0b5 100644 --- a/jobs/rep_windows/spec +++ b/jobs/rep_windows/spec @@ -46,7 +46,7 @@ properties: default: - windows2012R2:/tmp/windows2012R2 diego.rep.sidecar_rootfs_path: - description: "absolute_path representing the root filesystem used for sidecar processes (ie. "/tmp/windows2012R2"). Must be one of the preloaded_rootfses paths. Leaving the default empty string is ok, as it will then select the first of he preloaded_rootfses" + description: "absolute_path representing the root filesystem used for sidecar processes (ie. '/tmp/windows2012R2'). Must be one of the preloaded_rootfses paths. Leaving the default empty string is ok, as it will then select the first of he preloaded_rootfses" default: "" diego.rep.rootfs_providers: description: "Array of schemes for which the underlying garden can support arbitrary root filesystems"