From c52c53faeaed47657232c54ac0ef0c4ea2cf0e8a Mon Sep 17 00:00:00 2001 From: Simon Emms Date: Fri, 25 Feb 2022 14:11:41 +0000 Subject: [PATCH] [installer]: remove jaeger operator from the config --- install/installer/README.md | 1 - install/installer/example-config.yaml | 2 -- install/installer/pkg/config/v1/config.go | 6 ------ 3 files changed, 9 deletions(-) diff --git a/install/installer/README.md b/install/installer/README.md index db907e195b5511..d9029e226b57ab 100644 --- a/install/installer/README.md +++ b/install/installer/README.md @@ -170,7 +170,6 @@ yq eval-all --inplace \ - All Gitpod components - Container registry* - MySQL database* -- Jaeger operator* - RabbitMQ - Minio object storage* diff --git a/install/installer/example-config.yaml b/install/installer/example-config.yaml index c2934bf5f20bf8..c55a0416a7aaec 100644 --- a/install/installer/example-config.yaml +++ b/install/installer/example-config.yaml @@ -12,8 +12,6 @@ database: inCluster: true disableDefinitelyGp: false domain: "" -jaegerOperator: - inCluster: true kind: Full metadata: region: local diff --git a/install/installer/pkg/config/v1/config.go b/install/installer/pkg/config/v1/config.go index 49d1dd96b23bad..090eee253cb9b6 100644 --- a/install/installer/pkg/config/v1/config.go +++ b/install/installer/pkg/config/v1/config.go @@ -46,7 +46,6 @@ func (v version) Defaults(in interface{}) error { cfg.Metadata.Region = "local" cfg.ObjectStorage.InCluster = pointer.Bool(true) cfg.ContainerRegistry.InCluster = pointer.Bool(true) - cfg.Jaeger.InCluster = pointer.Bool(true) cfg.Workspace.Resources.Requests = corev1.ResourceList{ corev1.ResourceCPU: resource.MustParse("1000m"), corev1.ResourceMemory: resource.MustParse("2Gi"), @@ -75,8 +74,6 @@ type Config struct { ContainerRegistry ContainerRegistry `json:"containerRegistry" validate:"required"` - Jaeger Jaeger `json:"jaegerOperator" validate:"required"` - Certificate ObjectRef `json:"certificate" validate:"required"` ImagePullSecrets []ObjectRef `json:"imagePullSecrets,omitempty"` @@ -185,9 +182,6 @@ type S3Storage struct { Bucket string `json:"bucket" validate:"required"` Certificate ObjectRef `json:"certificate" validate:"required"` } -type Jaeger struct { - InCluster *bool `json:"inCluster,omitempty" validate:"required"` -} type LogLevel string