Improve workspace preview resource utilization (#18632)

* Improve workspace preview resource utilization

* Fix deployment

* Do not remove fluentbit

Author: aledbf

dev/preview/workflow/preview/deploy-gitpod.sh

@@ -131,19 +131,6 @@ EOF
   rm -f ${GITPOD_IMAGE_PULL_SECRET_NAME}
 }
 
-function installRookCeph {
-  diff-apply "${PREVIEW_K3S_KUBE_CONTEXT}" "$SCRIPT_PATH/../vm/manifests/rook-ceph/crds.yaml"
-
-  kubectl \
-    --kubeconfig "${PREVIEW_K3S_KUBE_PATH}" \
-    --context "${PREVIEW_K3S_KUBE_CONTEXT}" \
-    wait --for condition=established --timeout=120s crd/cephclusters.ceph.rook.io
-
-  for file in common operator cluster-test storageclass-test snapshotclass;do
-      diff-apply "${PREVIEW_K3S_KUBE_CONTEXT}" "$SCRIPT_PATH/../vm/manifests/rook-ceph/$file.yaml"
-  done
-}
-
 # Install Fluent-Bit sending logs to GCP
 function installFluentBit {
     kubectl \
@@ -175,7 +162,7 @@ function installFluentBit {
     helm3 \
       --kubeconfig "${PREVIEW_K3S_KUBE_PATH}" \
       --kube-context "${PREVIEW_K3S_KUBE_CONTEXT}" \
-      upgrade --install fluent-bit fluent/fluent-bit --version 0.21.6 -n "${PREVIEW_NAMESPACE}" -f "$SCRIPT_PATH/../vm/charts/fluentbit/values.yaml"
+      upgrade --install fluent-bit fluent/fluent-bit --version 0.37.1 -n "${PREVIEW_NAMESPACE}" -f "$SCRIPT_PATH/../vm/charts/fluentbit/values.yaml"
 }
 
 # ====================================
@@ -198,7 +185,6 @@ while ! copyCachedCertificate; do
 done
 
 copyImagePullSecret
-installRookCeph
 installFluentBit
 
 # ========
@@ -589,7 +575,7 @@ rm -f "${INSTALLER_RENDER_PATH}"
 # =========================
 # Wait for objects to be ready
 # =========================
-for item in deployment.apps/blobserve deployment.apps/content-service deployment.apps/dashboard deployment.apps/ide-metrics deployment.apps/ide-proxy deployment.apps/ide-service deployment.apps/image-builder-mk3 deployment.apps/minio deployment.apps/node-labeler deployment.apps/proxy deployment.apps/public-api-server deployment.apps/redis deployment.apps/server deployment.apps/spicedb deployment.apps/usage deployment.apps/ws-manager-mk2 deployment.apps/ws-manager-bridge deployment.apps/ws-proxy statefulset.apps/mysql statefulset.apps/openvsx-proxy daemonset.apps/agent-smith daemonset.apps/fluent-bit daemonset.apps/registry-facade daemonset.apps/ws-daemon; do
+for item in deployment.apps/blobserve deployment.apps/content-service deployment.apps/dashboard deployment.apps/ide-metrics deployment.apps/ide-proxy deployment.apps/ide-service deployment.apps/image-builder-mk3 deployment.apps/minio deployment.apps/node-labeler deployment.apps/proxy deployment.apps/public-api-server deployment.apps/redis deployment.apps/server deployment.apps/spicedb deployment.apps/usage deployment.apps/ws-manager-mk2 deployment.apps/ws-manager-bridge deployment.apps/ws-proxy statefulset.apps/mysql statefulset.apps/openvsx-proxy daemonset.apps/agent-smith daemonset.apps/registry-facade daemonset.apps/ws-daemon; do
   kubectl --kubeconfig "${PREVIEW_K3S_KUBE_PATH}" --context "${PREVIEW_K3S_KUBE_CONTEXT}" rollout status "${item}" --namespace="${PREVIEW_NAMESPACE}"
 done
 

dev/preview/workflow/preview/post-process.sh

@@ -170,12 +170,6 @@ while [ "$documentIndex" -le "$DOCS" ]; do
       WS_URL_TEMP_EXPR="s|\"urlTemplate\": \"https://{{ .Prefix }}.$CURRENT_WS_HOST_NAME\"|\"urlTemplate\": \"https://{{ .Prefix }}.$NEW_WS_HOST_NAME\"|"
       sed -i "$WS_URL_TEMP_EXPR" /tmp/"$NAME"overrides.yaml
 
-      WS_SC_TEMP_EXPR="s|\"storageClass\": \"\"|\"storageClass\": \"rook-ceph-block\"|"
-      sed -i "$WS_SC_TEMP_EXPR" /tmp/"$NAME"overrides.yaml
-
-      WS_SC_TEMP_EXPR="s|\"snapshotClass\": \"\"|\"snapshotClass\": \"csi-rbdplugin-snapclass\"|"
-      sed -i "$WS_SC_TEMP_EXPR" /tmp/"$NAME"overrides.yaml
-
       # Change the port we use to connect to registry-facade
       # is expected to be reg.<branch-name-with-dashes>.staging.gitpod-dev.com:$REG_DAEMON_PORT
       # Change the port we use to connect to ws-daemon

dev/preview/workflow/vm/charts/fluentbit/values.yaml

@@ -8,7 +8,6 @@ env:
   - name: GOOGLE_SERVICE_CREDENTIALS
     value: /gcp/credentials.json
 
-
 extraVolumes:
   - name: fluent-bit-external
     secret: