From 59579c9322d9cd4a6aaed5fa16aed5f57621ec02 Mon Sep 17 00:00:00 2001 From: Dan Pock Date: Thu, 10 Oct 2024 14:25:10 -0400 Subject: [PATCH] Adjust example file organization --- .github/workflows/e2e/scripts/create-project-namespace.sh | 4 ++-- .github/workflows/e2e/scripts/create-projecthelmchart.sh | 4 ++-- .github/workflows/e2e/scripts/delete-projecthelmchart.sh | 4 ++-- examples/{ => prometheus-federator}/ci/namespace.yaml | 0 .../{ => prometheus-federator}/ci/project-helm-chart.yaml | 0 examples/{ => prometheus-federator}/ci/project.yaml | 0 examples/{ => prometheus-federator}/project-helm-chart.yaml | 0 7 files changed, 6 insertions(+), 6 deletions(-) rename examples/{ => prometheus-federator}/ci/namespace.yaml (100%) rename examples/{ => prometheus-federator}/ci/project-helm-chart.yaml (100%) rename examples/{ => prometheus-federator}/ci/project.yaml (100%) rename examples/{ => prometheus-federator}/project-helm-chart.yaml (100%) diff --git a/.github/workflows/e2e/scripts/create-project-namespace.sh b/.github/workflows/e2e/scripts/create-project-namespace.sh index 212441cb..a63ccc92 100755 --- a/.github/workflows/e2e/scripts/create-project-namespace.sh +++ b/.github/workflows/e2e/scripts/create-project-namespace.sh @@ -8,10 +8,10 @@ cd $(dirname $0)/../../../.. USE_RANCHER=${USE_RANCHER:-"false"} if [ "$USE_RANCHER" = "true" ]; then - kubectl apply -f ./examples/ci/project.yaml + kubectl apply -f ./examples/prometheus-federator/ci/project.yaml fi -kubectl apply -f ./examples/ci/namespace.yaml +kubectl apply -f ./examples/prometheus-federator/ci/namespace.yaml sleep "${DEFAULT_SLEEP_TIMEOUT_SECONDS}" if ! kubectl get namespace cattle-project-p-example; then diff --git a/.github/workflows/e2e/scripts/create-projecthelmchart.sh b/.github/workflows/e2e/scripts/create-projecthelmchart.sh index 5ce0611b..27018561 100755 --- a/.github/workflows/e2e/scripts/create-projecthelmchart.sh +++ b/.github/workflows/e2e/scripts/create-projecthelmchart.sh @@ -7,9 +7,9 @@ source $(dirname $0)/entry cd $(dirname $0)/../../../.. if [[ "${E2E_CI}" == "true" ]]; then - kubectl apply -f ./examples/ci/project-helm-chart.yaml + kubectl apply -f ./examples/prometheus-federator/ci/project-helm-chart.yaml else - kubectl apply -f ./examples/project-helm-chart.yaml + kubectl apply -f ./examples/prometheus-federator/project-helm-chart.yaml fi sleep ${DEFAULT_SLEEP_TIMEOUT_SECONDS}; diff --git a/.github/workflows/e2e/scripts/delete-projecthelmchart.sh b/.github/workflows/e2e/scripts/delete-projecthelmchart.sh index f4862a42..f55e7d17 100755 --- a/.github/workflows/e2e/scripts/delete-projecthelmchart.sh +++ b/.github/workflows/e2e/scripts/delete-projecthelmchart.sh @@ -7,9 +7,9 @@ source $(dirname $0)/entry cd $(dirname $0)/../../../.. if [[ "${E2E_CI}" == "true" ]]; then - kubectl delete -f ./examples/ci/project-helm-chart.yaml + kubectl delete -f ./examples/prometheus-federator/ci/project-helm-chart.yaml else - kubectl delete -f ./examples/project-helm-chart.yaml + kubectl delete -f ./examples/prometheus-federator/project-helm-chart.yaml fi if kubectl get -n cattle-monitoring-system job/helm-delete-cattle-project-p-example-monitoring --ignore-not-found; then if ! kubectl wait --for=condition=complete --timeout="${KUBECTL_WAIT_TIMEOUT}" -n cattle-monitoring-system job/helm-delete-cattle-project-p-example-monitoring; then diff --git a/examples/ci/namespace.yaml b/examples/prometheus-federator/ci/namespace.yaml similarity index 100% rename from examples/ci/namespace.yaml rename to examples/prometheus-federator/ci/namespace.yaml diff --git a/examples/ci/project-helm-chart.yaml b/examples/prometheus-federator/ci/project-helm-chart.yaml similarity index 100% rename from examples/ci/project-helm-chart.yaml rename to examples/prometheus-federator/ci/project-helm-chart.yaml diff --git a/examples/ci/project.yaml b/examples/prometheus-federator/ci/project.yaml similarity index 100% rename from examples/ci/project.yaml rename to examples/prometheus-federator/ci/project.yaml diff --git a/examples/project-helm-chart.yaml b/examples/prometheus-federator/project-helm-chart.yaml similarity index 100% rename from examples/project-helm-chart.yaml rename to examples/prometheus-federator/project-helm-chart.yaml