From 80a2a0ec1d83f9a2f0cc75e76169be2ba757abe6 Mon Sep 17 00:00:00 2001
From: Ali Rizwan <aleerizw@gmail.com>
Date: Wed, 27 Mar 2019 16:30:51 +0100
Subject: [PATCH] Update jaeger-opertor to v1.11.0 (#12577)

Signed-off-by: Ali Rizwan <ari@hellofresh.com>
---
 stable/jaeger-operator/Chart.yaml             |  4 +-
 stable/jaeger-operator/templates/crd.yaml     |  6 +--
 .../jaeger-operator/templates/deployment.yaml |  6 ++-
 stable/jaeger-operator/templates/role.yaml    | 44 +++++++------------
 stable/jaeger-operator/values.yaml            |  2 +-
 5 files changed, 27 insertions(+), 35 deletions(-)

diff --git a/stable/jaeger-operator/Chart.yaml b/stable/jaeger-operator/Chart.yaml
index 0d051cc2ba..909edd19c8 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.3.1
-appVersion: 1.10.0
+version: 2.4.0
+appVersion: 1.11.0
 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/templates/crd.yaml b/stable/jaeger-operator/templates/crd.yaml
index f7d6bb2cb3..cd57a5f4a1 100644
--- a/stable/jaeger-operator/templates/crd.yaml
+++ b/stable/jaeger-operator/templates/crd.yaml
@@ -1,7 +1,7 @@
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
-  name: jaegers.io.jaegertracing
+  name: jaegers.jaegertracing.io
 {{- if semverCompare ">=2.10-0" .Capabilities.TillerVersion.SemVer }}
   annotations:
     "helm.sh/hook": crd-install
@@ -13,11 +13,11 @@ metadata:
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     helm.sh/chart: {{ include "jaeger-operator.chart" . }}
 spec:
-  group: io.jaegertracing
+  group: jaegertracing.io
   names:
     kind: Jaeger
     listKind: JaegerList
     plural: jaegers
     singular: jaeger
   scope: Namespaced
-  version: v1alpha1
+  version: v1
diff --git a/stable/jaeger-operator/templates/deployment.yaml b/stable/jaeger-operator/templates/deployment.yaml
index bfba3c984e..2133ce7442 100644
--- a/stable/jaeger-operator/templates/deployment.yaml
+++ b/stable/jaeger-operator/templates/deployment.yaml
@@ -30,7 +30,7 @@ spec:
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
-          - containerPort: 60000
+          - containerPort: 8383
             name: metrics
           args: ["start"]
           env:
@@ -38,6 +38,10 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
+            - name: POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
             - name: OPERATOR_NAME
               value: {{ include "jaeger-operator.fullname" . | quote }}
           resources:
diff --git a/stable/jaeger-operator/templates/role.yaml b/stable/jaeger-operator/templates/role.yaml
index b3eee1a995..3718d5bd90 100644
--- a/stable/jaeger-operator/templates/role.yaml
+++ b/stable/jaeger-operator/templates/role.yaml
@@ -10,12 +10,6 @@ metadata:
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     helm.sh/chart: {{ include "jaeger-operator.chart" . }}
 rules:
-- apiGroups:
-  - io.jaegertracing
-  resources:
-  - "*"
-  verbs:
-  - "*"
 - apiGroups:
   - ""
   resources:
@@ -28,7 +22,7 @@ rules:
   - secrets
   - serviceaccounts
   verbs:
-  - "*"
+  - '*'
 - apiGroups:
   - apps
   resources:
@@ -37,7 +31,20 @@ rules:
   - replicasets
   - statefulsets
   verbs:
-  - "*"
+  - '*'
+- apiGroups:
+  - monitoring.coreos.com
+  resources:
+  - servicemonitors
+  verbs:
+  - get
+  - create
+- apiGroups:
+  - io.jaegertracing
+  resources:
+  - '*'
+  verbs:
+  - '*'
 - apiGroups:
   - extensions
   resources:
@@ -49,33 +56,14 @@ rules:
   resources:
   - jobs
   - cronjobs
-  verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
-- apiGroups:
-  - monitoring.coreos.com
-  resources:
-  - servicemonitors
   verbs:
-  - get
-  - create
+  - "*"
 - apiGroups:
   - route.openshift.io
   resources:
   - routes
   verbs:
   - "*"
-- apiGroups:
-  - rbac.authorization.k8s.io
-  resources:
-  - roles
-  - rolebindings
-  verbs:
-  - '*'
-- apiGroups:
-  - elasticsearch.jaegertracing.io
-  resources:
-  - jaeger
-  verbs:
-  - 'get'
 - apiGroups:
   - logging.openshift.io
   resources:
diff --git a/stable/jaeger-operator/values.yaml b/stable/jaeger-operator/values.yaml
index ab47a0e7e9..35e9c7c037 100644
--- a/stable/jaeger-operator/values.yaml
+++ b/stable/jaeger-operator/values.yaml
@@ -3,7 +3,7 @@
 # Declare variables to be passed into your templates.
 image:
   repository: jaegertracing/jaeger-operator
-  tag: 1.10.0
+  tag: 1.11.0
   pullPolicy: IfNotPresent
 
 rbac: