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 2f58edb86f5d941fb58c8d39bec0a7a59fe0236e
Author: Gao Hongtao <hanahm...@gmail.com>
AuthorDate: Wed Jul 3 22:38:48 2019 +0800
Fix some issues about installing chart with a name
---
.../templates/elasticsearch/elasticsearch-statefulset.yaml | 2 +-
helm-chart/6.0.0-GA/skywalking/templates/oap/oap-config.yaml | 9 ++++-----
.../6.0.0-GA/skywalking/templates/oap/oap-deployment.yaml | 2 +-
helm-chart/6.0.0-GA/skywalking/values.yaml | 10 +++++-----
4 files changed, 11 insertions(+), 12 deletions(-)
diff --git
a/helm-chart/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-statefulset.yaml
b/helm-chart/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-statefulset.yaml
index ea776ed..bf8fd90 100644
---
a/helm-chart/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-statefulset.yaml
+++
b/helm-chart/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-statefulset.yaml
@@ -96,7 +96,7 @@ spec:
fieldPath: metadata.name
# NOTE: This will tell the elasticsearch node where to connect to
other nodes to form a cluster
- name: {{ .Values.elasticsearch.clusterHost }}
- value: {{ .Values.elasticsearch.name }}:{{
.Values.elasticsearch.ports.tcp }}
+ value: {{ template "skywalking.fullname" . }}-elasticsearch:{{
.Values.elasticsearch.ports.tcp }}
# NOTE: You can increase the heap size
- name: ES_JAVA_OPTS
value: {{ .Values.elasticsearch.env.esJavaOpts }}
diff --git a/helm-chart/6.0.0-GA/skywalking/templates/oap/oap-config.yaml
b/helm-chart/6.0.0-GA/skywalking/templates/oap/oap-config.yaml
index ea80c88..a7054b4 100644
--- a/helm-chart/6.0.0-GA/skywalking/templates/oap/oap-config.yaml
+++ b/helm-chart/6.0.0-GA/skywalking/templates/oap/oap-config.yaml
@@ -13,8 +13,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-{{- $oapService := .Values.oap.name -}}
-{{- $namespace := .Release.Namespace -}}
+
apiVersion: v1
kind: ConfigMap
metadata:
@@ -24,9 +23,9 @@ data:
cluster:
kubernetes:
watchTimeoutSeconds: 60
- labelSelector: app={{ $oapService }}
+ labelSelector: app={{ .Values.oap.name }}
uidEnvName: SKYWALKING_COLLECTOR_UID
- namespace: {{ $namespace }}
+ namespace: {{ .Release.Namespace }}
core:
default:
restHost: 0.0.0.0
@@ -45,7 +44,7 @@ data:
monthMetricsDataTTL: 18 # Unit is month
storage:
elasticsearch:
- clusterNodes: skywalking-elasticsearch:9200
+ clusterNodes: {{ template "skywalking.fullname" . }}-elasticsearch:9200
indexShardsNumber: 2
indexReplicasNumber: 0
bulkActions: 2000 # Execute the bulk every 2000 requests
diff --git a/helm-chart/6.0.0-GA/skywalking/templates/oap/oap-deployment.yaml
b/helm-chart/6.0.0-GA/skywalking/templates/oap/oap-deployment.yaml
index 131f5b1..c22452d 100644
--- a/helm-chart/6.0.0-GA/skywalking/templates/oap/oap-deployment.yaml
+++ b/helm-chart/6.0.0-GA/skywalking/templates/oap/oap-deployment.yaml
@@ -30,7 +30,7 @@ spec:
labels:
app: {{ .Values.oap.name }}
spec:
- serviceAccountName: {{ .Values.oap.name }}
+ serviceAccountName: {{ template "skywalking.fullname" . }}-oap
containers:
- name: {{ .Values.oap.name }}
image: {{ .Values.oap.image.repository }}:{{ .Values.oap.image.tag }}
diff --git a/helm-chart/6.0.0-GA/skywalking/values.yaml
b/helm-chart/6.0.0-GA/skywalking/values.yaml
index c860f42..cd4f11d 100644
--- a/helm-chart/6.0.0-GA/skywalking/values.yaml
+++ b/helm-chart/6.0.0-GA/skywalking/values.yaml
@@ -35,25 +35,25 @@ elasticsearch:
## set, choosing the default provisioner. (gp2 on AWS, standard on
## GKE, AWS & OpenStack)
##
- storageClass: fast
+ storageClass: ""
##
## If you want to reuse an existing claim, you can pass the name of the
PVC using
## the existingClaim variable
# existingClaim: your-claim
accessMode: ReadWriteOnce
- size: 30Gi
+ size: 10Gi
terminationGracePeriodSeconds: 300
oap:
name: skywalking-oap
image:
- repository: skywalking/oap
+ repository: docker.io/apache/skywalking-oap-server
tag: 6.0.0-GA
pullPolicy: IfNotPresent
ports:
grpc: 11800
rest: 12800
- replicas: 3
+ replicas: 2
service:
type: ClusterIP
env:
@@ -74,7 +74,7 @@ ui:
name: skywalking-ui
replicas: 1
image:
- repository: skywalking/ui
+ repository: docker.io/apache/skywalking-ui
tag: 6.0.0-GA
pullPolicy: IfNotPresent
ports:
