diff --git a/stable/jaeger-operator/Chart.yaml b/stable/jaeger-operator/Chart.yaml index 4d8698738a..af36aea95f 100644 --- a/stable/jaeger-operator/Chart.yaml +++ b/stable/jaeger-operator/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 description: jaeger-operator Helm chart for Kubernetes name: jaeger-operator -version: 2.11.0 -appVersion: 1.14.0 +version: 2.12.0 +appVersion: 1.15.1 home: https://www.jaegertracing.io/ icon: https://www.jaegertracing.io/img/jaeger-icon-reverse-color.svg source: https://github.com/jaegertracing/jaeger-operator diff --git a/stable/jaeger-operator/README.md b/stable/jaeger-operator/README.md index c00a53650f..2e680231aa 100644 --- a/stable/jaeger-operator/README.md +++ b/stable/jaeger-operator/README.md @@ -13,7 +13,8 @@ $ helm install stable/jaeger-operator This chart bootstraps a jaeger-operator deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. ## Prerequisites - - Kubernetes 1.8+ with Beta APIs enabled + +- Kubernetes 1.8+ with Beta APIs enabled ## Installing the Chart @@ -42,12 +43,13 @@ The command removes all the Kubernetes components associated with the chart and The following table lists the configurable parameters of the jaeger-operator chart and their default values. | Parameter | Description | Default | -|:------------------------|:------------------------------------------------------------------------------------------------------------|:--------------------------------| +| :---------------------- | :---------------------------------------------------------------------------------------------------------- | :------------------------------ | | `image.repository` | Controller container image repository | `jaegertracing/jaeger-operator` | -| `image.tag` | Controller container image tag | `1.14.0` | +| `image.tag` | Controller container image tag | `1.15.1` | | `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` | @@ -71,6 +73,7 @@ $ helm install stable/jaeger-operator --name my-release \ ## After the Helm Installation ### Creating a new Jaeger instance + The simplest possible way to install is by creating a YAML file like the following: ```YAML diff --git a/stable/jaeger-operator/templates/crds.yaml b/stable/jaeger-operator/templates/crds.yaml new file mode 100644 index 0000000000..0ad3047f4e --- /dev/null +++ b/stable/jaeger-operator/templates/crds.yaml @@ -0,0 +1,6 @@ +{{- if .Values.crd.install }} +{{- range $path, $bytes := .Files.Glob "crds/*.yaml" }} +{{ $.Files.Get $path }} +--- +{{- end }} +{{- end }} diff --git a/stable/jaeger-operator/templates/crd.yaml b/stable/jaeger-operator/templates/crds/crd.yaml similarity index 86% rename from stable/jaeger-operator/templates/crd.yaml rename to stable/jaeger-operator/templates/crds/crd.yaml index 01be3e5e2e..73c6cdb819 100644 --- a/stable/jaeger-operator/templates/crd.yaml +++ b/stable/jaeger-operator/templates/crds/crd.yaml @@ -2,11 +2,9 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: jaegers.jaegertracing.io -{{- if semverCompare ">=2.10-0" .Capabilities.TillerVersion.SemVer }} annotations: "helm.sh/hook": crd-install "helm.sh/hook-delete-policy": "before-hook-creation" -{{- end }} labels: {{ include "jaeger-operator.labels" . | indent 4 }} spec: diff --git a/stable/jaeger-operator/values.yaml b/stable/jaeger-operator/values.yaml index 9f2a9724d2..f760a4cf2f 100644 --- a/stable/jaeger-operator/values.yaml +++ b/stable/jaeger-operator/values.yaml @@ -3,9 +3,12 @@ # Declare variables to be passed into your templates. image: repository: jaegertracing/jaeger-operator - tag: 1.14.0 + tag: 1.15.1 pullPolicy: IfNotPresent +crd: + install: true + jaeger: # Specifies whether Jaeger instance should be created create: false