diff --git a/install/installer/pkg/postprocess/postprocess.go b/install/installer/pkg/postprocess/postprocess.go index 23e9fad2f0ca5d..d9a5d4be640653 100644 --- 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 index adc1a7ecd625a3..ed9fb994116fc6 100644 --- 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 index 9a190a06711d1d..fa5bafc0a50994 100644 --- 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"