From 5a48b9f27d99d5127dd36dc41d625988e5295084 Mon Sep 17 00:00:00 2001 From: mustard Date: Wed, 21 Sep 2022 18:21:34 +0000 Subject: [PATCH] [installer] add allow components for vscode into ide-metrics --- .../installer/cmd/testdata/render/aws-setup/output.golden | 6 ++++-- .../installer/cmd/testdata/render/azure-setup/output.golden | 6 ++++-- .../cmd/testdata/render/customization/output.golden | 6 ++++-- .../cmd/testdata/render/external-registry/output.golden | 6 ++++-- .../installer/cmd/testdata/render/gcp-setup/output.golden | 6 ++++-- .../installer/cmd/testdata/render/http-proxy/output.golden | 6 ++++-- install/installer/cmd/testdata/render/minimal/output.golden | 6 ++++-- .../testdata/render/statefulset-customization/output.golden | 6 ++++-- .../testdata/render/use-pod-security-policies/output.golden | 6 ++++-- .../testdata/render/workspace-requests-limits/output.golden | 6 ++++-- install/installer/pkg/components/ide-metrics/configmap.go | 2 ++ 11 files changed, 42 insertions(+), 20 deletions(-) diff --git a/install/installer/cmd/testdata/render/aws-setup/output.golden b/install/installer/cmd/testdata/render/aws-setup/output.golden index c7eea267d14a1c..f4dcbaf005fcfc 100644 --- a/install/installer/cmd/testdata/render/aws-setup/output.golden +++ b/install/installer/cmd/testdata/render/aws-setup/output.golden @@ -4015,7 +4015,9 @@ data: "errorReporting": { "allowComponents": [ "supervisor-frontend", - "vscode-workbench" + "vscode-workbench", + "vscode-server", + "vscode-web" ] } }, @@ -7788,7 +7790,7 @@ spec: template: metadata: annotations: - gitpod.io/checksum_config: 38daf6eb90ea9693d49597f331d3fcbc68a6b62961fa86096d1fd7e8f67af33c + gitpod.io/checksum_config: 261a9080da877b0199c3588c8342e2bf262b31768577d9149ad91decc34870d1 creationTimestamp: null labels: app: gitpod diff --git a/install/installer/cmd/testdata/render/azure-setup/output.golden b/install/installer/cmd/testdata/render/azure-setup/output.golden index 6a436e5865c262..bfdc1bfa5c275f 100644 --- a/install/installer/cmd/testdata/render/azure-setup/output.golden +++ b/install/installer/cmd/testdata/render/azure-setup/output.golden @@ -3933,7 +3933,9 @@ data: "errorReporting": { "allowComponents": [ "supervisor-frontend", - "vscode-workbench" + "vscode-workbench", + "vscode-server", + "vscode-web" ] } }, @@ -7622,7 +7624,7 @@ spec: template: metadata: annotations: - gitpod.io/checksum_config: 38daf6eb90ea9693d49597f331d3fcbc68a6b62961fa86096d1fd7e8f67af33c + gitpod.io/checksum_config: 261a9080da877b0199c3588c8342e2bf262b31768577d9149ad91decc34870d1 creationTimestamp: null labels: app: gitpod diff --git a/install/installer/cmd/testdata/render/customization/output.golden b/install/installer/cmd/testdata/render/customization/output.golden index 426c354c73ff4a..b4fc3f86caf1d1 100644 --- a/install/installer/cmd/testdata/render/customization/output.golden +++ b/install/installer/cmd/testdata/render/customization/output.golden @@ -4750,7 +4750,9 @@ data: "errorReporting": { "allowComponents": [ "supervisor-frontend", - "vscode-workbench" + "vscode-workbench", + "vscode-server", + "vscode-web" ] } }, @@ -9060,7 +9062,7 @@ spec: metadata: annotations: gitpod.io: hello - gitpod.io/checksum_config: 0d75796644892a36da75b624bf044967e89dc5da8a59facaee2aa094372e7e79 + gitpod.io/checksum_config: b38c9ab42d890627d631b81f9f714127b1246ebb1f89b0153bf18351c9d2f9c8 hello: world creationTimestamp: null labels: diff --git a/install/installer/cmd/testdata/render/external-registry/output.golden b/install/installer/cmd/testdata/render/external-registry/output.golden index c20f4b74837391..4aa7b5b0b41209 100644 --- a/install/installer/cmd/testdata/render/external-registry/output.golden +++ b/install/installer/cmd/testdata/render/external-registry/output.golden @@ -4074,7 +4074,9 @@ data: "errorReporting": { "allowComponents": [ "supervisor-frontend", - "vscode-workbench" + "vscode-workbench", + "vscode-server", + "vscode-web" ] } }, @@ -8063,7 +8065,7 @@ spec: template: metadata: annotations: - gitpod.io/checksum_config: 38daf6eb90ea9693d49597f331d3fcbc68a6b62961fa86096d1fd7e8f67af33c + gitpod.io/checksum_config: 261a9080da877b0199c3588c8342e2bf262b31768577d9149ad91decc34870d1 creationTimestamp: null labels: app: gitpod diff --git a/install/installer/cmd/testdata/render/gcp-setup/output.golden b/install/installer/cmd/testdata/render/gcp-setup/output.golden index 3ee64944a4f776..d57d020bdf41e8 100644 --- a/install/installer/cmd/testdata/render/gcp-setup/output.golden +++ b/install/installer/cmd/testdata/render/gcp-setup/output.golden @@ -3904,7 +3904,9 @@ data: "errorReporting": { "allowComponents": [ "supervisor-frontend", - "vscode-workbench" + "vscode-workbench", + "vscode-server", + "vscode-web" ] } }, @@ -7677,7 +7679,7 @@ spec: template: metadata: annotations: - gitpod.io/checksum_config: 38daf6eb90ea9693d49597f331d3fcbc68a6b62961fa86096d1fd7e8f67af33c + gitpod.io/checksum_config: 261a9080da877b0199c3588c8342e2bf262b31768577d9149ad91decc34870d1 creationTimestamp: null labels: app: gitpod diff --git a/install/installer/cmd/testdata/render/http-proxy/output.golden b/install/installer/cmd/testdata/render/http-proxy/output.golden index eeaf5ef43635d5..126f1d592d45d8 100644 --- a/install/installer/cmd/testdata/render/http-proxy/output.golden +++ b/install/installer/cmd/testdata/render/http-proxy/output.golden @@ -4243,7 +4243,9 @@ data: "errorReporting": { "allowComponents": [ "supervisor-frontend", - "vscode-workbench" + "vscode-workbench", + "vscode-server", + "vscode-web" ] } }, @@ -9028,7 +9030,7 @@ spec: template: metadata: annotations: - gitpod.io/checksum_config: 38daf6eb90ea9693d49597f331d3fcbc68a6b62961fa86096d1fd7e8f67af33c + gitpod.io/checksum_config: 261a9080da877b0199c3588c8342e2bf262b31768577d9149ad91decc34870d1 creationTimestamp: null labels: app: gitpod diff --git a/install/installer/cmd/testdata/render/minimal/output.golden b/install/installer/cmd/testdata/render/minimal/output.golden index 7fe7c21801fde5..88adad76c49de3 100644 --- a/install/installer/cmd/testdata/render/minimal/output.golden +++ b/install/installer/cmd/testdata/render/minimal/output.golden @@ -4240,7 +4240,9 @@ data: "errorReporting": { "allowComponents": [ "supervisor-frontend", - "vscode-workbench" + "vscode-workbench", + "vscode-server", + "vscode-web" ] } }, @@ -8343,7 +8345,7 @@ spec: template: metadata: annotations: - gitpod.io/checksum_config: 38daf6eb90ea9693d49597f331d3fcbc68a6b62961fa86096d1fd7e8f67af33c + gitpod.io/checksum_config: 261a9080da877b0199c3588c8342e2bf262b31768577d9149ad91decc34870d1 creationTimestamp: null labels: app: gitpod diff --git a/install/installer/cmd/testdata/render/statefulset-customization/output.golden b/install/installer/cmd/testdata/render/statefulset-customization/output.golden index 05579e11dbde12..d97c3910642a24 100644 --- a/install/installer/cmd/testdata/render/statefulset-customization/output.golden +++ b/install/installer/cmd/testdata/render/statefulset-customization/output.golden @@ -4252,7 +4252,9 @@ data: "errorReporting": { "allowComponents": [ "supervisor-frontend", - "vscode-workbench" + "vscode-workbench", + "vscode-server", + "vscode-web" ] } }, @@ -8355,7 +8357,7 @@ spec: template: metadata: annotations: - gitpod.io/checksum_config: 38daf6eb90ea9693d49597f331d3fcbc68a6b62961fa86096d1fd7e8f67af33c + gitpod.io/checksum_config: 261a9080da877b0199c3588c8342e2bf262b31768577d9149ad91decc34870d1 creationTimestamp: null labels: app: gitpod diff --git a/install/installer/cmd/testdata/render/use-pod-security-policies/output.golden b/install/installer/cmd/testdata/render/use-pod-security-policies/output.golden index 2fda8790f86562..dfcf6cbf9ff8e0 100644 --- a/install/installer/cmd/testdata/render/use-pod-security-policies/output.golden +++ b/install/installer/cmd/testdata/render/use-pod-security-policies/output.golden @@ -4573,7 +4573,9 @@ data: "errorReporting": { "allowComponents": [ "supervisor-frontend", - "vscode-workbench" + "vscode-workbench", + "vscode-server", + "vscode-web" ] } }, @@ -8787,7 +8789,7 @@ spec: template: metadata: annotations: - gitpod.io/checksum_config: 38daf6eb90ea9693d49597f331d3fcbc68a6b62961fa86096d1fd7e8f67af33c + gitpod.io/checksum_config: 261a9080da877b0199c3588c8342e2bf262b31768577d9149ad91decc34870d1 creationTimestamp: null labels: app: gitpod diff --git a/install/installer/cmd/testdata/render/workspace-requests-limits/output.golden b/install/installer/cmd/testdata/render/workspace-requests-limits/output.golden index ee1c45cc4b3bd6..9447e2588a7fee 100644 --- a/install/installer/cmd/testdata/render/workspace-requests-limits/output.golden +++ b/install/installer/cmd/testdata/render/workspace-requests-limits/output.golden @@ -4243,7 +4243,9 @@ data: "errorReporting": { "allowComponents": [ "supervisor-frontend", - "vscode-workbench" + "vscode-workbench", + "vscode-server", + "vscode-web" ] } }, @@ -8346,7 +8348,7 @@ spec: template: metadata: annotations: - gitpod.io/checksum_config: 38daf6eb90ea9693d49597f331d3fcbc68a6b62961fa86096d1fd7e8f67af33c + gitpod.io/checksum_config: 261a9080da877b0199c3588c8342e2bf262b31768577d9149ad91decc34870d1 creationTimestamp: null labels: app: gitpod diff --git a/install/installer/pkg/components/ide-metrics/configmap.go b/install/installer/pkg/components/ide-metrics/configmap.go index ba35c2d9f545c0..a233d3191e03b0 100644 --- a/install/installer/pkg/components/ide-metrics/configmap.go +++ b/install/installer/pkg/components/ide-metrics/configmap.go @@ -123,6 +123,8 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) { AllowComponents: []string{ "supervisor-frontend", "vscode-workbench", + "vscode-server", + "vscode-web", }, }