diff --git a/stable/jaeger-operator/Chart.yaml b/stable/jaeger-operator/Chart.yaml index af36aea95f..a7ca31c142 100644 --- a/stable/jaeger-operator/Chart.yaml +++ b/stable/jaeger-operator/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: jaeger-operator Helm chart for Kubernetes name: jaeger-operator -version: 2.12.0 +version: 2.12.1 appVersion: 1.15.1 home: https://www.jaegertracing.io/ icon: https://www.jaegertracing.io/img/jaeger-icon-reverse-color.svg diff --git a/stable/jaeger-operator/templates/crds/crd.yaml b/stable/jaeger-operator/crds/crd.yaml similarity index 89% rename from stable/jaeger-operator/templates/crds/crd.yaml rename to stable/jaeger-operator/crds/crd.yaml index 73c6cdb819..73a337e9a8 100644 --- a/stable/jaeger-operator/templates/crds/crd.yaml +++ b/stable/jaeger-operator/crds/crd.yaml @@ -6,7 +6,7 @@ metadata: "helm.sh/hook": crd-install "helm.sh/hook-delete-policy": "before-hook-creation" labels: -{{ include "jaeger-operator.labels" . | indent 4 }} + app: jaeger-operator spec: group: jaegertracing.io names: diff --git a/stable/jaeger-operator/templates/_helpers.tpl b/stable/jaeger-operator/templates/_helpers.tpl index 413f459f70..f3c892f5b8 100644 --- a/stable/jaeger-operator/templates/_helpers.tpl +++ b/stable/jaeger-operator/templates/_helpers.tpl @@ -45,7 +45,4 @@ Create chart name and version as used by the chart label. {{/* Generate basic labels */}} {{- define "jaeger-operator.labels" }} app.kubernetes.io/name: {{ include "jaeger-operator.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -helm.sh/chart: {{ include "jaeger-operator.chart" . }} {{- end }} diff --git a/stable/jaeger-operator/templates/deployment.yaml b/stable/jaeger-operator/templates/deployment.yaml index 4355ce0eb4..969cc21287 100644 --- a/stable/jaeger-operator/templates/deployment.yaml +++ b/stable/jaeger-operator/templates/deployment.yaml @@ -8,8 +8,7 @@ spec: replicas: 1 selector: matchLabels: - app.kubernetes.io/name: {{ include "jaeger-operator.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} +{{ include "jaeger-operator.labels" . | indent 6 }} template: metadata: name: {{ include "jaeger-operator.fullname" . }}