Merge branch 'release/v1.6.0'

Author: nhinze23

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v1.6.0] - 2025-08-08
+### Added
+- [#64] Create supportArchive-CRs and download the corresponding support archive when created
+
 ## [v1.5.0] - 2025-07-16
 ### Added
 - [#62] add metadata mapping for logLevel

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.23.5-alpine AS backendbuilder
+FROM golang:1.24.3-alpine AS backendbuilder
 RUN apk add --no-cache build-base git bash
 
 ENV WORKDIR=/k8s-ces-control
@@ -31,7 +31,7 @@ WORKDIR ${WORKDIR}
 
 LABEL maintainer="hello@cloudogu.com" \
     NAME="k8s-ces-control" \
-    VERSION="1.5.0"
+    VERSION="1.6.0"
 
 COPY --from=backendbuilder /k8s-ces-control/target/k8s-ces-control ${WORKDIR}/k8s-ces-control
 

Jenkinsfile

@@ -12,7 +12,7 @@ changelog = new Changelog(this)
 Docker docker = new Docker(this)
 gpg = new Gpg(this, docker)
 Makefile makefile = new Makefile(this)
-goVersion = "1.23.5"
+goVersion = "1.24.3"
 
 // Configuration of repository
 repositoryOwner = "cloudogu"
@@ -91,9 +91,9 @@ node('docker') {
                 k3d.configureComponents(["k8s-minio":    ["version": "latest", "helmRepositoryNamespace": "k8s"],
                                          "k8s-loki":     ["version": "latest", "helmRepositoryNamespace": "k8s"],
                                          "k8s-promtail": ["version": "latest", "helmRepositoryNamespace": "k8s"],
-                                         // TODO Delete blueprint-operator and crd null values if the component runs in multinode.
-                                         "k8s-blueprint-operator": null,
-                                         "k8s-blueprint-operator-crd": null,
+                                         "k8s-prometheus": ["version": "latest", "helmRepositoryNamespace": "k8s", "valuesYamlOverwrite": "kube-prometheus-stack:\n  nodeExporter:\n    enabled: false"],
+                                         "k8s-support-archive-operator-crd": ["version": "latest", "helmRepositoryNamespace": "k8s"],
+                                         "k8s-support-archive-operator": ["version": "latest", "helmRepositoryNamespace": "k8s"]
                 ])
                 k3d.setup('3.2.1')
             }

Makefile

@@ -1,7 +1,7 @@
 # Set these to the desired values
 ARTIFACT_ID=k8s-ces-control
-VERSION=1.5.0
-GOTAG=1.23.5
+VERSION=1.6.0
+GOTAG=1.24.3
 STAGE?=production
 LOG_LEVEL?=info
 

docs/operations/operations_de.md

@@ -3,8 +3,8 @@
 ## Installation
 
 1. Installieren Sie die folgenden Komponenten
-   - [k8s-loki](https://github.com/cloudogu/k8s-loki)
    - [k8s-minio](https://github.com/cloudogu/k8s-minio)
+   - [k8s-loki](https://github.com/cloudogu/k8s-loki)
 2. Installieren Sie k8s-ces-control
 
 Ferner bietet die [Admin-Dogu-Dokumentation](https://github.com/cloudogu/admin/blob/develop/k8s-samples/k8s-admin-dependencies.yaml) eine umfassende Datei, die alle möglichen Abhängigkeiten mit `kubectl apply -f k8s-admin-dependencies.yaml --namespace ecosystem` im Cluster installiert.

docs/operations/operations_en.md

@@ -3,8 +3,8 @@
 ## Installation
 
 1. Install the following components
-   - [k8s-loki](https://github.com/cloudogu/k8s-loki)
    - [k8s-minio](https://github.com/cloudogu/k8s-minio)
+   - [k8s-loki](https://github.com/cloudogu/k8s-loki)
 2. Install k8s-ces-control
 
 Additionally, the [Admin dogu documentation](https://github.com/cloudogu/admin/blob/develop/k8s-samples/k8s-admin-dependencies.yaml) offers a file with all dependencies which need to be installed in the cluster with `kubectl apply -f k8s-admin-dependencies.yaml --namespace ecosystem`.

go.mod

@@ -1,88 +1,89 @@
 module github.com/cloudogu/k8s-ces-control
 
-go 1.23.5
+go 1.24.3
 
-replace github.com/cloudogu/cesapp-lib => github.com/cloudogu/cesapp-lib v0.0.0-20241029151530-f7281943e1fc
+toolchain go1.24.4
 
 require (
 	github.com/bombsimon/logrusr/v2 v2.0.1
-	github.com/cloudogu/ces-control-api v1.3.0
-	github.com/cloudogu/cesapp-lib v0.14.2
-	github.com/cloudogu/k8s-blueprint-operator/v2 v2.0.0
+	github.com/cloudogu/ces-commons-lib v0.2.0
+	github.com/cloudogu/ces-control-api v1.5.0
+	github.com/cloudogu/cesapp-lib v0.18.1
+	github.com/cloudogu/k8s-blueprint-lib v1.3.0
 	github.com/cloudogu/k8s-dogu-operator/v2 v2.3.0
-	github.com/cloudogu/k8s-registry-lib v0.5.0
+	github.com/cloudogu/k8s-registry-lib v0.5.1
+	github.com/cloudogu/k8s-support-archive-lib v0.2.0
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/sirupsen/logrus v1.9.3
 	github.com/stretchr/testify v1.10.0
 	github.com/urfave/cli/v2 v2.27.4
-	google.golang.org/grpc v1.66.1
-	google.golang.org/protobuf v1.34.2
+	google.golang.org/grpc v1.71.0
+	google.golang.org/protobuf v1.36.6
 	gopkg.in/yaml.v3 v3.0.1
-	k8s.io/api v0.31.2
-	k8s.io/apimachinery v0.31.2
-	k8s.io/client-go v0.31.2
-	sigs.k8s.io/controller-runtime v0.19.1
+	k8s.io/api v0.33.0
+	k8s.io/apimachinery v0.33.0
+	k8s.io/client-go v0.33.0
+	sigs.k8s.io/controller-runtime v0.20.4
 )
 
 require (
-	github.com/Masterminds/semver/v3 v3.3.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
+	github.com/cloudogu/retry-lib v0.1.0 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/eapache/go-resiliency v1.7.0 // indirect
-	github.com/emicklei/go-restful/v3 v3.12.1 // indirect
-	github.com/evanphx/json-patch/v5 v5.9.0 // indirect
-	github.com/fsnotify/fsnotify v1.7.0 // indirect
+	github.com/emicklei/go-restful/v3 v3.12.2 // indirect
+	github.com/evanphx/json-patch/v5 v5.9.11 // indirect
+	github.com/fsnotify/fsnotify v1.8.0 // indirect
 	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
 	github.com/gammazero/toposort v0.1.1 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
-	github.com/go-openapi/jsonpointer v0.21.0 // indirect
+	github.com/go-openapi/jsonpointer v0.21.1 // indirect
 	github.com/go-openapi/jsonreference v0.21.0 // indirect
-	github.com/go-openapi/swag v0.23.0 // indirect
+	github.com/go-openapi/swag v0.23.1 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.4 // indirect
-	github.com/google/gnostic-models v0.6.8 // indirect
-	github.com/google/go-cmp v0.6.0 // indirect
-	github.com/google/gofuzz v1.2.0 // indirect
+	github.com/google/btree v1.1.3 // indirect
+	github.com/google/gnostic-models v0.6.9 // indirect
+	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
-	github.com/imdario/mergo v0.3.16 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/compress v1.17.11 // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/mailru/easyjson v0.9.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/prometheus/client_golang v1.20.3 // indirect
+	github.com/prometheus/client_golang v1.20.5 // indirect
 	github.com/prometheus/client_model v0.6.1 // indirect
-	github.com/prometheus/common v0.59.1 // indirect
+	github.com/prometheus/common v0.61.0 // indirect
 	github.com/prometheus/procfs v0.15.1 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/spf13/pflag v1.0.6 // indirect
 	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
 	github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
-	golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect
-	golang.org/x/net v0.34.0 // indirect
-	golang.org/x/oauth2 v0.23.0 // indirect
-	golang.org/x/sys v0.29.0 // indirect
-	golang.org/x/term v0.28.0 // indirect
-	golang.org/x/text v0.21.0 // indirect
-	golang.org/x/time v0.6.0 // indirect
+	golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6 // indirect
+	golang.org/x/net v0.40.0 // indirect
+	golang.org/x/oauth2 v0.28.0 // indirect
+	golang.org/x/sync v0.14.0 // indirect
+	golang.org/x/sys v0.33.0 // indirect
+	golang.org/x/term v0.32.0 // indirect
+	golang.org/x/text v0.25.0 // indirect
+	golang.org/x/time v0.11.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463 // indirect
+	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
-	k8s.io/apiextensions-apiserver v0.31.1 // indirect
+	k8s.io/apiextensions-apiserver v0.32.3 // indirect
 	k8s.io/klog/v2 v2.130.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38 // indirect
-	k8s.io/utils v0.0.0-20240902221715-702e33fdd3c3 // indirect
-	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
+	k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e // indirect
+	sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
+	sigs.k8s.io/randfill v1.0.0 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
 	sigs.k8s.io/yaml v1.4.0 // indirect
 )