Merge branch 'release/v0.14.3' into main

CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v0.14.3] - 2023-10-02
+### Fixed
+- [#44] Fix a bug where the service discovery only updated one single ingress switching maintenance mode.
+
 ## [v0.14.2] - 2023-09-20
 ### Changed
 - [#38] updated go dependencies

Dockerfile

@@ -31,7 +31,7 @@ RUN make compile-generic
 FROM gcr.io/distroless/static:nonroot
 LABEL maintainer="[email protected]" \
       NAME="k8s-service-discovery" \
-      VERSION="0.14.2"
+      VERSION="0.14.3"
 
 WORKDIR /
 

Makefile

@@ -1,6 +1,6 @@
 # Set these to the desired values
 ARTIFACT_ID=k8s-service-discovery
-VERSION=0.14.2
+VERSION=0.14.3
 
 ## Image URL to use all building/pushing image targets
 IMAGE_DEV=${K3CES_REGISTRY_URL_PREFIX}/${ARTIFACT_ID}:${VERSION}

config/manager/kustomization.yaml

@@ -11,4 +11,4 @@ kind: Kustomization
 images:
   - name: controller
     newName: cloudogu/k8s-service-discovery
-    newTag: 0.14.2
+    newTag: 0.14.3

controllers/maintenanceModeUpdater.go

@@ -167,7 +167,8 @@ func (scu *maintenanceModeUpdater) getAllServices(ctx context.Context) (v1Servic
 
 	var modifiableServiceList v1ServiceList
 	for _, svc := range serviceList.Items {
-		modifiableServiceList = append(modifiableServiceList, &svc)
+		copySvc := svc
+		modifiableServiceList = append(modifiableServiceList, &copySvc)
 	}
 
 	return modifiableServiceList, nil

controllers/maintenanceModeUpdater_test.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"context"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 	"testing"
 	"time"
 
@@ -487,6 +488,32 @@ func Test_maintenanceModeUpdater_getAllServices(t *testing.T) {
 		assert.ErrorIs(t, err, assert.AnError)
 		assert.ErrorContains(t, err, "failed to get list of all services in namespace [el-espacio-del-nombre]:")
 	})
+
+	t.Run("should return multiple services", func(t *testing.T) {
+		// given
+		clientMock := newMockK8sClient(t)
+		serviceA := corev1.Service{ObjectMeta: metav1.ObjectMeta{Name: "A and not equal B"}}
+		serviceB := corev1.Service{ObjectMeta: metav1.ObjectMeta{Name: "B and not equal A"}}
+		services := []corev1.Service{serviceA, serviceB}
+		serviceList := &corev1.ServiceList{Items: services}
+		clientMock.EXPECT().List(testCtx, mock.Anything, mock.Anything).Run(func(ctx context.Context, list client.ObjectList, opts ...client.ListOption) {
+			c := list.(*corev1.ServiceList)
+			c.Items = serviceList.Items
+		}).Return(nil)
+
+		sut := &maintenanceModeUpdater{
+			client:    clientMock,
+			namespace: "el-espacio-del-nombre",
+		}
+
+		// when
+		result, err := sut.getAllServices(testCtx)
+
+		// then
+		require.NoError(t, err)
+		assert.Len(t, result, 2)
+		assert.NotEqual(t, result[0].Name, result[1].Name)
+	})
 }
 
 func Test_maintenanceModeUpdater_deactivateMaintenanceMode(t *testing.T) {