Merge branch 'release/v3.1.0' into main

cloudogu · Nov 27, 2024 · 9888e90 · 9888e90
2 parents c45737a + 07f99a9
commit 9888e90
Show file tree

Hide file tree

Showing 36 changed files with 365 additions and 454 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,6 +14,7 @@
 # Makefiles
 target/
 .env
+additionalValues.yaml
 
 # Dependency directories (remove the comment below to include it)
 vendor/

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [v3.1.0] - 2024-11-27
+### Changed
+- [#120] Deactivate service account token automount for default SA
+
 ## [v3.0.6] - 2024-11-27
 ### Changed
 - [#180] Split rbac permissions into separate files

diff --git a/Dockerfile b/Dockerfile
@@ -30,7 +30,7 @@ RUN make compile-generic
 FROM gcr.io/distroless/static:nonroot
 LABEL maintainer="[email protected]" \
       NAME="k8s-ces-setup" \
-      VERSION="3.0.6"
+      VERSION="3.1.0"
 
 WORKDIR /
 

diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 # Set these to the desired values
 ARTIFACT_ID=k8s-ces-setup
-VERSION=3.0.6
+VERSION=3.1.0
 
 GOTAG?=1.23.2
 MAKEFILES_VERSION=9.3.2
@@ -41,7 +41,7 @@ include build/make/digital-signature.mk
 include build/make/mocks.mk
 include build/make/release.mk
 
-BINARY_HELM_ADDITIONAL_UPGR_ARGS=--set-file=setup_json="${WORKDIR}/k8s/dev-resources/setup.json"
+BINARY_HELM_ADDITIONAL_UPGR_ARGS=--set-file=setup_json="${WORKDIR}/k8s/dev-resources/setup.json" --values="${WORKDIR}/additionalValues.yaml"
 
 K8S_COMPONENT_SOURCE_VALUES = ${HELM_SOURCE_DIR}/values.yaml
 K8S_COMPONENT_TARGET_VALUES = ${HELM_TARGET_DIR}/values.yaml

diff --git a/additionalValues.yaml.template b/additionalValues.yaml.template
@@ -0,0 +1,9 @@
+#### README ########################################
+# Copy this file and remove the `.template` to apply additional values that won't be pushed to the repository.
+####################################################
+
+components:
+  k8s-longhorn:
+    version: latest
+    helmRepositoryNamespace: k8s
+    deployNamespace: longhorn-system
diff --git a/app/core/mock_fileClient_test.go b/app/core/mock_fileClient_test.go
diff --git a/app/patch/mock_dynClient_test.go b/app/patch/mock_dynClient_test.go
diff --git a/app/patch/mock_gvrMapper_test.go b/app/patch/mock_gvrMapper_test.go
diff --git a/app/patch/mock_jsonPatchApplier_test.go b/app/patch/mock_jsonPatchApplier_test.go
diff --git a/app/setup/api_test.go b/app/setup/api_test.go
@@ -9,6 +9,8 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 	"io"
+	corev1 "k8s.io/api/core/v1"
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes/fake"
 	"k8s.io/client-go/rest"
 	"net/http/httptest"
@@ -35,7 +37,7 @@ func TestSetupAPI(t *testing.T) {
 			return routesMock
 		})
 		restConfig := &rest.Config{}
-		clientSet := fake.NewSimpleClientset()
+		clientSet := fake.NewClientset()
 
 		setupCtxBuilder := context.NewSetupContextBuilder("development")
 		setupCtxBuilder.DevSetupConfigPath = "invalid"
@@ -71,7 +73,13 @@ func TestSetupAPI(t *testing.T) {
 			return routesMock
 		})
 		restConfig := &rest.Config{}
-		clientSet := fake.NewSimpleClientset()
+		defaultSA := &corev1.ServiceAccount{
+			ObjectMeta: v1.ObjectMeta{
+				Name:      "default",
+				Namespace: "ecosystem",
+			},
+		}
+		clientSet := fake.NewClientset(defaultSA)
 
 		// get project root
 		_, b, _, _ := runtime.Caller(0)
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,6 +14,7 @@ @@
     # Makefiles
     target/
     .env
+    additionalValues.yaml
     # Dependency directories (remove the comment below to include it)
     vendor/
@@ Expand Down @@