Merge branch 'release/v1.7.2'

Author: nhinze23

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v1.7.2] - 2025-09-17
+### Fixed
+- [#71] remove unused maintenance mode code.
+
 ## [v1.7.1] - 2025-08-29
 ### Fixed
 - [#70] use UnixMilli instead of Unix Time for DebugMode Status request

Dockerfile

@@ -31,7 +31,7 @@ WORKDIR ${WORKDIR}
 
 LABEL maintainer="hello@cloudogu.com" \
     NAME="k8s-ces-control" \
-    VERSION="1.7.0"
+    VERSION="1.7.2"
 
 COPY --from=backendbuilder /k8s-ces-control/target/k8s-ces-control ${WORKDIR}/k8s-ces-control
 

Jenkinsfile

@@ -90,12 +90,11 @@ node('docker') {
             stage('Setup') {
                 k3d.configureComponents(["k8s-minio":    ["version": "latest", "helmRepositoryNamespace": "k8s"],
                                          "k8s-loki":     ["version": "latest", "helmRepositoryNamespace": "k8s"],
-                                         "k8s-promtail": ["version": "latest", "helmRepositoryNamespace": "k8s"],
                                          "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')
+                k3d.setup('4.2.0')
             }
 
             stage("Wait for Setup") {

Makefile

@@ -1,6 +1,6 @@
 # Set these to the desired values
 ARTIFACT_ID=k8s-ces-control
-VERSION=1.7.1
+VERSION=1.7.2
 GOTAG=1.24.3
 STAGE?=production
 LOG_LEVEL?=info

k8s/helm/component-patch-tpl.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 values:
   images:
-    cesControl: cloudogu/k8s-ces-control:1.7.0
+    cesControl: cloudogu/k8s-ces-control:1.7.2
 patches:
   values.yaml:
     manager:

k8s/helm/values.yaml

@@ -8,7 +8,7 @@ manager:
   image:
     registry: docker.io
     repository: cloudogu/k8s-ces-control
-    tag: 1.7.0
+    tag: 1.7.2
   imagePullPolicy: IfNotPresent
   replicas: 1
   env:

packages/debug/service.go

@@ -2,26 +2,18 @@ package debug
 
 import (
 	"context"
-	"errors"
 	"fmt"
+	"time"
+
 	v1 "github.com/cloudogu/k8s-debug-mode-cr-lib/api/v1"
 	"github.com/sirupsen/logrus"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"time"
 
 	pbMaintenance "github.com/cloudogu/ces-control-api/generated/maintenance"
 	"github.com/cloudogu/ces-control-api/generated/types"
 )
 
-const (
-	maintenanceTitle          = "Service unavailable"
-	activateMaintenanceText   = "Activating debug mode"
-	deactivateMaintenanceText = "Deactivating debug mode"
-	logLevelDebug             = "DEBUG"
-	interErrMsg               = "internal error"
-)
-
 type defaultDebugModeService struct {
 	pbMaintenance.UnimplementedDebugModeServer
 	debugModeClient       debugModeInterface
@@ -80,36 +72,6 @@ func (s *defaultDebugModeService) Enable(ctx context.Context, req *pbMaintenance
 	return &types.BasicResponse{}, nil
 }
 
-func (s *defaultDebugModeService) rollbackRestoreStartDisable(ctx context.Context, err error) error {
-	startErr := s.doguInterActor.StartAllDogus(ctx)
-	if startErr != nil {
-		err = errors.Join(wrapRollBackErr(startErr), err)
-	}
-
-	return s.rollbackRestoreDisable(ctx, err)
-}
-
-func (s *defaultDebugModeService) rollbackRestoreDisable(ctx context.Context, err error) error {
-	restoreErr := s.debugModeRegistry.RestoreDoguLogLevels(ctx)
-	if restoreErr != nil {
-		err = errors.Join(wrapRollBackErr(restoreErr), err)
-	}
-
-	return s.rollbackDisable(ctx, err)
-}
-
-func (s *defaultDebugModeService) rollbackDisable(ctx context.Context, err error) error {
-	rollbackErr := s.debugModeRegistry.Disable(ctx)
-	if rollbackErr != nil {
-		err = errors.Join(wrapRollBackErr(rollbackErr), err)
-	}
-	return err
-}
-
-func wrapRollBackErr(err error) error {
-	return fmt.Errorf("rollback error: %w", err)
-}
-
 // Disable returns an error because the method is unimplemented.
 func (s *defaultDebugModeService) Disable(ctx context.Context, _ *pbMaintenance.ToggleDebugModeRequest) (*types.BasicResponse, error) {
 	logrus.Info("Starting to disable debug-mode...")

packages/doguinteraction/doguinteractor_test.go

@@ -393,10 +393,12 @@ func Test_defaultDoguInterActor_StartDoguWithWait(t *testing.T) {
 		doguClientMock.EXPECT().Watch(mock.Anything, metav1.ListOptions{FieldSelector: "metadata.name=postgresql"}).Return(watcher, nil).Run(
 			func(watchCtx context.Context, opts metav1.ListOptions) {
 				callCtx = watchCtx
+				time.Sleep(2 * time.Second)
 				watcher.Stop()
 			})
 
 		go func() {
+			time.Sleep(1 * time.Second)
 			watcher.Action(watch.Modified, expectedUpdateDogu)
 		}()
 
@@ -500,7 +502,7 @@ func Test_defaultDoguInterActor_StartAllDogus(t *testing.T) {
 			redmineWatcher := watch.NewFake()
 			doguClientMock.EXPECT().Watch(mock.Anything, metav1.ListOptions{FieldSelector: "metadata.name=redmine"}).Return(redmineWatcher, nil)
 			go func() {
-				time.Sleep(1 * time.Second)
+				time.Sleep(2 * time.Second)
 				redmineWatcher.Action(watch.Modified, redmineDogu)
 			}()
 		})