Fix tests after rebasing on main

* Test new ServiceAccount behavior (role binds to individual
  serviceaccounts rather than all SAs in namespace)
* Set default PodSecurityContext when using a config for testing to
  accomodate changes around how PodSecurityContext is handled in
  OpenShift

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

Author: amisevsk

controllers/workspace/devworkspace_controller_test.go

@@ -177,6 +177,7 @@ var _ = Describe("DevWorkspace Controller", func() {
 		})
 
 		It("Creates roles and rolebindings", func() {
+			devworkspace := getExistingDevWorkspace(devWorkspaceName)
 			By("Checking that common role is created")
 			dwRole := &rbacv1.Role{}
 			Eventually(func() bool {
@@ -196,9 +197,9 @@ var _ = Describe("DevWorkspace Controller", func() {
 			}, timeout, interval).Should(BeTrue(), "Common RoleBinding should be created for DevWorkspace")
 			Expect(dwRoleBinding.RoleRef.Name).Should(Equal(dwRole.Name), "Rolebinding should refer to DevWorkspace role")
 			expectedSubject := rbacv1.Subject{
-				APIGroup: "rbac.authorization.k8s.io",
-				Kind:     "Group",
-				Name:     fmt.Sprintf("system:serviceaccounts:%s", testNamespace),
+				Kind:      rbacv1.ServiceAccountKind,
+				Name:      common.ServiceAccountName(&common.DevWorkspaceWithConfig{DevWorkspace: devworkspace, Config: testControllerCfg}),
+				Namespace: testNamespace,
 			}
 			Expect(dwRoleBinding.Subjects).Should(ContainElement(expectedSubject), "Rolebinding should bind to serviceaccounts in current namespace")
 		})
@@ -272,7 +273,7 @@ var _ = Describe("DevWorkspace Controller", func() {
 
 			sa := &corev1.ServiceAccount{}
 			Eventually(func() error {
-				saNN := namespacedName(common.ServiceAccountName(workspaceID), testNamespace)
+				saNN := namespacedName(common.ServiceAccountName(&common.DevWorkspaceWithConfig{DevWorkspace: devworkspace, Config: testControllerCfg}), testNamespace)
 				return k8sClient.Get(ctx, saNN, sa)
 			}, timeout, interval).Should(Succeed(), "Should create DevWorkspace ServiceAccount")
 

controllers/workspace/suite_test.go

@@ -27,6 +27,7 @@ import (
 	"github.com/devfile/devworkspace-operator/controllers/workspace/internal/testutil"
 	appsv1 "k8s.io/api/apps/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/utils/pointer"
 	"sigs.k8s.io/yaml"
 
 	workspacecontroller "github.com/devfile/devworkspace-operator/controllers/workspace"
@@ -37,7 +38,6 @@ import (
 	. "github.com/onsi/gomega"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/kubernetes/scheme"
-	"k8s.io/client-go/rest"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
@@ -51,16 +51,17 @@ const (
 )
 
 var (
-	cfg               *rest.Config
 	k8sClient         client.Client
 	testEnv           *envtest.Environment
 	ctx               context.Context
 	cancel            context.CancelFunc
-	testControllerCfg = &controllerv1alpha1.OperatorConfiguration{
+	testControllerCfg = config.GetConfigForTesting(&controllerv1alpha1.OperatorConfiguration{
+		Workspace: &controllerv1alpha1.WorkspaceConfig{},
 		Routing: &controllerv1alpha1.RoutingConfig{
 			ClusterHostSuffix: "test-environment-cluster-suffix",
 		},
-	}
+		EnableExperimentalFeatures: pointer.Bool(true),
+	})
 )
 
 func TestAPIs(t *testing.T) {
@@ -93,6 +94,7 @@ var _ = BeforeSuite(func() {
 	Expect(cfg).NotTo(BeNil())
 
 	infrastructure.InitializeForTesting(infrastructure.Kubernetes)
+	config.SetGlobalConfigForTesting(testControllerCfg)
 
 	err = controllerv1alpha1.AddToScheme(scheme.Scheme)
 	Expect(err).NotTo(HaveOccurred())
@@ -125,8 +127,6 @@ 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{

pkg/config/sync.go

@@ -99,6 +99,7 @@ func GetConfigForTesting(customConfig *controller.OperatorConfiguration) *contro
 func SetGlobalConfigForTesting(testConfig *controller.OperatorConfiguration) {
 	configMutex.Lock()
 	defer configMutex.Unlock()
+	setDefaultPodSecurityContext()
 	internalConfig = defaultConfig.DeepCopy()
 	mergeConfig(testConfig, internalConfig)
 }

pkg/provision/workspace/deployment.go

@@ -94,7 +94,6 @@ func SyncDeploymentToCluster(
 		return DeploymentProvisioningStatus{ProvisioningStatus{Err: err}}
 	}
 	clusterDeployment := clusterObj.(*appsv1.Deployment)
-
 	deploymentReady := status.CheckDeploymentStatus(clusterDeployment)
 	if deploymentReady {
 		return DeploymentProvisioningStatus{