File tree 4 files changed +11
-7
lines changed
4 files changed +11
-7
lines changed Original file line number Diff line number Diff line change @@ -40,6 +40,7 @@ const (
40
40
ServerComponent = "server"
41
41
ServerInstallationAdminPort = 9000
42
42
SystemNodeCritical = "system-node-critical"
43
+ OpenVSXProxyComponent = "openvsx-proxy"
43
44
WSManagerComponent = "ws-manager"
44
45
WSManagerBridgeComponent = "ws-manager-bridge"
45
46
WSProxyComponent = "ws-proxy"
Original file line number Diff line number Diff line change @@ -12,6 +12,7 @@ import (
12
12
"github.com/mikefarah/yq/v4/pkg/yqlib"
13
13
logging "gopkg.in/op/go-logging.v1"
14
14
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
15
+ "k8s.io/utils/pointer"
15
16
)
16
17
17
18
// Processors list of processes executed on each resource document
@@ -21,6 +22,12 @@ var Processors = []Processor{
21
22
Type : TypeMetaNetworkPolicy ,
22
23
Expression : "del(.status)" ,
23
24
},
25
+ // Remove "status" from root of OpenVSXProxy stateful sets
26
+ {
27
+ Type : TypeMetaStatefulSet ,
28
+ Expression : "del(.status)" ,
29
+ Name : pointer .String (OpenVSXProxyComponent ),
30
+ },
24
31
}
25
32
26
33
type Processor struct {
Original file line number Diff line number Diff line change 4
4
5
5
package openvsx_proxy
6
6
7
+ import "github.com/gitpod-io/gitpod/installer/pkg/common"
8
+
7
9
const (
8
- Component = "openvsx-proxy"
10
+ Component = common . OpenVSXProxyComponent
9
11
ContainerPort = 8080
10
12
ServicePort = 8080
11
13
PortName = "http"
Original file line number Diff line number Diff line change @@ -311,12 +311,6 @@ spec:
311
311
echo "Gitpod: render Kubernetes manifests"
312
312
/app/installer render -c "${CONFIG_FILE}" --namespace {{repl Namespace }} --use-experimental-config > "${GITPOD_OBJECTS}/templates/gitpod.yaml"
313
313
314
- # Workaround for #8532 and #8529
315
- echo "Gitpod: Remove the StatefulSet status object for OpenVSX Proxy"
316
- yq eval-all --inplace \
317
- 'del(select(.kind == "StatefulSet" and .metadata.name == "openvsx-proxy").status)' \
318
- "${GITPOD_OBJECTS}/templates/gitpod.yaml"
319
-
320
314
if [ '{{repl ConfigOptionEquals "reg_incluster" "1" }}' = "true" ];
321
315
then
322
316
echo "Gitpod: Add the local registry secret to the in-cluster registry secret"
You can’t perform that action at this time.
0 commit comments