Merge pull request jaegertracing#372 from mjnagel/crd-fix

[jaeger-operator] Refactor CRD to allow Jaeger CR creation on initial install
AshutoshNirkhe · Jun 10, 2022 · eb6176b · eb6176b
2 parents 67ff9ba + d9594db
commit eb6176b
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 16 deletions.
diff --git 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.32.1
+version: 2.32.2
 appVersion: 1.34.1
 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
@@ -15,7 +15,8 @@ This chart bootstraps a jaeger-operator deployment on a [Kubernetes](http://kube
 ## Prerequisites
 
 - Kubernetes 1.19+
-- cert-manager 1.6.1+ instaled 
+- Helm 3
+- cert-manager 1.6.1+ installed, or certificate for webhook service in a secret
 
 ## Check compability matrix
 See the compatibility matrix [here](./COMPATIBILITY.md).
@@ -60,7 +61,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`                         |
@@ -83,6 +83,13 @@ $ helm install jaegertracing/jaeger-operator --name my-release \
     --set rbac.create=false
 ```
 
+To install the chart without creating the CRDs (any files under `chart/crds`) make use of the `--skip-crds` flag. For example,
+
+```console
+$ helm install jaegertracing/jaeger-operator --name my-release \
+    --skip-crds
+```
+
 ## After the Helm Installation
 
 ### Creating a new Jaeger instance

diff --git a/charts/jaeger-operator/crd/crd.yaml → charts/jaeger-operator/crds/crd.yaml b/charts/jaeger-operator/crd/crd.yaml → charts/jaeger-operator/crds/crd.yaml
@@ -2,10 +2,9 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: jaegers.jaegertracing.io
-  annotations:
-    cert-manager.io/inject-ca-from: {{ default {{ .Release.Namespace }} .Values.certs.certificate.namespace }}/{{ default "jaeger-operator-service-cert" .Values.certs.certificate.secretName }}
   labels:
-{{ include "jaeger-operator.labels" . | indent 4 }}
+    app.kubernetes.io/name: jaeger-operator
+    app.kubernetes.io/instance: jaeger-operator
 spec:
   group: jaegertracing.io
   names:

diff --git a/charts/jaeger-operator/templates/crds.yaml b/charts/jaeger-operator/templates/crds.yaml
diff --git a/charts/jaeger-operator/templates/validating-webhook.yaml b/charts/jaeger-operator/templates/validating-webhook.yaml
@@ -1,4 +1,4 @@
-{{- if and (.Values.webhooks.mutatingWebhook.create) (.Values.webhooks.service.create) }}
+{{- if and (.Values.webhooks.validatingWebhook.create) (.Values.webhooks.service.create) }}
 apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingWebhookConfiguration
 metadata:

diff --git a/charts/jaeger-operator/values.yaml b/charts/jaeger-operator/values.yaml
@@ -8,9 +8,6 @@ image:
   pullPolicy: IfNotPresent
   imagePullSecrets: []
 
-crd:
-  install: true
-
 certs:
   issuer:
     create: true