New flag to omit namespace prefix from workspace name

api/v1alpha1/workspace_types.go

@@ -138,6 +138,9 @@ type WorkspaceSpec struct {
 	// Notification configuration
 	// +optional
 	Notifications []*Notification `json:"notifications,omitempty"`
+	// Omit namespace prefix in workspace name
+	// +optional
+	OmitNamespacePrefix bool `json:"omitNamespacePrefix,omitempty"`
 }
 
 // WorkspaceStatus defines the observed state of Workspace

config/crd/bases/app.terraform.io_workspaces.yaml

@@ -99,6 +99,9 @@ spec:
                 - type
                 type: object
               type: array
+            omitNamespacePrefix:
+              description: Omit namespace prefix in workspace name
+              type: boolean
             organization:
               description: Terraform Cloud organization
               type: string

workspacehelper/workspace_helper.go

@@ -126,6 +126,10 @@ func (r *WorkspaceHelper) initializeReconciliation(request reconcile.Request) (*
 
 func (r *WorkspaceHelper) reconcileWorkspace(instance *appv1alpha1.Workspace) error {
 	workspace := fmt.Sprintf("%s-%s", instance.Namespace, instance.Name)
+	if instance.Spec.OmitNamespacePrefix {
+		workspace = fmt.Sprintf("%s", instance.Name)
+	}
+
 	organization := instance.Spec.Organization
 
 	ws, err := r.tfclient.CheckWorkspace(workspace, instance)
@@ -280,6 +284,9 @@ func (r *WorkspaceHelper) updateTerraformTemplate(instance *appv1alpha1.Workspac
 
 func (r *WorkspaceHelper) updateVariables(instance *appv1alpha1.Workspace) (bool, error) {
 	workspace := fmt.Sprintf("%s-%s", instance.Namespace, instance.Name)
+	if instance.Spec.OmitNamespacePrefix {
+		workspace = fmt.Sprintf("%s", instance.Name)
+	}
 
 	for _, variable := range instance.Spec.Variables {
 		err := r.GetConfigMapForVariable(instance.Namespace, variable)
@@ -300,6 +307,9 @@ func (r *WorkspaceHelper) updateVariables(instance *appv1alpha1.Workspace) (bool
 
 func (r *WorkspaceHelper) updateRunTriggers(instance *appv1alpha1.Workspace) (bool, error) {
 	workspace := fmt.Sprintf("%s-%s", instance.Namespace, instance.Name)
+	if instance.Spec.OmitNamespacePrefix {
+		workspace = fmt.Sprintf("%s", instance.Name)
+	}
 
 	updatedRunTriggers, err := r.tfclient.CheckRunTriggers(workspace, instance.Spec.RunTriggers)
 	if err != nil {