diff --git a/.gitignore b/.gitignore index 79b22ebd..fac77e79 100644 --- a/.gitignore +++ b/.gitignore @@ -113,3 +113,6 @@ Temporary Items npm-debug.log* yarn-debug.log* yarn-error.log* + +.env +.bin/ diff --git a/CHANGELOG.md b/CHANGELOG.md index fcea5291..b2d68ad0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +### Added +- Add explicit CAS service account in ordern to run properly in multinode environment. ## [v1.7.3-2] - 2024-08-06 ### Changed diff --git a/Makefile b/Makefile index 79895db7..52cac241 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,9 @@ -MAKEFILES_VERSION=9.1.0 +MAKEFILES_VERSION=9.2.0 .DEFAULT_GOAL:=dogu-release include build/make/variables.mk include build/make/self-update.mk include build/make/release.mk +include build/make/k8s-dogu.mk diff --git a/build/make/bats.mk b/build/make/bats.mk index ce1319c9..7e73553d 100644 --- a/build/make/bats.mk +++ b/build/make/bats.mk @@ -9,7 +9,7 @@ BATS_SUPPORT=$(BATS_LIBRARY_DIR)/bats-support BATS_FILE=$(BATS_LIBRARY_DIR)/bats-file BATS_BASE_IMAGE?=bats/bats BATS_CUSTOM_IMAGE?=cloudogu/bats -BATS_TAG?=1.2.1 +BATS_TAG?=1.11.0 BATS_DIR=build/make/bats BATS_WORKDIR="${WORKDIR}"/"${BATS_DIR}" diff --git a/build/make/bats/Dockerfile b/build/make/bats/Dockerfile index 428ee057..7167a941 100644 --- a/build/make/bats/Dockerfile +++ b/build/make/bats/Dockerfile @@ -1,7 +1,9 @@ ARG BATS_BASE_IMAGE ARG BATS_TAG -FROM ${BATS_BASE_IMAGE}:${BATS_TAG} +FROM ${BATS_BASE_IMAGE:-bats/bats}:${BATS_TAG:-1.11.0} # Make bash more findable by scripts and tests RUN apk add make git bash +# suppress git "detected dubious ownership" error/warning for repos which are checked out later +RUN git config --global --add safe.directory /workspace \ No newline at end of file diff --git a/build/make/vulnerability-scan.mk b/build/make/vulnerability-scan.mk new file mode 100644 index 00000000..5698206d --- /dev/null +++ b/build/make/vulnerability-scan.mk @@ -0,0 +1,13 @@ +##@ Vulnerability scan + +GOVULNCHECK_BIN=${UTILITY_BIN_PATH}/govulncheck +GOVULNCHECK_VERSION?=latest + +${GOVULNCHECK_BIN}: ${UTILITY_BIN_PATH} + $(call go-get-tool,$(GOVULNCHECK_BIN),golang.org/x/vuln/cmd/govulncheck@$(GOVULNCHECK_VERSION)) + +.PHONY: govulncheck +govulncheck: ${GOVULNCHECK_BIN} ## This target is used to scan the go repository against known vulnerabilities + @echo "Start vulnerability against repository" + ${GOVULNCHECK_BIN} -show verbose ./... + @echo "Finished scan" \ No newline at end of file diff --git a/dogu.json b/dogu.json index c180cb91..33ba9ee1 100644 --- a/dogu.json +++ b/dogu.json @@ -16,7 +16,8 @@ "Dependencies": [ { "type": "dogu", - "name": "cas" + "name": "cas", + "version": ">=7.0.5.1-6" }, { "type": "dogu", @@ -28,6 +29,12 @@ "version": ">=2.20.0-1" } ], + "ServiceAccounts": [ + { + "Type": "cas", + "Params": ["cas"] + } + ], "Configuration": [ { "Name": "logging/root", diff --git a/integrationTests/package.json b/integrationTests/package.json index 4bd61bf1..67446703 100644 --- a/integrationTests/package.json +++ b/integrationTests/package.json @@ -2,7 +2,7 @@ "dependencies": { "@badeball/cypress-cucumber-preprocessor": "^16.0.0", "@bahmutov/cypress-esbuild-preprocessor": "^2.2.0", - "@cloudogu/dogu-integration-test-library": "6.0.1", + "@cloudogu/dogu-integration-test-library": "6.1.1", "cypress": "^12.9.0", "@bahmutov/cy-api": "^2.2.4" }, diff --git a/integrationTests/yarn.lock b/integrationTests/yarn.lock index b9d2c46f..5a12b088 100644 --- a/integrationTests/yarn.lock +++ b/integrationTests/yarn.lock @@ -92,10 +92,10 @@ dependencies: debug "4.3.4" -"@cloudogu/dogu-integration-test-library@6.0.1": - version "6.0.1" - resolved "https://registry.yarnpkg.com/@cloudogu/dogu-integration-test-library/-/dogu-integration-test-library-6.0.1.tgz#4a04861b0ee5289dcfd07040e1db4fd595ab5bb6" - integrity sha512-3MG3AmnJXvARg6QGzTdd4XjyKpF597FKS/lRU9w2Y/hg3zHuZzzPism1n2dMQLAMGDwvhX4bHcRQ6qUSOO2sZQ== +"@cloudogu/dogu-integration-test-library@6.1.1": + version "6.1.1" + resolved "https://registry.yarnpkg.com/@cloudogu/dogu-integration-test-library/-/dogu-integration-test-library-6.1.1.tgz#76a3cc5b585c84fdab92669b7f2b55c87482d040" + integrity sha512-plQpFu7QbuX4Kuuvq4XVhWNUwy5rKk5KPF3DY8XSQyodWvtuPtTWEgoJ2e8TwqN6WK5c0aEcMMBLoboiTh/CJg== dependencies: "@badeball/cypress-cucumber-preprocessor" "^16.0.0" cypress "^12.9.0"