From 75a8964a51f431dd495e609d98ce92a4d4cc8837 Mon Sep 17 00:00:00 2001 From: Ivo Radkov Date: Thu, 6 Feb 2025 15:50:35 +0200 Subject: [PATCH 1/5] Add the sidecar rootfs prop --- jobs/rep/spec | 2 ++ jobs/rep/templates/rep.json.erb | 1 + 2 files changed, 3 insertions(+) diff --git a/jobs/rep/spec b/jobs/rep/spec index 0737d9d1a3..9b36098f98 100644 --- a/jobs/rep/spec +++ b/jobs/rep/spec @@ -51,6 +51,8 @@ properties: diego.rep.use_azure_fault_domains: description: "If set to true the rep zone will be determined by IAAS. If VM belongs to Azure Fault-Domain the value of the zone will be z. e.g. z0, z1, etc. If VM belongs to Azure Availability Zone the value of zone determined in diego.rep.zone will be used." default: false + diego.rep.sidecar_rootfs: + description: "name:absolute_path representing the root filesystem used for sidecar processes" diego.rep.preloaded_rootfses: description: "Array of name:absolute_path pairs representing root filesystems preloaded onto the underlying garden" diego.rep.rootfs_providers: diff --git a/jobs/rep/templates/rep.json.erb b/jobs/rep/templates/rep.json.erb index 1cf981d081..5994e53c9c 100644 --- a/jobs/rep/templates/rep.json.erb +++ b/jobs/rep/templates/rep.json.erb @@ -93,6 +93,7 @@ optional_placement_tags: p("diego.rep.optional_placement_tags"), placement_tags: p("diego.rep.placement_tags"), polling_interval: "#{p("diego.rep.polling_interval_in_seconds")}s", + sidecar_root_fs: p("diego.rep.sidecar_rootfs"), preloaded_root_fs: p("diego.rep.preloaded_rootfses"), read_work_pool_size: p("diego.executor.read_work_pool_size"), skip_cert_verify: p("diego.ssl.skip_cert_verify"), From 8bf3b8515300a171c44e1ef98e5f28f99facbf22 Mon Sep 17 00:00:00 2001 From: Ivo Radkov Date: Fri, 7 Feb 2025 12:10:53 +0200 Subject: [PATCH 2/5] add default value to rootfs prop --- jobs/rep/spec | 1 + 1 file changed, 1 insertion(+) diff --git a/jobs/rep/spec b/jobs/rep/spec index 9b36098f98..d8fa93c4d3 100644 --- a/jobs/rep/spec +++ b/jobs/rep/spec @@ -53,6 +53,7 @@ properties: default: false diego.rep.sidecar_rootfs: description: "name:absolute_path representing the root filesystem used for sidecar processes" + default: "" diego.rep.preloaded_rootfses: description: "Array of name:absolute_path pairs representing root filesystems preloaded onto the underlying garden" diego.rep.rootfs_providers: From 5c1665f2b9f7f911fee1909f1dfa2e3cc1f4e1ee Mon Sep 17 00:00:00 2001 From: Ivo Radkov Date: Fri, 7 Feb 2025 14:44:14 +0200 Subject: [PATCH 3/5] improve description --- jobs/rep/spec | 8 +++++--- jobs/rep/templates/rep.json.erb | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/jobs/rep/spec b/jobs/rep/spec index d8fa93c4d3..8b30cc4b4b 100644 --- a/jobs/rep/spec +++ b/jobs/rep/spec @@ -51,11 +51,13 @@ properties: diego.rep.use_azure_fault_domains: description: "If set to true the rep zone will be determined by IAAS. If VM belongs to Azure Fault-Domain the value of the zone will be z. e.g. z0, z1, etc. If VM belongs to Azure Availability Zone the value of zone determined in diego.rep.zone will be used." default: false - diego.rep.sidecar_rootfs: - description: "name:absolute_path representing the root filesystem used for sidecar processes" - default: "" + 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" + 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/templates/rep.json.erb b/jobs/rep/templates/rep.json.erb index 5994e53c9c..3458ab02fb 100644 --- a/jobs/rep/templates/rep.json.erb +++ b/jobs/rep/templates/rep.json.erb @@ -93,8 +93,8 @@ optional_placement_tags: p("diego.rep.optional_placement_tags"), placement_tags: p("diego.rep.placement_tags"), polling_interval: "#{p("diego.rep.polling_interval_in_seconds")}s", - sidecar_root_fs: p("diego.rep.sidecar_rootfs"), 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 90f9123745cbc8f726d7288df9d5b95c06cbb4ae Mon Sep 17 00:00:00 2001 From: Ivo Radkov Date: Fri, 7 Feb 2025 14:52:49 +0200 Subject: [PATCH 4/5] fix indent bug --- jobs/rep/spec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/jobs/rep/spec b/jobs/rep/spec index 8b30cc4b4b..931d7b7b65 100644 --- a/jobs/rep/spec +++ b/jobs/rep/spec @@ -51,12 +51,10 @@ properties: diego.rep.use_azure_fault_domains: description: "If set to true the rep zone will be determined by IAAS. If VM belongs to Azure Fault-Domain the value of the zone will be z. e.g. z0, z1, etc. If VM belongs to Azure Availability Zone the value of zone determined in diego.rep.zone will be used." default: false - 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" + diego.rep.sidecar_rootfs_path: + description: "absolute_path representing the root filesystem used for sidecar processes. Must be one of the preloaded_rootfses paths" default: "" diego.rep.rootfs_providers: description: "Array of schemes for which the underlying garden can support arbitrary root filesystems" From 456c6dee349ca515ecf8f3168f6e19b071650bfd Mon Sep 17 00:00:00 2001 From: Ivo Radkov Date: Fri, 14 Feb 2025 10:11:28 +0200 Subject: [PATCH 5/5] Update the description to be more specific --- jobs/rep/spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobs/rep/spec b/jobs/rep/spec index 931d7b7b65..fce7d7a307 100644 --- a/jobs/rep/spec +++ b/jobs/rep/spec @@ -54,7 +54,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. Must be one of the preloaded_rootfses paths" + 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"