Merge branch 'release/v0.41.0' into main

cloudogu · Jan 23, 2024 · 06aafbe · 06aafbe
2 parents dd2954b + c5922ca
commit 06aafbe
Show file tree

Hide file tree

Showing 13 changed files with 498 additions and 225 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v0.41.0] - 2024-01-23
+### Changed
+- Update go dependencies
+- Particularly update the k8s-libraries to v0.29.1
+- [#141] Improve documentation for running an offline Cloudogu EcoSystem.
+
 ## [v0.40.0] - 2024-01-03
 ### Added
 - [#143] Track health on dogu CR

diff --git a/Dockerfile b/Dockerfile
@@ -38,7 +38,7 @@ RUN make compile-generic
 FROM gcr.io/distroless/static:nonroot
 LABEL maintainer="hello@cloudogu.com" \
       NAME="k8s-dogu-operator" \
-      VERSION="0.40.0"
+      VERSION="0.41.0"
 
 WORKDIR /
 COPY --from=builder /workspace/target/k8s-dogu-operator .

diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 # Set these to the desired values
 ARTIFACT_ID=k8s-dogu-operator
-VERSION=0.40.0
+VERSION=0.41.0
 
 IMAGE=cloudogu/${ARTIFACT_ID}:${VERSION}
 GOTAG=1.21

diff --git a/controllers/doguVolumeManager_test.go b/controllers/doguVolumeManager_test.go
@@ -201,7 +201,7 @@ func Test_editPVCStep_Execute(t *testing.T) {
 		dogu.Spec.Resources.DataVolumeSize = "1Gi"
 		requests := make(map[corev1.ResourceName]resource.Quantity)
 		requests[corev1.ResourceStorage] = resource.MustParse("0.5Gi")
-		doguPvc := &corev1.PersistentVolumeClaim{ObjectMeta: *dogu.GetObjectMeta(), Spec: corev1.PersistentVolumeClaimSpec{Resources: corev1.ResourceRequirements{Requests: requests}}}
+		doguPvc := &corev1.PersistentVolumeClaim{ObjectMeta: *dogu.GetObjectMeta(), Spec: corev1.PersistentVolumeClaimSpec{Resources: corev1.VolumeResourceRequirements{Requests: requests}}}
 		client := fake.NewClientBuilder().WithObjects(doguPvc).Build()
 		recorder := extMocks.NewEventRecorder(t)
 		recorder.On("Event", dogu, "Normal", "VolumeExpansion", "Update dogu data PVC request storage...")
@@ -266,7 +266,7 @@ func Test_checkIfPVCIsResizedStep_execute(t *testing.T) {
 		requests := map[corev1.ResourceName]resource.Quantity{}
 		requests[corev1.ResourceStorage] = resource.MustParse("1Gi")
 		doguPvc := &corev1.PersistentVolumeClaim{ObjectMeta: *dogu.GetObjectMeta(), Status: corev1.PersistentVolumeClaimStatus{Capacity: requests}, Spec: corev1.PersistentVolumeClaimSpec{
-			Resources: corev1.ResourceRequirements{Requests: requests}}}
+			Resources: corev1.VolumeResourceRequirements{Requests: requests}}}
 		client := fake.NewClientBuilder().WithObjects(doguPvc).Build()
 		recorder := extMocks.NewEventRecorder(t)
 		recorder.On("Event", dogu, "Normal", "VolumeExpansion", "Wait for pvc to be resized...")
@@ -294,7 +294,7 @@ func Test_checkIfPVCIsResizedStep_execute(t *testing.T) {
 				},
 			},
 			Spec: corev1.PersistentVolumeClaimSpec{
-				Resources: corev1.ResourceRequirements{Requests: requests},
+				Resources: corev1.VolumeResourceRequirements{Requests: requests},
 			},
 		}
 		client := fake.NewClientBuilder().WithObjects(doguPvc).Build()
@@ -357,7 +357,7 @@ func Test_checkIfPVCIsResizedStep_execute(t *testing.T) {
 				},
 			},
 			Spec: corev1.PersistentVolumeClaimSpec{
-				Resources: corev1.ResourceRequirements{Requests: requests},
+				Resources: corev1.VolumeResourceRequirements{Requests: requests},
 			},
 		}
 		client := fake.NewClientBuilder().WithObjects(doguPvc).Build()
@@ -380,7 +380,7 @@ func Test_checkIfPVCIsResizedStep_execute(t *testing.T) {
 		requests := map[corev1.ResourceName]resource.Quantity{}
 		requests[corev1.ResourceStorage] = resource.MustParse("0.5Gi")
 		doguPvc := &corev1.PersistentVolumeClaim{ObjectMeta: *dogu.GetObjectMeta(), Status: corev1.PersistentVolumeClaimStatus{Capacity: requests}, Spec: corev1.PersistentVolumeClaimSpec{
-			Resources: corev1.ResourceRequirements{Requests: requests}}}
+			Resources: corev1.VolumeResourceRequirements{Requests: requests}}}
 		client := fake.NewClientBuilder().WithObjects(doguPvc).Build()
 		recorder := extMocks.NewEventRecorder(t)
 		recorder.On("Event", dogu, "Normal", "VolumeExpansion", "Wait for pvc to be resized...")
@@ -408,7 +408,7 @@ func Test_checkIfPVCIsResizedStep_execute(t *testing.T) {
 				},
 			},
 			Spec: corev1.PersistentVolumeClaimSpec{
-				Resources: corev1.ResourceRequirements{Requests: requests},
+				Resources: corev1.VolumeResourceRequirements{Requests: requests},
 			},
 		}
 		client := fake.NewClientBuilder().WithObjects(doguPvc).Build()

diff --git a/controllers/dogu_controller_test.go b/controllers/dogu_controller_test.go
@@ -663,7 +663,7 @@ func Test_doguReconciler_checkForVolumeExpansion(t *testing.T) {
 		resources := make(map[v1.ResourceName]resource.Quantity)
 		resources[v1.ResourceStorage] = resource.MustParse("1Gi")
 		pvc := &v1.PersistentVolumeClaim{ObjectMeta: *doguCr.GetObjectMeta(),
-			Spec: v1.PersistentVolumeClaimSpec{Resources: v1.ResourceRequirements{Requests: resources}}}
+			Spec: v1.PersistentVolumeClaimSpec{Resources: v1.VolumeResourceRequirements{Requests: resources}}}
 		sut := &doguReconciler{client: fake.NewClientBuilder().WithObjects(pvc).Build()}
 
 		// when
@@ -682,7 +682,7 @@ func Test_doguReconciler_checkForVolumeExpansion(t *testing.T) {
 		resources := make(map[v1.ResourceName]resource.Quantity)
 		resources[v1.ResourceStorage] = resource.MustParse("2Gi")
 		pvc := &v1.PersistentVolumeClaim{ObjectMeta: *doguCr.GetObjectMeta(),
-			Spec: v1.PersistentVolumeClaimSpec{Resources: v1.ResourceRequirements{Requests: resources}}}
+			Spec: v1.PersistentVolumeClaimSpec{Resources: v1.VolumeResourceRequirements{Requests: resources}}}
 		sut := &doguReconciler{client: fake.NewClientBuilder().WithObjects(pvc).Build()}
 
 		// when
@@ -701,7 +701,7 @@ func Test_doguReconciler_checkForVolumeExpansion(t *testing.T) {
 		resources := make(map[v1.ResourceName]resource.Quantity)
 		resources[v1.ResourceStorage] = resource.MustParse("3Gi")
 		pvc := &v1.PersistentVolumeClaim{ObjectMeta: *doguCr.GetObjectMeta(),
-			Spec: v1.PersistentVolumeClaimSpec{Resources: v1.ResourceRequirements{Requests: resources}}}
+			Spec: v1.PersistentVolumeClaimSpec{Resources: v1.VolumeResourceRequirements{Requests: resources}}}
 		sut := &doguReconciler{client: fake.NewClientBuilder().WithObjects(pvc).Build()}
 
 		// when

diff --git a/controllers/resource/volumeGenerator.go b/controllers/resource/volumeGenerator.go
@@ -246,7 +246,7 @@ func (r *resourceGenerator) createPVC(pvcName string, doguResource *k8sv1.Dogu,
 
 	pvc.Spec = corev1.PersistentVolumeClaimSpec{
 		AccessModes: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce},
-		Resources: corev1.ResourceRequirements{
+		Resources: corev1.VolumeResourceRequirements{
 			Requests: corev1.ResourceList{
 				corev1.ResourceStorage: size,
 			},