From e940e32467e2b6fe254d013080033c3beaecd9e9 Mon Sep 17 00:00:00 2001 From: Stacky McStackface Date: Tue, 5 Mar 2024 12:57:02 +0000 Subject: [PATCH] Generated commit to update templated files based on rev 1ce22e8 in stackabletech/operator-templating repo. Triggered by: Manual run triggered by: razvan with message [run_tests.sh support --namespace] --- Cargo.nix | 12 ++++++------ Makefile | 2 +- crate-hashes.json | 4 ++-- scripts/run_tests.sh | 15 +++++++++++++++ 4 files changed, 24 insertions(+), 9 deletions(-) diff --git a/Cargo.nix b/Cargo.nix index 1e10dfd0..d7de165a 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -5877,13 +5877,13 @@ rec { }; "stackable-operator" = rec { crateName = "stackable-operator"; - version = "0.60.1"; + version = "0.64.0"; edition = "2021"; workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "21f98e8937dac924e374b54bd6ea1d7b2367ca69"; - sha256 = "1rsf8a45rr8yq21arnkxf8424d4rr0wx3crgvxclskgjvqzs6vdl"; + rev = "d988822e7af3d363d52fb35643f0c6ed933f340a"; + sha256 = "05a4aqb2lv3rkc049zsq5vxxbx4km8l1j6mbn984wjag5fsmrpfp"; }; authors = [ "Stackable GmbH " @@ -6036,13 +6036,13 @@ rec { }; "stackable-operator-derive" = rec { crateName = "stackable-operator-derive"; - version = "0.60.1"; + version = "0.64.0"; edition = "2021"; workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "21f98e8937dac924e374b54bd6ea1d7b2367ca69"; - sha256 = "1rsf8a45rr8yq21arnkxf8424d4rr0wx3crgvxclskgjvqzs6vdl"; + rev = "d988822e7af3d363d52fb35643f0c6ed933f340a"; + sha256 = "05a4aqb2lv3rkc049zsq5vxxbx4km8l1j6mbn984wjag5fsmrpfp"; }; procMacro = true; authors = [ diff --git a/Makefile b/Makefile index 601cbcd5..f1692b5e 100644 --- a/Makefile +++ b/Makefile @@ -152,7 +152,7 @@ publish: docker-publish helm-publish run-dev: kubectl apply -f deploy/stackable-operators-ns.yaml - nix run -f. tilt -- up --port 5438 --namespace stackable-operators + nix run -f. tilt -- up --port 5430 --namespace stackable-operators stop-dev: nix run -f. tilt -- down diff --git a/crate-hashes.json b/crate-hashes.json index 663278b2..8599de7a 100644 --- a/crate-hashes.json +++ b/crate-hashes.json @@ -1,5 +1,5 @@ { "product-config 0.6.0 (git+https://github.com/stackabletech/product-config.git?tag=0.6.0#ad2c3ea6a291e415d978eb4271fb309e75861ef0)": "1ixc2x7540sxdmc92hqdcwm24rj8i1ivjsvwk2d57pdsq03j2x41", - "stackable-operator 0.60.1 (git+https://github.com/stackabletech/operator-rs.git?tag=0.60.1#21f98e8937dac924e374b54bd6ea1d7b2367ca69)": "1rsf8a45rr8yq21arnkxf8424d4rr0wx3crgvxclskgjvqzs6vdl", - "stackable-operator-derive 0.60.1 (git+https://github.com/stackabletech/operator-rs.git?tag=0.60.1#21f98e8937dac924e374b54bd6ea1d7b2367ca69)": "1rsf8a45rr8yq21arnkxf8424d4rr0wx3crgvxclskgjvqzs6vdl" + "stackable-operator 0.64.0 (git+https://github.com/stackabletech/operator-rs.git?tag=0.64.0#d988822e7af3d363d52fb35643f0c6ed933f340a)": "05a4aqb2lv3rkc049zsq5vxxbx4km8l1j6mbn984wjag5fsmrpfp", + "stackable-operator-derive 0.64.0 (git+https://github.com/stackabletech/operator-rs.git?tag=0.64.0#d988822e7af3d363d52fb35643f0c6ed933f340a)": "05a4aqb2lv3rkc049zsq5vxxbx4km8l1j6mbn984wjag5fsmrpfp" } \ No newline at end of file diff --git a/scripts/run_tests.sh b/scripts/run_tests.sh index ab39eb90..85fbbd2b 100755 --- a/scripts/run_tests.sh +++ b/scripts/run_tests.sh @@ -33,6 +33,7 @@ BEKU_TEST_SUITE="" KUTTL_TEST="" KUTTL_SKIP_DELETE="" KUTTL_PARALLEL="" +KUTTL_NAMESPACE="" is_installed() { local command="$1" @@ -79,6 +80,15 @@ run_tests() { OPTS+=("--skip-delete") fi + if [ -n "$KUTTL_NAMESPACE" ]; then + OPTS+=("--namespace $KUTTL_NAMESPACE") + + # Create the namespace if it does not exist. + # To avoid an error when the namespace already exists, we use "kubectl describe" + # and if that fails we create the namespace. + kubectl describe namespace "$KUTTL_NAMESPACE" || kubectl create namespace "$KUTTL_NAMESPACE" + fi + if [ -n "$KUTTL_PARALLEL" ]; then OPTS+=("--parallel $KUTTL_PARALLEL") fi @@ -105,6 +115,7 @@ usage() { --skip-delete Skip resource deletion after the test run. --parallel Run tests in parallel. Default is to run all tests in parallel. --skip-release Skip the operator installation. + --namespace Run the tests in the specified namespace. USAGE } @@ -129,6 +140,10 @@ parse_args() { KUTTL_TEST="$2" shift ;; + --namespace) + KUTTL_NAMESPACE="$2" + shift + ;; *) echo "Unknown parameter : $1" usage