[installer]: move the post-processing openvsx statefulset to installer

This removes the "status" block on the root, which breaks older versions of Kubernetes
gitpod-io · Jul 18, 2022 · 35b9060 · 35b9060
1 parent 04ea6c3
commit 35b9060
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/install/installer/pkg/postprocess/postprocess.go b/install/installer/pkg/postprocess/postprocess.go
@@ -10,9 +10,11 @@ import (
 	"os"
 
 	"github.com/gitpod-io/gitpod/installer/pkg/common"
+	openvsxproxy "github.com/gitpod-io/gitpod/installer/pkg/components/openvsx-proxy"
 	"github.com/mikefarah/yq/v4/pkg/yqlib"
 	logging "gopkg.in/op/go-logging.v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/utils/pointer"
 )
 
 // Processors list of processes executed on each resource document
@@ -22,6 +24,12 @@ var Processors = []Processor{
 		Type:       common.TypeMetaNetworkPolicy,
 		Expression: "del(.status)",
 	},
+	// Remove "status" from root of OpenVSXProxy stateful sets
+	{
+		Type:       common.TypeMetaStatefulSet,
+		Expression: "del(.status)",
+		Name:       pointer.String(openvsxproxy.Component),
+	},
 }
 
 type Processor struct {

diff --git a/install/kots/manifests/gitpod-installation-status.yaml b/install/kots/manifests/gitpod-installation-status.yaml
@@ -30,7 +30,7 @@ spec:
       containers:
         - name: installation-status
           # This will normally be the release tag
-          image: "eu.gcr.io/gitpod-core-dev/build/installer:sje-installer-clusterip.8"
+          image: "eu.gcr.io/gitpod-core-dev/build/installer:sje-installer-post-process.4"
           command:
             - /bin/sh
             - -c

diff --git a/install/kots/manifests/gitpod-installer-job.yaml b/install/kots/manifests/gitpod-installer-job.yaml
@@ -28,7 +28,7 @@ spec:
       containers:
         - name: installer
           # This will normally be the release tag
-          image: "eu.gcr.io/gitpod-core-dev/build/installer:sje-installer-clusterip.8"
+          image: "eu.gcr.io/gitpod-core-dev/build/installer:sje-installer-post-process.4"
           volumeMounts:
             - mountPath: /config-patch
               name: config-patch
@@ -311,12 +311,6 @@ spec:
               echo "Gitpod: render Kubernetes manifests"
               /app/installer render -c "${CONFIG_FILE}" --namespace {{repl Namespace }} --use-experimental-config > "${GITPOD_OBJECTS}/templates/gitpod.yaml"
 
-              # Workaround for #8532 and #8529
-              echo "Gitpod: Remove the StatefulSet status object for OpenVSX Proxy"
-              yq eval-all --inplace \
-                'del(select(.kind == "StatefulSet" and .metadata.name == "openvsx-proxy").status)' \
-                "${GITPOD_OBJECTS}/templates/gitpod.yaml"
-
               if [ '{{repl ConfigOptionEquals "reg_incluster" "1" }}' = "true" ];
               then
                 echo "Gitpod: Add the local registry secret to the in-cluster registry secret"