noVNC/websockify upgrade, cleanup and healthz

.github/workflows/build-matrix.json

@@ -59,11 +59,6 @@
         "harbor-project": "crownlabs-core"
     },
 
-    {
-        "component": "novnc",
-        "context": "./provisioning/containers/gui-common/novnc",
-        "harbor-project": "crownlabs-container-envs-tools"
-    },
     {
         "component": "tigervnc",
         "context": "./provisioning/containers/gui-common/tigervnc",

deploy/crownlabs/values.yaml

@@ -72,7 +72,6 @@ instance-operator:
       tag: ""
       vncImage: crownlabs/tigervnc
       websockifyImage: crownlabs/websockify
-      novncImage: crownlabs/novnc
       filebrowserImage: filebrowser/filebrowser
       filebrowserImageTag: latest
       instmetricsServerEndpoint: crownlabs-instmetrics.crownlabs-production:9090

operators/pkg/forge/containers.go

@@ -212,7 +212,7 @@ func WebsockifyContainer(opts *ContainerEnvOpts, environment *clv1alpha2.Environ
 	AddContainerArg(&websockifyContainer, "pod-name", fmt.Sprintf("$(%s)", PodNameEnvName))
 	AddContainerArg(&websockifyContainer, "cpu-limit", fmt.Sprintf("$(%s)", AppCPULimitsEnvName))
 	AddContainerArg(&websockifyContainer, "memory-limit", fmt.Sprintf("$(%s)", AppMEMLimitsEnvName))
-	SetContainerReadinessHTTPProbe(&websockifyContainer, GUIPortName, IngressGUICleanPath(instance))
+	SetContainerReadinessHTTPProbe(&websockifyContainer, GUIPortName, HealthzEndpoint)
 	return websockifyContainer
 }
 

operators/pkg/forge/containers_test.go

@@ -388,7 +388,7 @@ var _ = Describe("Containers and Deployment spec forging", func() {
 			Expect(actual.Ports).To(Equal(expected.Ports))
 		})
 		It("Should set the readiness probe", func() {
-			forge.SetContainerReadinessHTTPProbe(&expected, "gui", forge.IngressGUICleanPath(&instance))
+			forge.SetContainerReadinessHTTPProbe(&expected, "gui", forge.HealthzEndpoint)
 			Expect(actual.ReadinessProbe).To(Equal(expected.ReadinessProbe))
 		})
 		It("Should set the env varibles", func() {

provisioning/containers/gui-common/tigervnc/fluxbox/init

@@ -31,21 +31,21 @@ session.screen0.focusModel:     ClickFocus
 session.screen0.showwindowposition:     false
 session.screen0.maxIgnoreIncrement:     true
 session.screen0.workspaces:     1
-session.screen0.maxDisableMove: false
+session.screen0.maxDisableMove: true
 session.screen0.autoRaise:      true
 session.screen0.tooltipDelay:   500
 session.screen0.edgeSnapThreshold:      10
 session.screen0.colPlacementDirection:  TopToBottom
 session.screen0.tabFocusModel:  ClickToTabFocus
 session.screen0.opaqueMove:     true
 session.screen0.strftimeFormat: %02k:%M:%S - %d/%m/%Y
-session.screen0.windowPlacement:        RowMinOverlapPlacement
+session.screen0.windowPlacement:        CascadePlacement
 session.screen0.focusNewWindows:        true
 session.screen0.clickRaises:    true
 session.screen0.maxDisableResize:       false
 session.screen0.allowRemoteActions:     false
 session.screen0.focusSameHead:  false
-session.screen0.workspacewarping:       true
+session.screen0.workspacewarping:       false
 session.screen0.fullMaximization:       false
 session.screen0.defaultDeco:    NORMAL
 session.screen0.noFocusWhileTypingDelay:        0

provisioning/containers/gui-common/websockify/Dockerfile

@@ -1,5 +1,5 @@
 
-FROM golang:1.17 as builder
+FROM golang:1.19 as builder
 WORKDIR /tmp/builder
 
 COPY go.mod ./go.mod

provisioning/containers/gui-common/websockify/go.mod

@@ -1,28 +1,28 @@
 module github.com/novnc/websockify-other/websockify
 
-go 1.17
+go 1.19
 
 require (
-	github.com/google/uuid v1.1.2
-	github.com/gorilla/websocket v1.4.2
-	github.com/prometheus/client_golang v1.12.1
-	google.golang.org/grpc v1.46.0
-	google.golang.org/protobuf v1.27.1
-	k8s.io/apimachinery v0.24.0
+	github.com/google/uuid v1.3.0
+	github.com/gorilla/websocket v1.5.0
+	github.com/prometheus/client_golang v1.14.0
+	google.golang.org/grpc v1.52.0
+	google.golang.org/protobuf v1.28.1
+	k8s.io/apimachinery v0.26.0
 )
 
 require (
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
-	github.com/prometheus/client_model v0.2.0 // indirect
-	github.com/prometheus/common v0.32.1 // indirect
-	github.com/prometheus/procfs v0.7.3 // indirect
-	golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
-	golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
-	golang.org/x/text v0.3.7 // indirect
-	google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
+	github.com/prometheus/client_model v0.3.0 // indirect
+	github.com/prometheus/common v0.39.0 // indirect
+	github.com/prometheus/procfs v0.9.0 // indirect
+	golang.org/x/net v0.5.0 // indirect
+	golang.org/x/sys v0.4.0 // indirect
+	golang.org/x/text v0.6.0 // indirect
+	google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 )