Merge branch 'release/v3.0.1' into main

CHANGELOG.md

@@ -7,6 +7,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [v3.0.1] - 2024-10-30
+### Fixed
+- [#108] Use newest cesapp-lib version (v0.14.3) to fix dogu sorting bug 
+
 ## [v3.0.0] - 2024-10-25
 ### Changed
 - [#105] **Breaking:** The name of the Secret for container credentials was renamed from `k8s-dogu-operator-docker-registry` to `ces-container-registries`.

Dockerfile

@@ -30,7 +30,7 @@ RUN make compile-generic
 FROM gcr.io/distroless/static:nonroot
 LABEL maintainer="hello@cloudogu.com" \
       NAME="k8s-ces-setup" \
-      VERSION="3.0.0"
+      VERSION="3.0.1"
 
 WORKDIR /
 

Makefile

@@ -1,6 +1,6 @@
 # Set these to the desired values
 ARTIFACT_ID=k8s-ces-setup
-VERSION=3.0.0
+VERSION=3.0.1
 
 GOTAG?=1.23.2
 MAKEFILES_VERSION=9.3.2
@@ -67,7 +67,8 @@ helm-values-update-image-version: $(BINARY_YQ)
 helm-values-replace-image-repo: $(BINARY_YQ)
 	@if [[ ${STAGE} == "development" ]]; then \
       		echo "Setting dev image repo in target values.yaml!" ;\
-    		$(BINARY_YQ) -i e ".setup.image.repository=\"${IMAGE_DEV}\"" "${K8S_COMPONENT_TARGET_VALUES}" ;\
+    		$(BINARY_YQ) -i e ".setup.image.registry=\"$(shell echo '${IMAGE_DEV}' | sed 's/\([^\/]*\)\/\(.*\)/\1/')\"" ${K8S_COMPONENT_TARGET_VALUES} ;\
+    		$(BINARY_YQ) -i e ".setup.image.repository=\"$(shell echo '${IMAGE_DEV}' | sed 's/\([^\/]*\)\/\(.*\)/\2/')\"" ${K8S_COMPONENT_TARGET_VALUES} ;\
     	fi
 
 .PHONY: template-stage

docs/development/setup_architecture_de.md

@@ -13,7 +13,7 @@ Das automatische Setup einer CES-Instanz ganz ohne weitere Benutzerinteraktion (
 **Voraussetzungen für ein unattended Setup:**
 1. Dogu-Operator-Credentials wird als Secrets bereitgestellt
    * [Dogu-Registry credentials](https://github.com/cloudogu/k8s-dogu-operator/blob/develop/docs/operations/configuring_the_dogu_registry_de.md) 
-   * [Image-Instanz credentials](https://github.com/cloudogu/k8s-dogu-operator/blob/develop/docs/operations/configuring_the_docker_registry_de.md) 
+   * [Image-Instanz credentials](https://github.com/cloudogu/k8s-dogu-operator/blob/develop/docs/operations/configuring_the_container_registry_de.md) 
 2. Komponenten-Operator-Config wird bereitgestellt
    * [Helm-Repository-credentials](../operations/installation_guide_de.md#setup-ausbringen)
    * [Helm-Repository-config](../operations/installation_guide_de.md#setup-ausbringen)

docs/development/setup_architecture_en.md

@@ -13,7 +13,7 @@ The automatic setup of a CES instance completely without further user interactio
 **Requirements for an unattended setup:**.
 1. dogu operator credentials is provided as Secrets.
     * [Dogu registry credentials](https://github.com/cloudogu/k8s-dogu-operator/blob/develop/docs/operations/configuring_the_dogu_registry_en.md)
-    * [Image-Instance credentials](https://github.com/cloudogu/k8s-dogu-operator/blob/develop/docs/operations/configuring_the_docker_registry_en.md)
+    * [Image-Instance credentials](https://github.com/cloudogu/k8s-dogu-operator/blob/develop/docs/operations/configuring_the_container_registry_en.md)
 2. component-operator-config is provided.
     * [Helm-Repository-credentials](../operations/installation_guide_en.md#deploy-setup)
     * [helmet-repository-config](../operations/installation_guide_en.md#deploy-setup)

go.mod

@@ -3,7 +3,7 @@ module github.com/cloudogu/k8s-ces-setup
 go 1.23.2
 
 require (
-	github.com/cloudogu/cesapp-lib v0.14.2
+	github.com/cloudogu/cesapp-lib v0.14.3
 	github.com/cloudogu/k8s-apply-lib v0.5.0
 	github.com/cloudogu/k8s-component-operator v1.1.1
 	github.com/cloudogu/k8s-dogu-operator/v2 v2.2.1

go.sum

@@ -63,10 +63,8 @@ github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d h1:77cEq6EriyTZ
 github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpVsBuRksnlj1mLy4AWzRNQYxauNi62uWcE3to6eA=
 github.com/chenzhuoyu/iasm v0.9.0 h1:9fhXjVzq5hUy2gkhhgHl95zG2cEAhw9OSGs8toWWAwo=
 github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog=
-github.com/cloudogu/cesapp-lib v0.0.0-20241018080030-ce0f66e55342 h1:R9lQwLtLptZh3W+jwWs9BLihAMHaPD65TF89uccZtBc=
-github.com/cloudogu/cesapp-lib v0.0.0-20241018080030-ce0f66e55342/go.mod h1:52PfkrFYg54FjF8Se8P9b1zOfAhmg3PBFKr7YfS+Q+8=
-github.com/cloudogu/cesapp-lib v0.14.2 h1:AtRsQbS31d71DY7DXUhzwO07ZFI0Gz2+IHOhyeJdBhc=
-github.com/cloudogu/cesapp-lib v0.14.2/go.mod h1:52PfkrFYg54FjF8Se8P9b1zOfAhmg3PBFKr7YfS+Q+8=
+github.com/cloudogu/cesapp-lib v0.14.3 h1:2AuDexSJ5puas6+u/auLa5FZTUY4qsaWXRlPbxeilzY=
+github.com/cloudogu/cesapp-lib v0.14.3/go.mod h1:52PfkrFYg54FjF8Se8P9b1zOfAhmg3PBFKr7YfS+Q+8=
 github.com/cloudogu/k8s-apply-lib v0.5.0 h1:XeQKwTgT8FIozpqyPO/b09LAenPswBilmatw/+1L4fI=
 github.com/cloudogu/k8s-apply-lib v0.5.0/go.mod h1:jR/+7q47O5gb++4gVsmEElT8/EJoi+Msw2dVzArTPW0=
 github.com/cloudogu/k8s-component-operator v1.1.1 h1:Rp+Ew98ihsLVRMduG2fFAGsNESgFNERcpL6CaDf2Uo0=

k8s/helm/component-patch-tpl.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 values:
   images:
-    k8sCesSetup: cloudogu/k8s-ces-setup:3.0.0
+    k8sCesSetup: cloudogu/k8s-ces-setup:3.0.1
     kubectl: bitnami/kubectl:1.27.4
 patches:
   values.yaml:

k8s/helm/values.yaml

@@ -8,7 +8,7 @@ setup:
   image:
     registry: docker.io
     repository: cloudogu/k8s-ces-setup
-    tag: 3.0.0
+    tag: 3.0.1
   imagePullPolicy: IfNotPresent
 # Chart of the component operator
 # Format: <namespace>/<name>:<version>