Fix workspace controller tests after rebasing on main

Add fixups for tests (originally written in January 2022) to accommodate
changes to DevWorkspace controller functionality since then.

Signed-off-by: Angel Misevski <[email protected]>

Author: amisevsk

Makefile

@@ -234,7 +234,7 @@ $(LOCALBIN):
 CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen
 CONTROLLER_GEN_VERSION = v0.6.1
 ENVTEST ?= $(LOCALBIN)/setup-envtest
-ENVTEST_K8S_VERSION = 1.21.2
+ENVTEST_K8S_VERSION = 1.24.2
 
 ### controller-gen: Finds or downloads controller-gen
 # download controller-gen if necessary

controllers/workspace/devworkspace_controller_test.go

@@ -351,7 +351,6 @@ var _ = Describe("DevWorkspace Controller", func() {
 			gitCredentialsSecretName := "test-git-credentials"
 			gitCredentials := generateSecret(gitCredentialsSecretName, corev1.SecretTypeOpaque)
 			gitCredentials.Labels[constants.DevWorkspaceGitCredentialLabel] = "true"
-			gitCredentials.Annotations[constants.DevWorkspaceMountPathAnnotation] = "/test/path"
 			gitCredentials.Data["credentials"] = []byte("https://username:[email protected]")
 
 			createObject(gitCredentials)
@@ -382,7 +381,7 @@ var _ = Describe("DevWorkspace Controller", func() {
 			}
 			gitConfigVolumeMount := corev1.VolumeMount{
 				Name:      gitconfigVolumeName,
-				ReadOnly:  false,
+				ReadOnly:  true,
 				MountPath: "/etc/gitconfig",
 				SubPath:   "gitconfig",
 			}
@@ -399,8 +398,7 @@ var _ = Describe("DevWorkspace Controller", func() {
 			gitCredentialsVolumeMount := corev1.VolumeMount{
 				Name:      gitCredentialsVolumeName,
 				ReadOnly:  true,
-				MountPath: "/test/path/credentials",
-				SubPath:   "credentials",
+				MountPath: "/.git-credentials/",
 			}
 
 			volumes := deploy.Spec.Template.Spec.Volumes

controllers/workspace/suite_test.go

@@ -85,6 +85,7 @@ var _ = BeforeSuite(func() {
 	testEnv = &envtest.Environment{
 		CRDDirectoryPaths:     []string{filepath.Join("..", "..", "deploy", "templates", "crd", "bases")},
 		ErrorIfCRDPathMissing: true,
+		BinaryAssetsDirectory: filepath.Join("..", "..", "bin", "k8s", "1.24.2-linux-amd64"),
 	}
 
 	cfg, err := testEnv.Start()
@@ -114,8 +115,6 @@ var _ = BeforeSuite(func() {
 		NewCache: cacheFunc,
 	})
 	Expect(err).NotTo(HaveOccurred())
-	// Use default config
-	config.SetConfigForTesting(testControllerCfg)
 
 	nonCachingClient, err := client.New(mgr.GetConfig(), client.Options{Scheme: scheme.Scheme})
 	Expect(err).NotTo(HaveOccurred())
@@ -126,6 +125,8 @@ var _ = BeforeSuite(func() {
 	})
 	Expect(err).NotTo(HaveOccurred())
 
+	config.SetGlobalConfigForTesting(testControllerCfg)
+
 	// Don't set up DevWorkspaceRouting Reconciler so that we can manage routings
 
 	err = (&workspacecontroller.DevWorkspaceReconciler{

controllers/workspace/testdata/test-devworkspace.yaml

@@ -7,6 +7,8 @@ spec:
   started: true
   routingClass: 'basic'
   template:
+    attributes:
+      controller.devfile.io/storage-type: ephemeral
     projects:
       - name: web-nodejs-sample
         git:

pkg/config/sync.go

@@ -96,6 +96,13 @@ func GetConfigForTesting(customConfig *controller.OperatorConfiguration) *contro
 	return testConfig
 }
 
+func SetGlobalConfigForTesting(testConfig *controller.OperatorConfiguration) {
+	configMutex.Lock()
+	defer configMutex.Unlock()
+	internalConfig = defaultConfig.DeepCopy()
+	mergeConfig(testConfig, internalConfig)
+}
+
 func SetupControllerConfig(client crclient.Client) error {
 	if internalConfig != nil {
 		return fmt.Errorf("internal controller configuration is already set up")