From 16a6370c759e2663a365be225265428a61ff63d7 Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Mon, 22 Jul 2024 11:00:38 +0100 Subject: [PATCH 1/2] fix(envbuilder): add /product_uuid and /product_name to IgnorePaths by default KinD adds `/product_uuid` and `/product_name` to pods. Add these to Envbuilder's default ignore list as they otherwise cause issues in KinD. Signed-off-by: Cian Johnston --- envbuilder.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/envbuilder.go b/envbuilder.go index 10773dd5..351db659 100644 --- a/envbuilder.go +++ b/envbuilder.go @@ -89,7 +89,7 @@ func Run(ctx context.Context, options Options) error { // Once the legacy environment variables are phased out, this can be // reinstated to the previous default values. if len(options.IgnorePaths) == 0 { - options.IgnorePaths = []string{"/var/run"} + options.IgnorePaths = []string{"/var/run", "/product_uuid", "/product_name"} } if options.InitScript == "" { options.InitScript = "sleep infinity" From 11655321decac55f4796ce3e088d8c35fbc7a5fb Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Mon, 22 Jul 2024 13:37:10 +0100 Subject: [PATCH 2/2] add note re paths --- envbuilder.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/envbuilder.go b/envbuilder.go index 351db659..62c4279e 100644 --- a/envbuilder.go +++ b/envbuilder.go @@ -89,7 +89,11 @@ func Run(ctx context.Context, options Options) error { // Once the legacy environment variables are phased out, this can be // reinstated to the previous default values. if len(options.IgnorePaths) == 0 { - options.IgnorePaths = []string{"/var/run", "/product_uuid", "/product_name"} + options.IgnorePaths = []string{ + "/var/run", + // KinD adds these paths to pods, so ignore them by default. + "/product_uuid", "/product_name", + } } if options.InitScript == "" { options.InitScript = "sleep infinity"