From e0977872dc0f9c8131e86b738aa3134e41fbdfeb Mon Sep 17 00:00:00 2001 From: Josh Voravong Date: Fri, 3 Mar 2023 15:48:18 -0700 Subject: [PATCH 1/2] Bug Fix: Make the render-examples.sh script only renders values.yaml files --- examples/README.md | 2 +- examples/render-examples.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/README.md b/examples/README.md index 5815c85fa9..04ff6b7179 100644 --- a/examples/README.md +++ b/examples/README.md @@ -4,7 +4,7 @@ Each example has a directory where each of the following is included. - README.md: A short description about the example. -- A Helm values configuration file to demonstrate the example. +- A Helm values configuration file to demonstrate the example, the file name always ends in values.yaml. - A rendered_manifests directory that contains the rendered Kubernetes manifests for the example. - Search for "CHANGEME" to find the values that must be changed in order to use the rendered manifests directly. diff --git a/examples/render-examples.sh b/examples/render-examples.sh index f2e33e41c8..1719d25093 100644 --- a/examples/render-examples.sh +++ b/examples/render-examples.sh @@ -6,7 +6,7 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) render_task(){ example_dir=$1 rendered_manifests_dir=$example_dir"rendered_manifests" - values_yaml=$example_dir`ls $example_dir | grep yaml` + values_yaml=$example_dir`ls $example_dir | grep values.yaml` # Clear out all rendered manifests rm -rf $rendered_manifests_dir From 4536dcfc12f67f2db6a9b69b34273a53e336f545 Mon Sep 17 00:00:00 2001 From: Josh Voravong Date: Fri, 3 Mar 2023 15:49:35 -0700 Subject: [PATCH 2/2] Rename example helm values files to end in "values.yaml" --- ...-advanced.yaml => collector-gateway-only-advanced-values.yaml} | 0 ...etwork-expolorer.yaml => enable-network-expolorer-values.yaml} | 0 .../{only-logs-fluentd.yaml => only-logs-fluentd-values.yaml} | 0 .../{only-logs-otel.yaml => only-logs-otel-values.yaml} | 0 .../only-metrics/{only-metrics.yaml => only-metrics-values.yaml} | 0 .../only-traces/{only-traces.yaml => only-traces-values.yaml} | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename examples/collector-gateway-only-advanced/{collector-gateway-only-advanced.yaml => collector-gateway-only-advanced-values.yaml} (100%) rename examples/enable-network-explorer/{enable-network-expolorer.yaml => enable-network-expolorer-values.yaml} (100%) rename examples/only-logs-fluentd/{only-logs-fluentd.yaml => only-logs-fluentd-values.yaml} (100%) rename examples/only-logs-otel/{only-logs-otel.yaml => only-logs-otel-values.yaml} (100%) rename examples/only-metrics/{only-metrics.yaml => only-metrics-values.yaml} (100%) rename examples/only-traces/{only-traces.yaml => only-traces-values.yaml} (100%) diff --git a/examples/collector-gateway-only-advanced/collector-gateway-only-advanced.yaml b/examples/collector-gateway-only-advanced/collector-gateway-only-advanced-values.yaml similarity index 100% rename from examples/collector-gateway-only-advanced/collector-gateway-only-advanced.yaml rename to examples/collector-gateway-only-advanced/collector-gateway-only-advanced-values.yaml diff --git a/examples/enable-network-explorer/enable-network-expolorer.yaml b/examples/enable-network-explorer/enable-network-expolorer-values.yaml similarity index 100% rename from examples/enable-network-explorer/enable-network-expolorer.yaml rename to examples/enable-network-explorer/enable-network-expolorer-values.yaml diff --git a/examples/only-logs-fluentd/only-logs-fluentd.yaml b/examples/only-logs-fluentd/only-logs-fluentd-values.yaml similarity index 100% rename from examples/only-logs-fluentd/only-logs-fluentd.yaml rename to examples/only-logs-fluentd/only-logs-fluentd-values.yaml diff --git a/examples/only-logs-otel/only-logs-otel.yaml b/examples/only-logs-otel/only-logs-otel-values.yaml similarity index 100% rename from examples/only-logs-otel/only-logs-otel.yaml rename to examples/only-logs-otel/only-logs-otel-values.yaml diff --git a/examples/only-metrics/only-metrics.yaml b/examples/only-metrics/only-metrics-values.yaml similarity index 100% rename from examples/only-metrics/only-metrics.yaml rename to examples/only-metrics/only-metrics-values.yaml diff --git a/examples/only-traces/only-traces.yaml b/examples/only-traces/only-traces-values.yaml similarity index 100% rename from examples/only-traces/only-traces.yaml rename to examples/only-traces/only-traces-values.yaml