From 0ad0a657e84069b0dacd08847fe0c01768755e31 Mon Sep 17 00:00:00 2001 From: Robert Auer Date: Mon, 16 Sep 2024 10:47:21 +0200 Subject: [PATCH 1/7] Switch to new CAS service account structure --- CHANGELOG.md | 2 ++ dogu.json | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fcea5291..9c18757a 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] +### Changed +- Switch to new CAS service account structure in dogu.json ## [v1.7.3-2] - 2024-08-06 ### Changed diff --git a/dogu.json b/dogu.json index c180cb91..4276fba6 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", From 0ec8c75724e736f24af9f53fc0a4d180211cf632 Mon Sep 17 00:00:00 2001 From: Robert Auer Date: Mon, 23 Sep 2024 11:25:36 +0200 Subject: [PATCH 2/7] Upgrade to latest java base image --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e54ba191..a4579f93 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ RUN set -x \ -FROM registry.cloudogu.com/official/java:21.0.4-1 +FROM registry.cloudogu.com/official/java:21.0.4-3 LABEL NAME="official/smeagol" \ VERSION="1.7.3-2" \ maintainer="hello@cloudogu.com" From 7828e59ca91eda6edf5917ec6b64a2daaa256062 Mon Sep 17 00:00:00 2001 From: Robert Auer Date: Mon, 23 Sep 2024 13:06:26 +0200 Subject: [PATCH 3/7] Upgrade to latest makefiles --- Makefile | 2 +- build/make/bats.mk | 2 +- build/make/bats/Dockerfile | 4 +++- build/make/k8s.mk | 2 +- build/make/vulnerability-scan.mk | 13 +++++++++++++ 5 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 build/make/vulnerability-scan.mk diff --git a/Makefile b/Makefile index 79895db7..eafb7fb2 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -MAKEFILES_VERSION=9.1.0 +MAKEFILES_VERSION=9.2.1 .DEFAULT_GOAL:=dogu-release 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/k8s.mk b/build/make/k8s.mk index 9f798f46..2b793150 100644 --- a/build/make/k8s.mk +++ b/build/make/k8s.mk @@ -138,7 +138,7 @@ ${K8S_RESOURCE_TEMP_FOLDER}: ##@ K8s - Docker .PHONY: docker-build -docker-build: check-docker-credentials check-k8s-image-env-var ## Builds the docker image of the K8s app. +docker-build: check-docker-credentials check-k8s-image-env-var ${BINARY_YQ} ## Builds the docker image of the K8s app. @echo "Building docker image $(IMAGE)..." @DOCKER_BUILDKIT=1 docker build . -t $(IMAGE) 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 From cfb05752cc7f300aee81afbb273d0cdcc0945bb8 Mon Sep 17 00:00:00 2001 From: Robert Auer Date: Mon, 23 Sep 2024 13:09:55 +0200 Subject: [PATCH 4/7] Upgrade to dogu-integration-test-library 6.1.1 --- integrationTests/package.json | 2 +- integrationTests/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) 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" From a55d98fccca7e33f29d6e97123c3330652879696 Mon Sep 17 00:00:00 2001 From: Jeremias Weber Date: Wed, 25 Sep 2024 09:20:44 +0200 Subject: [PATCH 5/7] Add k8s dogu make targets Signed-off-by: Jeremias Weber --- .env.template | 4 ++++ .gitignore | 2 ++ Makefile | 1 + 3 files changed, 7 insertions(+) create mode 100644 .env.template diff --git a/.env.template b/.env.template new file mode 100644 index 00000000..8ed83eb6 --- /dev/null +++ b/.env.template @@ -0,0 +1,4 @@ +NAMESPACE=ecosystem + +# Use this to deploy to remote k8s-clusters +# RUNTIME_ENV=remote diff --git a/.gitignore b/.gitignore index 79b22ebd..84c00087 100644 --- a/.gitignore +++ b/.gitignore @@ -113,3 +113,5 @@ Temporary Items npm-debug.log* yarn-debug.log* yarn-error.log* + +.env diff --git a/Makefile b/Makefile index eafb7fb2..7f1c1480 100644 --- a/Makefile +++ b/Makefile @@ -5,4 +5,5 @@ MAKEFILES_VERSION=9.2.1 include build/make/variables.mk include build/make/self-update.mk include build/make/release.mk +include build/make/k8s-dogu.mk From 74997569c1ad35d84349b7191004d6689312a974 Mon Sep 17 00:00:00 2001 From: Jeremias Weber Date: Wed, 25 Sep 2024 11:28:37 +0200 Subject: [PATCH 6/7] Bump version --- .gitignore | 1 + Dockerfile | 2 +- dogu.json | 6 ++++-- package.json | 2 +- pom.xml | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 84c00087..fac77e79 100644 --- a/.gitignore +++ b/.gitignore @@ -115,3 +115,4 @@ yarn-debug.log* yarn-error.log* .env +.bin/ diff --git a/Dockerfile b/Dockerfile index 9ce138a8..5776d5a3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ RUN set -x \ FROM registry.cloudogu.com/official/java:21.0.4-3 LABEL NAME="official/smeagol" \ - VERSION="1.7.3-3" \ + VERSION="1.7.3-4" \ maintainer="hello@cloudogu.com" ENV SERVICE_TAGS=webapp \ diff --git a/dogu.json b/dogu.json index 72e62688..a8a3e480 100644 --- a/dogu.json +++ b/dogu.json @@ -1,6 +1,6 @@ { "Name": "official/smeagol", - "Version": "1.7.3-3", + "Version": "1.7.3-4", "DisplayName": "Smeagol", "Description": "Store your technical documentation with in your git repositories", "Category": "Development Apps", @@ -32,7 +32,9 @@ "ServiceAccounts": [ { "Type": "cas", - "Params": ["cas"] + "Params": [ + "cas" + ] } ], "Configuration": [ diff --git a/package.json b/package.json index cca4d5bb..5ed2b3b0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "smeagol", - "version": "1.7.3-3", + "version": "1.7.3-4", "private": true, "license": "AGPL-3.0-only", "dependencies": { diff --git a/pom.xml b/pom.xml index 1cf84eeb..797aaeca 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ com.cloudogu.wiki smeagol - 1.7.3-3 + 1.7.3-4 smeagol war From 57c145fe71ce57b258d684b2844ac19b70ed6f69 Mon Sep 17 00:00:00 2001 From: Jeremias Weber Date: Wed, 25 Sep 2024 11:28:54 +0200 Subject: [PATCH 7/7] Update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f6f8d26f..355ba64c 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] + +## [v1.7.3-4] - 2024-09-25 ### Changed - Switch to new CAS service account structure in dogu.json