From 2160e2cf6d6bbedd637180dc0a835291ccd0d0cf Mon Sep 17 00:00:00 2001 From: Chun-Hung Tseng Date: Wed, 18 Dec 2024 09:51:25 +0100 Subject: [PATCH] Bump to 4.1.8 --- .github/workflows/e2e-tests.yaml | 4 ++-- Makefile | 10 +++++----- kind/local-env.sh | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/e2e-tests.yaml b/.github/workflows/e2e-tests.yaml index c894a2b..61dc711 100644 --- a/.github/workflows/e2e-tests.yaml +++ b/.github/workflows/e2e-tests.yaml @@ -81,7 +81,7 @@ jobs: - name: Run e2e tests run: | make test-e2e-4.0.11 - e2e-tests-4-1-7: + e2e-tests-4-1-8: name: Against netbox version 4.1.7 runs-on: ubuntu-latest steps: @@ -112,4 +112,4 @@ jobs: kubectl cluster-info - name: Run e2e tests run: | - make test-e2e-4.1.7 + make test-e2e-4.1.8 diff --git a/Makefile b/Makefile index c5b586c..41e84b5 100644 --- a/Makefile +++ b/Makefile @@ -253,9 +253,9 @@ create-kind-4.0.11: test-e2e-4.0.11: create-kind-4.0.11 deploy-kind install-$(GO_PACKAGE_NAME_CHAINSAW) chainsaw test $(E2E_PARAM) -.PHONY: create-kind-4.1.7 -create-kind-4.1.7: - ./kind/local-env.sh --version 4.1.7 -.PHONY: test-e2e-4.1.7 -test-e2e-4.1.7: create-kind-4.1.7 deploy-kind install-$(GO_PACKAGE_NAME_CHAINSAW) +.PHONY: create-kind-4.1.8 +create-kind-4.1.8: + ./kind/local-env.sh --version 4.1.8 +.PHONY: test-e2e-4.1.8 +test-e2e-4.1.8: create-kind-4.1.8 deploy-kind install-$(GO_PACKAGE_NAME_CHAINSAW) chainsaw test $(E2E_PARAM) diff --git a/kind/local-env.sh b/kind/local-env.sh index db5eff6..eb00ad4 100755 --- a/kind/local-env.sh +++ b/kind/local-env.sh @@ -2,8 +2,8 @@ set -e -u -o pipefail NAMESPACE="" -VERSION="4.1.7" # default value -NETBOX_HELM_CHART="https://github.com/netbox-community/netbox-chart/releases/download/netbox-5.0.0-beta.163/netbox-5.0.0-beta.163.tgz" # default value +VERSION="4.1.8" # default value +NETBOX_HELM_CHART="https://github.com/netbox-community/netbox-chart/releases/download/netbox-5.0.0-beta.169/netbox-5.0.0-beta.169.tgz" # default value while [[ $# -gt 0 ]]; do case $1 in -n|--namespace) @@ -95,14 +95,14 @@ elif [[ "${VERSION}" == "4.0.11" ]] ;then # sed \ # -e "s/comments, \"unique\", related_object_filter)/comments)/g" \ # -e "s/'', false, NULL);/'');/g" $(dirname "$0")/load-data-job/local-demo-data.orig.sql > $(dirname "$0")/load-data-job/local-demo-data.sql -elif [[ "${VERSION}" == "4.1.7" ]] ;then +elif [[ "${VERSION}" == "4.1.8" ]] ;then echo "Using version ${VERSION}" # need to align with netbox-chart otherwise the creation of the cluster will hang declare -a Remote_Images=( \ "gcr.io/kubebuilder/kube-rbac-proxy:v0.14.1" \ "busybox:1.37.0" \ "docker.io/bitnami/redis:7.4.1-debian-12-r2" \ - "ghcr.io/netbox-community/netbox:v4.1.7" \ + "ghcr.io/netbox-community/netbox:v4.1.8" \ "ghcr.io/zalando/postgres-operator:v1.12.2" \ "ghcr.io/zalando/spilo-16:3.2-p3" \ )