Skip to content

Commit

Permalink
[installer]: remove jaeger operator from the config
Browse files Browse the repository at this point in the history
  • Loading branch information
Simon Emms authored and roboquat committed Feb 25, 2022
1 parent 84128c3 commit c52c53f
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 9 deletions.
1 change: 0 additions & 1 deletion install/installer/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,6 @@ yq eval-all --inplace \
- All Gitpod components
- Container registry*
- MySQL database*
- Jaeger operator*
- RabbitMQ
- Minio object storage*

Expand Down
2 changes: 0 additions & 2 deletions install/installer/example-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ database:
inCluster: true
disableDefinitelyGp: false
domain: ""
jaegerOperator:
inCluster: true
kind: Full
metadata:
region: local
Expand Down
6 changes: 0 additions & 6 deletions install/installer/pkg/config/v1/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down Expand Up @@ -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"`
Expand Down Expand Up @@ -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

Expand Down

0 comments on commit c52c53f

Please sign in to comment.