Release 2.0.0 (#46)

* for release 2.0.0 * fix * storage type
apache · Mar 24, 2020 · e1194c4 · e1194c4
1 parent 525b933
commit e1194c4
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/chart/skywalking/Chart.yaml b/chart/skywalking/Chart.yaml
@@ -16,8 +16,8 @@
 apiVersion: v2
 name: skywalking
 home: https://skywalking.apache.org
-version: 1.1.0
-appVersion: 6.6.0
+version: 2.0.0
+appVersion: 7.0.0
 description: Apache SkyWalking APM System
 icon: https://raw.githubusercontent.com/apache/skywalking-kubernetes/master/logo/sw-logo-for-chart.jpg
 sources:

diff --git a/chart/skywalking/templates/es-init.job.yaml b/chart/skywalking/templates/es-init.job.yaml
@@ -48,7 +48,7 @@ spec:
         - name: JAVA_OPTS
           value: "{{ .Values.oap.javaOpts }} -Dmode=init"
         - name: SW_STORAGE
-          value: elasticsearch
+          value: {{ .Values.oap.storageType }}
         - name: SW_STORAGE_ES_CLUSTER_NODES
 {{- if .Values.elasticsearch.enabled }}
           value: "{{ .Values.elasticsearch.clusterName }}-{{ .Values.elasticsearch.nodeGroup }}:{{ .Values.elasticsearch.httpPort }}"

diff --git a/chart/skywalking/templates/oap-deployment.yaml b/chart/skywalking/templates/oap-deployment.yaml
@@ -115,7 +115,7 @@ spec:
             fieldRef:
               fieldPath: metadata.uid
         - name: SW_STORAGE
-          value: elasticsearch
+          value: {{ .Values.oap.storageType }}
         {{- if .Values.oap.envoy.als.enabled }}
         - name: SW_ENVOY_ALS_ENABLED
           value: {{ .Values.oap.envoy.als.enabled | quote}}

diff --git a/chart/skywalking/values-es6.yaml b/chart/skywalking/values-es6.yaml
@@ -24,8 +24,9 @@ oap:
   name: skywalking-oap
   image:
     repository: apache/skywalking-oap-server
-    tag: 6.6.0-es6
+    tag: 7.0.0-es6
     pullPolicy: IfNotPresent
+  storageType: elasticsearch
   ports:
     grpc: 11800
     rest: 12800
@@ -61,7 +62,7 @@ ui:
   replicas: 1
   image:
     repository: apache/skywalking-ui
-    tag: 6.6.0
+    tag: 7.0.0
     pullPolicy: IfNotPresent
   # podAnnotations:
   #   example: oap-foo

diff --git a/chart/skywalking/values.yaml b/chart/skywalking/values.yaml
@@ -24,8 +24,9 @@ oap:
   name: skywalking-oap
   image:
     repository: apache/skywalking-oap-server
-    tag: 6.6.0-es7
+    tag: 7.0.0-es7
     pullPolicy: IfNotPresent
+  storageType: elasticsearch7
   ports:
     grpc: 11800
     rest: 12800
@@ -61,7 +62,7 @@ ui:
   replicas: 1
   image:
     repository: apache/skywalking-ui
-    tag: 6.6.0
+    tag: 7.0.0
     pullPolicy: IfNotPresent
   # podAnnotations:
   #   example: oap-foo