Merge branch 'main' of github.com:webmeshproj/webmesh-vdi into rework-ui

webmeshproj · Oct 20, 2023 · 345bb0e · 345bb0e
2 parents 3d724f2 + 52a1673
commit 345bb0e
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 1 deletion.
diff --git a/apis/app/v1/vdicluster_app_util.go b/apis/app/v1/vdicluster_app_util.go
@@ -31,6 +31,9 @@ import (
 
 // GetAppName returns the name of the kVDI app deployment for this VDICluster.
 func (c *VDICluster) GetAppName() string {
+	if c.Spec.App != nil && c.Spec.App.ServiceName != "" {
+		return c.Spec.App.ServiceName
+	}
 	return fmt.Sprintf("%s-app", c.GetName())
 }
 

diff --git a/apis/app/v1/vdicluster_types.go b/apis/app/v1/vdicluster_types.go
@@ -112,6 +112,9 @@ type AppConfig struct {
 	AuditLog bool `json:"auditLog,omitempty"`
 	// The number of app replicas to run
 	Replicas int32 `json:"replicas,omitempty"`
+	// ServiceName is the name of the service to create for the app instance.
+	// Defaults to `{vdi-name}-app`.
+	ServiceName string `json:"serviceName,omitempty"`
 	// The type of service to create in front of the app instance.
 	// Defaults to `LoadBalancer`.
 	ServiceType corev1.ServiceType `json:"serviceType,omitempty"`

diff --git a/config/crd/bases/app.kvdi.io_vdiclusters.yaml b/config/crd/bases/app.kvdi.io_vdiclusters.yaml
@@ -84,6 +84,10 @@ spec:
                       type: string
                     description: Extra annotations to apply to the app service.
                     type: object
+                  serviceName:
+                    description: ServiceName is the name of the service to create
+                      for the app instance. Defaults to `{vdi-name}-app`.
+                    type: string
                   serviceType:
                     description: The type of service to create in front of the app
                       instance. Defaults to `LoadBalancer`.

diff --git a/deploy/bundle.yaml b/deploy/bundle.yaml
@@ -1523,6 +1523,9 @@ spec:
                       type: string
                     description: Extra annotations to apply to the app service.
                     type: object
+                  serviceName:
+                    description: ServiceName is the name of the service to create for the app instance. Defaults to `{vdi-name}-app`.
+                    type: string
                   serviceType:
                     description: The type of service to create in front of the app instance. Defaults to `LoadBalancer`.
                     type: string

diff --git a/pkg/resources/app/app_deployment.go b/pkg/resources/app/app_deployment.go
@@ -103,7 +103,7 @@ func newAppContainerForCR(instance *appv1.VDICluster) corev1.Container {
 	if instance.EnableCORS() {
 		args = append(args, "--enable-cors")
 	}
-	if instance.Spec.App.TLS != nil && instance.Spec.App.TLS.Disable {
+	if instance.Spec.App != nil && instance.Spec.App.TLS != nil && instance.Spec.App.TLS.Disable {
 		args = append(args, "--disable-tls")
 	}
 	return corev1.Container{