This is an automated email from the ASF dual-hosted git repository.
innerpeacez pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking-kubernetes.git
commit 9edb82b4b408e21aaeaae378b8dadb897d7e5de9
Author: innerpeacez <innerpeace.z...@gmail.com>
AuthorDate: Fri Oct 18 20:06:05 2019 +0800
modify role to clusterrole
---
helm-chart/helm3/6.4.0/skywalking/Chart.yaml | 4 ++--
.../skywalking/templates/{oap-role.yaml => oap-clusterrole.yaml} | 5 ++++-
.../templates/{oap-rolebinding.yaml => oap-clusterrolebinding.yaml} | 4 ++--
helm-chart/helm3/6.4.0/skywalking/values.yaml | 4 +++-
4 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/helm-chart/helm3/6.4.0/skywalking/Chart.yaml
b/helm-chart/helm3/6.4.0/skywalking/Chart.yaml
index 57e0ba6..dac464f 100644
--- a/helm-chart/helm3/6.4.0/skywalking/Chart.yaml
+++ b/helm-chart/helm3/6.4.0/skywalking/Chart.yaml
@@ -1,7 +1,7 @@
-apiVersion: v1
+apiVersion: v2
name: skywalking
home: https://skywalking.apache.org
-version: 0.1.1
+version: 0.1.2
appVersion: 6.4.0
description: Apache SkyWalking APM System
icon:
https://raw.githubusercontent.com/apache/skywalking-kubernetes/master/logo/sw-logo-for-chart.jpg
diff --git a/helm-chart/helm3/6.4.0/skywalking/templates/oap-role.yaml
b/helm-chart/helm3/6.4.0/skywalking/templates/oap-clusterrole.yaml
similarity index 74%
rename from helm-chart/helm3/6.4.0/skywalking/templates/oap-role.yaml
rename to helm-chart/helm3/6.4.0/skywalking/templates/oap-clusterrole.yaml
index a867072..87fbe84 100644
--- a/helm-chart/helm3/6.4.0/skywalking/templates/oap-role.yaml
+++ b/helm-chart/helm3/6.4.0/skywalking/templates/oap-clusterrole.yaml
@@ -1,4 +1,4 @@
-kind: Role
+kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: {{ template "skywalking.fullname" . }}
@@ -11,3 +11,6 @@ rules:
- apiGroups: [""]
resources: ["pods"]
verbs: ["get", "watch", "list"]
+- apiGroups: ["extensions"]
+ resources: ["deployments", "replicasets"]
+ verbs: ["get", "watch", "list"]
\ No newline at end of file
diff --git a/helm-chart/helm3/6.4.0/skywalking/templates/oap-rolebinding.yaml
b/helm-chart/helm3/6.4.0/skywalking/templates/oap-clusterrolebinding.yaml
similarity index 91%
rename from helm-chart/helm3/6.4.0/skywalking/templates/oap-rolebinding.yaml
rename to
helm-chart/helm3/6.4.0/skywalking/templates/oap-clusterrolebinding.yaml
index e3894fe..3f23c67 100644
--- a/helm-chart/helm3/6.4.0/skywalking/templates/oap-rolebinding.yaml
+++ b/helm-chart/helm3/6.4.0/skywalking/templates/oap-clusterrolebinding.yaml
@@ -1,5 +1,5 @@
apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
+kind: ClusterRoleBinding
metadata:
name: {{ template "skywalking.fullname" . }}
labels:
@@ -9,7 +9,7 @@ metadata:
heritage: "{{ .Release.Service }}"
roleRef:
apiGroup: rbac.authorization.k8s.io
- kind: Role
+ kind: ClusterRole
name: {{ template "skywalking.fullname" . }}
subjects:
- kind: ServiceAccount
diff --git a/helm-chart/helm3/6.4.0/skywalking/values.yaml
b/helm-chart/helm3/6.4.0/skywalking/values.yaml
index a9f798a..3e45335 100644
--- a/helm-chart/helm3/6.4.0/skywalking/values.yaml
+++ b/helm-chart/helm3/6.4.0/skywalking/values.yaml
@@ -33,7 +33,9 @@ oap:
# example: oap-foo
env:
# more env, please refer to
https://hub.docker.com/r/apache/skywalking-oap-server
-
+ # or
https://github.com/apache/skywalking-docker/blob/master/6/6.4/oap/README.md#sw_telemetry
+ # for example :
+ # SW_ENVOY_ALS_ENABLED: true
ui:
name: skywalking-ui
replicas: 1
