From ba24986490b44cb5a7bd63cb144243debba05597 Mon Sep 17 00:00:00 2001 From: Anatoli Iariomenco <33262478+qlikcoe@users.noreply.github.com> Date: Fri, 25 Oct 2019 10:09:39 -0400 Subject: [PATCH] [stable/jaeger-operator] Align resources with the latest jaeger-operator 1.14.0 (#18320) * Align resources with the latest jaeger-operator 1.14.0 Fixing a known issue https://github.com/jaegertracing/jaeger-operator/issues/721 Signed-off-by: Anatoli Iariomenco * Align resources with the latest jaeger-operator 1.14.0 Fixing a known issue https://github.com/jaegertracing/jaeger-operator/issues/721 Signed-off-by: Anatoli Iariomenco * Chart version bump. Signed-off-by: Anatoli Iariomenco --- stable/jaeger-operator/Chart.yaml | 2 +- stable/jaeger-operator/templates/crd.yaml | 4 ++++ .../jaeger-operator/templates/deployment.yaml | 4 ++++ stable/jaeger-operator/templates/role.yaml | 19 +++++++++++++++++++ 4 files changed, 28 insertions(+), 1 deletion(-) diff --git a/stable/jaeger-operator/Chart.yaml b/stable/jaeger-operator/Chart.yaml index d770f0f423..241e181913 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.10.1 +version: 2.10.2 appVersion: 1.14.0 home: https://www.jaegertracing.io/ icon: https://www.jaegertracing.io/img/jaeger-icon-reverse-color.svg diff --git a/stable/jaeger-operator/templates/crd.yaml b/stable/jaeger-operator/templates/crd.yaml index f3082b284f..01be3e5e2e 100644 --- a/stable/jaeger-operator/templates/crd.yaml +++ b/stable/jaeger-operator/templates/crd.yaml @@ -18,3 +18,7 @@ spec: singular: jaeger scope: Namespaced version: v1 + versions: + - name: v1 + served: true + storage: true diff --git a/stable/jaeger-operator/templates/deployment.yaml b/stable/jaeger-operator/templates/deployment.yaml index 24c8d3cff2..4355ce0eb4 100644 --- a/stable/jaeger-operator/templates/deployment.yaml +++ b/stable/jaeger-operator/templates/deployment.yaml @@ -44,6 +44,10 @@ spec: valueFrom: fieldRef: fieldPath: metadata.name + - name: POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace - 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 cac90b86a4..3cda36a3a3 100644 --- a/stable/jaeger-operator/templates/role.yaml +++ b/stable/jaeger-operator/templates/role.yaml @@ -45,6 +45,10 @@ rules: - apiGroups: - extensions resources: + - replicasets + - deployments + - daemonsets + - statefulsets - ingresses verbs: - "*" @@ -73,6 +77,21 @@ rules: - '*' verbs: - '*' +- apiGroups: + - rbac.authorization.k8s.io + resources: + - clusterrolebindings + verbs: + - '*' +- apiGroups: + - apps + - extensions + resourceNames: + - jaeger-operator + resources: + - deployments/finalizers + verbs: + - update {{- if .Values.rbac.pspEnabled }} - apiGroups: ['policy'] resources: ['podsecuritypolicies']