Skip to content

Commit a8dd8e4

Browse files
author
Simon Emms
committed
[installer]: remove jaeger operator from the config
1 parent 234d579 commit a8dd8e4

File tree

3 files changed

+0
-9
lines changed

3 files changed

+0
-9
lines changed

install/installer/README.md

-1
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@ yq eval-all --inplace \
170170
- All Gitpod components
171171
- Container registry*
172172
- MySQL database*
173-
- Jaeger operator*
174173
- RabbitMQ
175174
- Minio object storage*
176175

install/installer/example-config.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ database:
1212
inCluster: true
1313
disableDefinitelyGp: false
1414
domain: ""
15-
jaegerOperator:
16-
inCluster: true
1715
kind: Full
1816
metadata:
1917
region: local

install/installer/pkg/config/v1/config.go

-6
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ func (v version) Defaults(in interface{}) error {
4646
cfg.Metadata.Region = "local"
4747
cfg.ObjectStorage.InCluster = pointer.Bool(true)
4848
cfg.ContainerRegistry.InCluster = pointer.Bool(true)
49-
cfg.Jaeger.InCluster = pointer.Bool(true)
5049
cfg.Workspace.Resources.Requests = corev1.ResourceList{
5150
corev1.ResourceCPU: resource.MustParse("1000m"),
5251
corev1.ResourceMemory: resource.MustParse("2Gi"),
@@ -75,8 +74,6 @@ type Config struct {
7574

7675
ContainerRegistry ContainerRegistry `json:"containerRegistry" validate:"required"`
7776

78-
Jaeger Jaeger `json:"jaegerOperator" validate:"required"`
79-
8077
Certificate ObjectRef `json:"certificate" validate:"required"`
8178

8279
ImagePullSecrets []ObjectRef `json:"imagePullSecrets,omitempty"`
@@ -185,9 +182,6 @@ type S3Storage struct {
185182
Bucket string `json:"bucket" validate:"required"`
186183
Certificate ObjectRef `json:"certificate" validate:"required"`
187184
}
188-
type Jaeger struct {
189-
InCluster *bool `json:"inCluster,omitempty" validate:"required"`
190-
}
191185

192186
type LogLevel string
193187

0 commit comments

Comments
 (0)