Skip to content

Commit 0f66de5

Browse files
robertauercesmarvin
robertauer
authored and
cesmarvin
committed
Merge branch 'release/v1.9.0' into main
2 parents d199281 + 03456fe commit 0f66de5

21 files changed

Lines changed: 253 additions & 26 deletions

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased]
88

9+
## [v1.9.0] - 2025-04-23
10+
### Changed
11+
- [#90] Set sensible resource requests and limits
12+
913
## [v1.8.0] - 2025-03-31
1014
### Added
1115
- [#87] Add additional print columns and aliases to CRD

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ RUN make compile-generic
3535
FROM gcr.io/distroless/static:nonroot
3636
LABEL maintainer="hello@cloudogu.com" \
3737
NAME="k8s-component-operator" \
38-
VERSION="1.8.0"
38+
VERSION="1.9.0"
3939

4040
WORKDIR /
4141
COPY --from=builder /workspace/target/k8s-component-operator .

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Set these to the desired values
22
ARTIFACT_ID=k8s-component-operator
3-
VERSION=1.8.0
3+
VERSION=1.9.0
44
## Image URL to use all building/pushing image targets
55
IMAGE=cloudogu/${ARTIFACT_ID}:${VERSION}
66
GOTAG?=1.24.1
7-
MAKEFILES_VERSION=9.3.2
7+
MAKEFILES_VERSION=9.9.1
88
LINT_VERSION?=v1.64.8
99

1010
ADDITIONAL_CLEAN=dist-clean

‎build/make/build.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
ADDITIONAL_LDFLAGS?=-extldflags -static
44
LDFLAGS?=-ldflags "$(ADDITIONAL_LDFLAGS) -X main.Version=$(VERSION) -X main.CommitID=$(COMMIT_ID)"
55
GOIMAGE?=golang
6-
GOTAG?=1.23
6+
GOTAG?=1.24
77
GOOS?=linux
88
GOARCH?=amd64
99
PRE_COMPILE?=

‎build/make/k8s-crd.mk‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
ARTIFACT_CRD_ID = $(ARTIFACT_ID)-crd
1+
# we set this default to maintain compatibility with CRDs that are still inside monorepos
2+
APPEND_CRD_SUFFIX ?= true
3+
ifeq ($(APPEND_CRD_SUFFIX), true)
4+
ARTIFACT_CRD_ID = $(ARTIFACT_ID)-crd
5+
else ifeq ($(APPEND_CRD_SUFFIX), false)
6+
ARTIFACT_CRD_ID = $(ARTIFACT_ID)
7+
endif
28
DEV_CRD_VERSION ?= ${VERSION}-dev
39
HELM_CRD_SOURCE_DIR ?= ${WORKDIR}/k8s/helm-crd
410
HELM_CRD_TARGET_DIR ?= $(K8S_RESOURCE_TEMP_FOLDER)/helm-crd
@@ -28,7 +34,7 @@ crd-add-labels: $(BINARY_YQ)
2834
@echo "Adding labels to CRD..."
2935
@for file in ${HELM_CRD_SOURCE_DIR}/templates/*.yaml ; do \
3036
$(BINARY_YQ) -i e ".metadata.labels.app = \"ces\"" $${file} ;\
31-
$(BINARY_YQ) -i e ".metadata.labels.\"app.kubernetes.io/name\" = \"${ARTIFACT_ID}\"" $${file} ;\
37+
$(BINARY_YQ) -i e ".metadata.labels.\"app.kubernetes.io/name\" = \"${ARTIFACT_CRD_ID}\"" $${file} ;\
3238
done
3339

3440
.PHONY: crd-helm-generate ## Generates the Helm CRD chart

‎build/make/k8s.mk‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ K3S_LOCAL_REGISTRY_PORT?=30099
3636

3737
# The URL of the container-registry to use. Defaults to the registry of the local-cluster.
3838
# If RUNTIME_ENV is "remote" it is "registry.cloudogu.com/testing"
39-
CES_REGISTRY_HOST?="${K3S_CLUSTER_FQDN}:${K3S_LOCAL_REGISTRY_PORT}"
39+
CES_REGISTRY_HOST?=${K3S_CLUSTER_FQDN}:${K3S_LOCAL_REGISTRY_PORT}
4040
CES_REGISTRY_NAMESPACE ?=
4141
ifeq (${RUNTIME_ENV}, remote)
42-
CES_REGISTRY_HOST="registry.cloudogu.com"
43-
CES_REGISTRY_NAMESPACE="/testing"
42+
CES_REGISTRY_HOST=registry.cloudogu.com
43+
CES_REGISTRY_NAMESPACE=/testing
4444
endif
4545
$(info CES_REGISTRY_HOST=$(CES_REGISTRY_HOST))
4646

‎build/make/mocks.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
##@ Mocking
22

33
MOCKERY_BIN=${UTILITY_BIN_PATH}/mockery
4-
MOCKERY_VERSION?=v2.42.1
4+
MOCKERY_VERSION?=v2.53.3
55
MOCKERY_YAML=${WORKDIR}/.mockery.yaml
66

77
${MOCKERY_BIN}: ${UTILITY_BIN_PATH}

‎build/make/prerelease.mk‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# used to create switch the dogu to a prerelease namespace
2+
# e.g. official/usermgmt -> prerelease_official/usermgmt
3+
4+
.PHONY: prerelease_namespace
5+
prerelease_namespace:
6+
build/make/prerelease.sh prerelease_namespace

‎build/make/prerelease.sh‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
#!/bin/bash
2+
set -o errexit
3+
set -o nounset
4+
set -o pipefail
5+
6+
prerelease_namespace() {
7+
8+
TIMESTAMP=$(date +"%Y%m%d%H%M%S")
9+
10+
# Update version in dogu.json
11+
if [ -f "dogu.json" ]; then
12+
echo "Updating name in dogu.json..."
13+
ORIG_NAME="$(jq -r ".Name" ./dogu.json)"
14+
ORIG_VERSION="$(jq -r ".Version" ./dogu.json)"
15+
PRERELEASE_NAME="prerelease_${ORIG_NAME}"
16+
PRERELEASE_VERSION="${ORIG_VERSION}${TIMESTAMP}"
17+
jq ".Name = \"${PRERELEASE_NAME}\"" dogu.json >dogu2.json && mv dogu2.json dogu.json
18+
jq ".Version = \"${PRERELEASE_VERSION}\"" dogu.json >dogu2.json && mv dogu2.json dogu.json
19+
jq ".Image = \"registry.cloudogu.com/${PRERELEASE_NAME}\"" dogu.json >dogu2.json && mv dogu2.json dogu.json
20+
fi
21+
22+
# Update version in Dockerfile
23+
if [ -f "Dockerfile" ]; then
24+
echo "Updating version in Dockerfile..."
25+
LABEL_BLOCK=$(sed -n '/^LABEL[[:space:]]/ {N; /NAME=".*"/ {N; /VERSION=".*"/ {p}}}' Dockerfile)
26+
27+
# Extract NAME and VERSION from the LABEL block
28+
ORIG_NAME=$(echo "$LABEL_BLOCK" | sed -n 's/.*NAME="\([^"]*\)".*/\1/p')
29+
ORIG_VERSION=$(echo "$LABEL_BLOCK" | sed -n 's/.*VERSION="\([^"]*\)".*/\1/p')
30+
31+
# Output the extracted values for debugging
32+
echo "ORIG_NAME Dockerfile: ${ORIG_NAME}"
33+
echo "ORIG_VERSION Dockerfile: ${ORIG_VERSION}"
34+
35+
# Prepare prerelease name and version
36+
PRERELEASE_NAME="prerelease_$(echo -e "$ORIG_NAME" | sed 's/\//\\\//g')"
37+
PRERELEASE_VERSION="${ORIG_VERSION}${TIMESTAMP}"
38+
39+
# Output the new values for debugging
40+
echo "PRERELEASE_NAME Dockerfile: ${PRERELEASE_NAME}"
41+
echo "PRERELEASE_VERSION Dockerfile: ${PRERELEASE_VERSION}"
42+
43+
# Only replace NAME= and VERSION= and only inside the LABEL block
44+
# This assumes LABEL block is between 'LABEL' and first non-indented line
45+
sed -i '/^LABEL/,/^[^[:space:]]/ {
46+
s/\(NAME="\)[^"]*\("\)/\1'"${PRERELEASE_NAME}"'\2/
47+
s/\(VERSION="\)[^"]*\("\)/\1'"${PRERELEASE_VERSION}"'\2/
48+
}' Dockerfile
49+
fi
50+
51+
}
52+
53+
54+
TYPE="${1}"
55+
56+
echo ${TYPE}
57+
if [[ "${TYPE}" == "prerelease_namespace" ]];then
58+
prerelease_namespace
59+
fi

‎build/make/release.mk‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
.PHONY: dogu-release
66
dogu-release: ## Start a dogu release
7-
build/make/release.sh dogu
7+
build/make/release.sh dogu "${FIXED_CVE_LIST}" $(DRY_RUN)
88

99
.PHONY: node-release
1010
node-release: ## Start a node package release
@@ -14,6 +14,10 @@ node-release: ## Start a node package release
1414
go-release: ## Start a go tool release
1515
build/make/release.sh go-tool
1616

17+
.PHONY: image-release
18+
image-release: ## Start a go tool release
19+
build/make/release.sh image
20+
1721
.PHONY: dogu-cve-release
1822
dogu-cve-release: ## Start a dogu release of a new build if the local build fixes critical CVEs
1923
@bash -c "build/make/release_cve.sh \"${REGISTRY_USERNAME}\" \"${REGISTRY_PASSWORD}\" \"${TRIVY_IMAGE_SCAN_FLAGS}\" \"${DRY_RUN}\" \"${CVE_SEVERITY}\""

0 commit comments

Comments
 (0)