From 67b15c7a4bf09e300d2b14dbe75980caaf6a8ec5 Mon Sep 17 00:00:00 2001 From: Simon Emms Date: Tue, 22 Feb 2022 09:58:31 +0000 Subject: [PATCH] [installer]: remove jaeger operator This is no longer in use --- .../components-webapp/components.go | 2 - .../pkg/components/jaeger-operator/helm.go | 33 ---------------- .../charts/jaeger-operator/Chart.yaml | 12 ------ .../charts/jaeger-operator/crd.yaml | 38 ------------------- .../charts/jaeger-operator/values.yaml | 7 ---- .../third_party/charts/jaegerOperator.go | 25 ------------ 6 files changed, 117 deletions(-) delete mode 100644 install/installer/pkg/components/jaeger-operator/helm.go delete mode 100644 install/installer/third_party/charts/jaeger-operator/Chart.yaml delete mode 100644 install/installer/third_party/charts/jaeger-operator/crd.yaml delete mode 100644 install/installer/third_party/charts/jaeger-operator/values.yaml delete mode 100644 install/installer/third_party/charts/jaegerOperator.go diff --git a/install/installer/pkg/components/components-webapp/components.go b/install/installer/pkg/components/components-webapp/components.go index 63f34db06ba2b9..b03bf902385bec 100644 --- a/install/installer/pkg/components/components-webapp/components.go +++ b/install/installer/pkg/components/components-webapp/components.go @@ -11,7 +11,6 @@ import ( "github.com/gitpod-io/gitpod/installer/pkg/components/database" ide_proxy "github.com/gitpod-io/gitpod/installer/pkg/components/ide-proxy" imagebuildermk3 "github.com/gitpod-io/gitpod/installer/pkg/components/image-builder-mk3" - jaegeroperator "github.com/gitpod-io/gitpod/installer/pkg/components/jaeger-operator" "github.com/gitpod-io/gitpod/installer/pkg/components/migrations" "github.com/gitpod-io/gitpod/installer/pkg/components/minio" openvsxproxy "github.com/gitpod-io/gitpod/installer/pkg/components/openvsx-proxy" @@ -38,7 +37,6 @@ var Objects = common.CompositeRenderFunc( var Helm = common.CompositeHelmFunc( database.Helm, - jaegeroperator.Helm, minio.Helm, rabbitmq.Helm, ) diff --git a/install/installer/pkg/components/jaeger-operator/helm.go b/install/installer/pkg/components/jaeger-operator/helm.go deleted file mode 100644 index a1e2c46b0ffbf9..00000000000000 --- a/install/installer/pkg/components/jaeger-operator/helm.go +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright (c) 2021 Gitpod GmbH. All rights reserved. -// Licensed under the GNU Affero General Public License (AGPL). -// See License-AGPL.txt in the project root for license information. - -package jaegeroperator - -import ( - "fmt" - "github.com/gitpod-io/gitpod/installer/pkg/common" - "github.com/gitpod-io/gitpod/installer/pkg/helm" - "github.com/gitpod-io/gitpod/installer/third_party/charts" - "helm.sh/helm/v3/pkg/cli/values" - "k8s.io/utils/pointer" -) - -var Helm = common.CompositeHelmFunc( - helm.ImportTemplate(charts.JaegerOperator(), helm.TemplateConfig{}, func(cfg *common.RenderContext) (*common.HelmConfig, error) { - repository := common.ThirdPartyContainerRepo(cfg.Config.Repository, common.DockerRegistryURL) - image := "jaegertracing/jaeger-operator" - - return &common.HelmConfig{ - Enabled: pointer.BoolDeref(cfg.Config.Jaeger.InCluster, false), - Values: &values.Options{ - Values: []string{ - helm.KeyValue("jaeger-operator.crd.install", "true"), - helm.KeyValue("jaeger-operator.rbac.clusterRole", "true"), - helm.ImagePullSecrets("jaeger-operator.image.imagePullSecrets", cfg), - helm.KeyValue("jaeger-operator.image.repository", fmt.Sprintf("%s/%s", repository, image)), - }, - }, - }, nil - }), -) diff --git a/install/installer/third_party/charts/jaeger-operator/Chart.yaml b/install/installer/third_party/charts/jaeger-operator/Chart.yaml deleted file mode 100644 index 643c4b90f48e6a..00000000000000 --- a/install/installer/third_party/charts/jaeger-operator/Chart.yaml +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright (c) 2021 Gitpod GmbH. All rights reserved. -# Licensed under the GNU Affero General Public License (AGPL). -# See License-AGPL.txt in the project root for license information. - -apiVersion: v2 -description: Gitpod Jaeger Operator -name: jaeger-operator -version: 1.0.0 -dependencies: - - name: jaeger-operator - version: "*" - repository: https://jaegertracing.github.io/helm-charts diff --git a/install/installer/third_party/charts/jaeger-operator/crd.yaml b/install/installer/third_party/charts/jaeger-operator/crd.yaml deleted file mode 100644 index 6ff9b2912fc0fe..00000000000000 --- a/install/installer/third_party/charts/jaeger-operator/crd.yaml +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright (c) 2021 Gitpod GmbH. All rights reserved. -# Licensed under the GNU Affero General Public License (AGPL). -# See License-AGPL.txt in the project root for license information. - -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - name: jaegers.jaegertracing.io - annotations: - "helm.sh/hook": crd-install - "helm.sh/hook-delete-policy": "before-hook-creation" - labels: - app: jaeger-operator -spec: - group: jaegertracing.io - names: - kind: Jaeger - listKind: JaegerList - plural: jaegers - singular: jaeger-operator - scope: Namespaced - versions: - - name: v1 - served: true - storage: true - schema: - openAPIV3Schema: - type: object - x-kubernetes-preserve-unknown-fields: true - additionalPrinterColumns: - - jsonPath: .status.phase - description: Jaeger instance's status - name: Status - type: string - - jsonPath: .status.version - description: Jaeger Version - name: Version - type: string diff --git a/install/installer/third_party/charts/jaeger-operator/values.yaml b/install/installer/third_party/charts/jaeger-operator/values.yaml deleted file mode 100644 index 304cacde883fa6..00000000000000 --- a/install/installer/third_party/charts/jaeger-operator/values.yaml +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright (c) 2021 Gitpod GmbH. All rights reserved. -# Licensed under the GNU Affero General Public License (AGPL). -# See License-AGPL.txt in the project root for license information. - -jaeger-operator: - rbac: - pspEnabled: true diff --git a/install/installer/third_party/charts/jaegerOperator.go b/install/installer/third_party/charts/jaegerOperator.go deleted file mode 100644 index b1a16a073a7e94..00000000000000 --- a/install/installer/third_party/charts/jaegerOperator.go +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright (c) 2021 Gitpod GmbH. All rights reserved. -// Licensed under the GNU Affero General Public License (AGPL). -// See License-AGPL.txt in the project root for license information. - -package charts - -import ( - "embed" -) - -// Imported from https://github.com/jaegertracing/helm-charts/tree/main/charts/jaeger-operator - -//go:embed jaeger-operator/* -var jaegerOperator embed.FS - -func JaegerOperator() *Chart { - return &Chart{ - Name: "jaeger-operator", - Content: &jaegerOperator, - Location: "jaeger-operator/", - AdditionalFiles: []string{ - "jaeger-operator/crd.yaml", - }, - } -}