Add gitpodHost

Author: mustard-mh

components/service-waiter/cmd/component.go

@@ -29,6 +29,7 @@ var componentCmdOpt struct {
 	component      string
 	labels         string
 	ideMetricsHost string
+	gitpodHost     string
 
 	featureFlagTimeout time.Duration
 }
@@ -143,6 +144,7 @@ func init() {
 	componentCmd.Flags().StringVar(&componentCmdOpt.labels, "labels", "", "Labels of deployment")
 	componentCmd.Flags().StringVar(&componentCmdOpt.ideMetricsHost, "ide-metrics-host", "", "Host of ide metrics")
 	componentCmd.Flags().DurationVar(&componentCmdOpt.featureFlagTimeout, "feature-flag-timeout", 3*time.Minute, "The maximum time to wait for feature flag")
+	componentCmd.Flags().StringVar(&componentCmdOpt.gitpodHost, "gitpod-host", "", "Domain of Gitpod installation")
 
 	_ = componentCmd.MarkFlagRequired("namespace")
 	_ = componentCmd.MarkFlagRequired("component")
@@ -181,7 +183,8 @@ func ActualWaitFeatureFlag(ctx context.Context, client experiments.Client, defau
 			return defaultValue, false, fetchTimes
 		default:
 			stringValue := client.GetStringValue(ctx, experiments.ServiceWaiterSkipComponentsFlag, "NONE", experiments.Attributes{
-				Component: componentCmdOpt.component,
+				GitpodHost: componentCmdOpt.gitpodHost,
+				Component:  componentCmdOpt.component,
 			})
 			fetchTimes++
 			if stringValue == "true" {

install/installer/pkg/common/common.go

@@ -532,6 +532,8 @@ func componentWaiterContainer(ctx *RenderContext, component, labels, image strin
 		Args: []string{
 			"-v",
 			"component",
+			"--gitpod-host",
+			ctx.Config.Domain,
 			"--ide-metrics-host",
 			"http://" + IDEMetricsComponent + ":" + strconv.Itoa(IDEMetricsPort),
 			"--namespace",

install/installer/pkg/common/common_test.go

@@ -60,7 +60,7 @@ func TestPublicApiServerComponentWaiterContainer(t *testing.T) {
 	labels := common.DefaultLabelSelector(common.PublicApiComponent)
 	require.Equal(t, labels, "app=gitpod,component=public-api-server")
 	ideMetricsHost := "http://" + common.IDEMetricsComponent + ":" + strconv.Itoa(common.IDEMetricsPort)
-	require.Equal(t, []string{"-v", "component", "--ide-metrics-host", ideMetricsHost, "--namespace", "test_namespace", "--component", common.PublicApiComponent, "--labels", labels, "--image", ctx.Config.Repository + "/public-api-server:" + "happy_path_papi_image"}, container.Args)
+	require.Equal(t, []string{"-v", "component", "--gitpod-host", ctx.Config.Domain, "--ide-metrics-host", ideMetricsHost, "--namespace", "test_namespace", "--component", common.PublicApiComponent, "--labels", labels, "--image", ctx.Config.Repository + "/public-api-server:" + "happy_path_papi_image"}, container.Args)
 }
 
 func TestServerComponentWaiterContainer(t *testing.T) {
@@ -74,5 +74,5 @@ func TestServerComponentWaiterContainer(t *testing.T) {
 	labels := common.DefaultLabelSelector(common.ServerComponent)
 	require.Equal(t, labels, "app=gitpod,component=server")
 	ideMetricsHost := "http://" + common.IDEMetricsComponent + ":" + strconv.Itoa(common.IDEMetricsPort)
-	require.Equal(t, []string{"-v", "component", "--ide-metrics-host", ideMetricsHost, "--namespace", "test_namespace", "--component", common.ServerComponent, "--labels", labels, "--image", ctx.Config.Repository + "/server:" + "happy_path_server_image"}, container.Args)
+	require.Equal(t, []string{"-v", "component", "--gitpod-host", ctx.Config.Domain, "--ide-metrics-host", ideMetricsHost, "--namespace", "test_namespace", "--component", common.ServerComponent, "--labels", labels, "--image", ctx.Config.Repository + "/server:" + "happy_path_server_image"}, container.Args)
 }

install/installer/pkg/common/constants.go

@@ -62,6 +62,7 @@ const (
 	AuthPKISecretName           = "auth-pki"
 	IDEServiceComponent         = "ide-service"
 	OpenVSXProxyComponent       = "openvsx-proxy"
+	DashboardComponent          = "dashboard"
 	IDEMetricsComponent         = "ide-metrics"
 	IDEMetricsPort              = 3000
 )

install/installer/pkg/components/dashboard/constants.go

@@ -4,8 +4,10 @@
 
 package dashboard
 
+import "github.com/gitpod-io/gitpod/installer/pkg/common"
+
 const (
-	Component     = "dashboard"
+	Component     = common.DashboardComponent
 	ContainerPort = 80
 	PortName      = "http"
 	ServicePort   = 3001

install/installer/pkg/components/proxy/networkpolicy.go

@@ -100,6 +100,10 @@ func networkpolicy(ctx *common.RenderContext) ([]runtime.Object, error) {
 					PodSelector: &metav1.LabelSelector{MatchLabels: map[string]string{
 						"component": common.OpenVSXProxyComponent,
 					}},
+				}, {
+					PodSelector: &metav1.LabelSelector{MatchLabels: map[string]string{
+						"component": common.DashboardComponent,
+					}},
 				}},
 			}},
 		},