noVNC/websockify upgrade, cleanup and healthz

Author: QcFe

.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() {