From 013fbb75819a06faa393da85285a3ac927e1b723 Mon Sep 17 00:00:00 2001
From: vincentcui <vincentcui@tencent.com>
Date: Thu, 26 Nov 2020 14:55:04 +0800
Subject: [PATCH] upgrade to using helm3 crd procedure since crd-install hook
 is no longer supported

fixes #170

chart.Values.crd.install is no longer support since crd MUST be install
refer: https://helm.sh/docs/topics/charts/#custom-resource-definitions-crds

Signed-off-by: vincentcui <vincentcui@tencent.com>
---
 charts/jaeger-operator/Chart.yaml          | 2 +-
 charts/jaeger-operator/README.md           | 1 -
 charts/jaeger-operator/crds/crd.yaml       | 3 ---
 charts/jaeger-operator/templates/crds.yaml | 6 ------
 charts/jaeger-operator/values.yaml         | 3 ---
 5 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 charts/jaeger-operator/templates/crds.yaml

diff --git a/charts/jaeger-operator/Chart.yaml b/charts/jaeger-operator/Chart.yaml
index 517c3786..d2cd7b5f 100644
--- a/charts/jaeger-operator/Chart.yaml
+++ b/charts/jaeger-operator/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: jaeger-operator Helm chart for Kubernetes
 name: jaeger-operator
-version: 2.17.0
+version: 2.18.0
 appVersion: 1.19.0
 home: https://www.jaegertracing.io/
 icon: https://www.jaegertracing.io/img/jaeger-icon-reverse-color.svg
diff --git a/charts/jaeger-operator/README.md b/charts/jaeger-operator/README.md
index 1373a4ed..e947ec5e 100644
--- a/charts/jaeger-operator/README.md
+++ b/charts/jaeger-operator/README.md
@@ -55,7 +55,6 @@ The following table lists the configurable parameters of the jaeger-operator cha
 | `image.pullPolicy`      | Controller container image pull policy                                                                      | `IfNotPresent`                  |
 | `jaeger.create`         | Jaeger instance will be created                                                                             | `false`                         |
 | `jaeger.spec`           | Jaeger instance specification                                                                               | `{}`                            |
-| `crd.install`           | CustomResourceDefinition will be installed                                                                  | `true`                          |
 | `rbac.create`           | All required roles and rolebindings will be created                                                         | `true`                          |
 | `serviceAccount.create` | Service account to use                                                                                      | `true`                          |
 | `rbac.pspEnabled`       | Pod security policy for pod will be created and included in rbac role                                       | `false`                         |
diff --git a/charts/jaeger-operator/crds/crd.yaml b/charts/jaeger-operator/crds/crd.yaml
index f444af42..dc53db6c 100644
--- a/charts/jaeger-operator/crds/crd.yaml
+++ b/charts/jaeger-operator/crds/crd.yaml
@@ -2,9 +2,6 @@ apiVersion: apiextensions.k8s.io/v1beta1
 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:
diff --git a/charts/jaeger-operator/templates/crds.yaml b/charts/jaeger-operator/templates/crds.yaml
deleted file mode 100644
index 0ad3047f..00000000
--- a/charts/jaeger-operator/templates/crds.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-{{- if .Values.crd.install }}
-{{- range $path, $bytes := .Files.Glob "crds/*.yaml" }}
-{{ $.Files.Get $path }}
----
-{{- end }}
-{{- end }}
diff --git a/charts/jaeger-operator/values.yaml b/charts/jaeger-operator/values.yaml
index 0fa8fbf8..d5255a9d 100644
--- a/charts/jaeger-operator/values.yaml
+++ b/charts/jaeger-operator/values.yaml
@@ -7,9 +7,6 @@ image:
   pullPolicy: IfNotPresent
   imagePullSecrets: []
 
-crd:
-  install: true
-
 jaeger:
   # Specifies whether Jaeger instance should be created
   create: false