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 221c9c4d6e2ff5b3dc91ab8467551c747635b51d
Author: innerpeacez <zhaihw0...@163.com>
AuthorDate: Tue Aug 13 14:58:17 2019 +0800
add elasticsearch master,data and client Values
---
helm-chart/6.0.0-GA/skywalking/Chart.yaml | 4 +-
helm-chart/6.1.0/{ => skywalking}/.helmignore | 0
helm-chart/6.1.0/{ => skywalking}/Chart.yaml | 2 +
helm-chart/6.1.0/{ => skywalking}/OWNERS | 0
helm-chart/6.1.0/{ => skywalking}/README.md | 0
.../6.1.0/{ => skywalking}/requirements.lock | 0
.../6.1.0/{ => skywalking}/requirements.yaml | 0
.../6.1.0/{ => skywalking}/templates/NOTES.txt | 0
.../6.1.0/{ => skywalking}/templates/_helpers.tpl | 0
.../{ => skywalking}/templates/es-init.job.yaml | 0
.../{ => skywalking}/templates/oap-deployment.yaml | 0
.../6.1.0/{ => skywalking}/templates/oap-role.yaml | 0
.../templates/oap-rolebinding.yaml | 0
.../templates/oap-serviceaccount.yaml | 0
.../6.1.0/{ => skywalking}/templates/oap-svc.yaml | 0
.../{ => skywalking}/templates/ui-deployment.yaml | 0
.../{ => skywalking}/templates/ui-ingress.yaml | 0
.../6.1.0/{ => skywalking}/templates/ui-svc.yaml | 0
helm-chart/6.1.0/skywalking/values.yaml | 247 +++++++++++++++++++++
helm-chart/6.1.0/values.yaml | 82 -------
20 files changed, 252 insertions(+), 83 deletions(-)
diff --git a/helm-chart/6.0.0-GA/skywalking/Chart.yaml
b/helm-chart/6.0.0-GA/skywalking/Chart.yaml
index 1490ee9..566ff3c 100644
--- a/helm-chart/6.0.0-GA/skywalking/Chart.yaml
+++ b/helm-chart/6.0.0-GA/skywalking/Chart.yaml
@@ -6,4 +6,6 @@ version: 0.1.0
icon:
https://github.com/apache/skywalking-kubernetes/blob/master/logo/skywalking-logo2.png
maintainers:
- name: innerpeacez
- email: innerpeace.z...@gmail.com
\ No newline at end of file
+ email: innerpeace.z...@gmail.com
+- name: hanahmily
+ email: hanahm...@gmail.com
\ No newline at end of file
diff --git a/helm-chart/6.1.0/.helmignore
b/helm-chart/6.1.0/skywalking/.helmignore
similarity index 100%
rename from helm-chart/6.1.0/.helmignore
rename to helm-chart/6.1.0/skywalking/.helmignore
diff --git a/helm-chart/6.1.0/Chart.yaml
b/helm-chart/6.1.0/skywalking/Chart.yaml
similarity index 87%
rename from helm-chart/6.1.0/Chart.yaml
rename to helm-chart/6.1.0/skywalking/Chart.yaml
index df60971..5c9a852 100644
--- a/helm-chart/6.1.0/Chart.yaml
+++ b/helm-chart/6.1.0/skywalking/Chart.yaml
@@ -10,3 +10,5 @@ sources:
maintainers:
- name: hanahmily
email: hanahm...@gmail.com
+- name: innerpeacez
+ email: innerpeace.z...@gmail.com
\ No newline at end of file
diff --git a/helm-chart/6.1.0/OWNERS b/helm-chart/6.1.0/skywalking/OWNERS
similarity index 100%
rename from helm-chart/6.1.0/OWNERS
rename to helm-chart/6.1.0/skywalking/OWNERS
diff --git a/helm-chart/6.1.0/README.md b/helm-chart/6.1.0/skywalking/README.md
similarity index 100%
rename from helm-chart/6.1.0/README.md
rename to helm-chart/6.1.0/skywalking/README.md
diff --git a/helm-chart/6.1.0/requirements.lock
b/helm-chart/6.1.0/skywalking/requirements.lock
similarity index 100%
rename from helm-chart/6.1.0/requirements.lock
rename to helm-chart/6.1.0/skywalking/requirements.lock
diff --git a/helm-chart/6.1.0/requirements.yaml
b/helm-chart/6.1.0/skywalking/requirements.yaml
similarity index 100%
rename from helm-chart/6.1.0/requirements.yaml
rename to helm-chart/6.1.0/skywalking/requirements.yaml
diff --git a/helm-chart/6.1.0/templates/NOTES.txt
b/helm-chart/6.1.0/skywalking/templates/NOTES.txt
similarity index 100%
rename from helm-chart/6.1.0/templates/NOTES.txt
rename to helm-chart/6.1.0/skywalking/templates/NOTES.txt
diff --git a/helm-chart/6.1.0/templates/_helpers.tpl
b/helm-chart/6.1.0/skywalking/templates/_helpers.tpl
similarity index 100%
rename from helm-chart/6.1.0/templates/_helpers.tpl
rename to helm-chart/6.1.0/skywalking/templates/_helpers.tpl
diff --git a/helm-chart/6.1.0/templates/es-init.job.yaml
b/helm-chart/6.1.0/skywalking/templates/es-init.job.yaml
similarity index 100%
rename from helm-chart/6.1.0/templates/es-init.job.yaml
rename to helm-chart/6.1.0/skywalking/templates/es-init.job.yaml
diff --git a/helm-chart/6.1.0/templates/oap-deployment.yaml
b/helm-chart/6.1.0/skywalking/templates/oap-deployment.yaml
similarity index 100%
rename from helm-chart/6.1.0/templates/oap-deployment.yaml
rename to helm-chart/6.1.0/skywalking/templates/oap-deployment.yaml
diff --git a/helm-chart/6.1.0/templates/oap-role.yaml
b/helm-chart/6.1.0/skywalking/templates/oap-role.yaml
similarity index 100%
rename from helm-chart/6.1.0/templates/oap-role.yaml
rename to helm-chart/6.1.0/skywalking/templates/oap-role.yaml
diff --git a/helm-chart/6.1.0/templates/oap-rolebinding.yaml
b/helm-chart/6.1.0/skywalking/templates/oap-rolebinding.yaml
similarity index 100%
rename from helm-chart/6.1.0/templates/oap-rolebinding.yaml
rename to helm-chart/6.1.0/skywalking/templates/oap-rolebinding.yaml
diff --git a/helm-chart/6.1.0/templates/oap-serviceaccount.yaml
b/helm-chart/6.1.0/skywalking/templates/oap-serviceaccount.yaml
similarity index 100%
rename from helm-chart/6.1.0/templates/oap-serviceaccount.yaml
rename to helm-chart/6.1.0/skywalking/templates/oap-serviceaccount.yaml
diff --git a/helm-chart/6.1.0/templates/oap-svc.yaml
b/helm-chart/6.1.0/skywalking/templates/oap-svc.yaml
similarity index 100%
rename from helm-chart/6.1.0/templates/oap-svc.yaml
rename to helm-chart/6.1.0/skywalking/templates/oap-svc.yaml
diff --git a/helm-chart/6.1.0/templates/ui-deployment.yaml
b/helm-chart/6.1.0/skywalking/templates/ui-deployment.yaml
similarity index 100%
rename from helm-chart/6.1.0/templates/ui-deployment.yaml
rename to helm-chart/6.1.0/skywalking/templates/ui-deployment.yaml
diff --git a/helm-chart/6.1.0/templates/ui-ingress.yaml
b/helm-chart/6.1.0/skywalking/templates/ui-ingress.yaml
similarity index 100%
rename from helm-chart/6.1.0/templates/ui-ingress.yaml
rename to helm-chart/6.1.0/skywalking/templates/ui-ingress.yaml
diff --git a/helm-chart/6.1.0/templates/ui-svc.yaml
b/helm-chart/6.1.0/skywalking/templates/ui-svc.yaml
similarity index 100%
rename from helm-chart/6.1.0/templates/ui-svc.yaml
rename to helm-chart/6.1.0/skywalking/templates/ui-svc.yaml
diff --git a/helm-chart/6.1.0/skywalking/values.yaml
b/helm-chart/6.1.0/skywalking/values.yaml
new file mode 100644
index 0000000..d1db10f
--- /dev/null
+++ b/helm-chart/6.1.0/skywalking/values.yaml
@@ -0,0 +1,247 @@
+# Default values for skywalking.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+serviceAccounts:
+ oap:
+
+oap:
+ name: skywalking-oap
+ image:
+ repository: apache/skywalking-oap-server
+ tag: 6.1.0
+ pullPolicy: IfNotPresent
+ ports:
+ grpc: 11800
+ rest: 12800
+ replicas: 2
+ service:
+ type: ClusterIP
+ javaOpts: -Xmx2g -Xms2g
+ antiAffinity: "soft"
+ nodeAffinity: {}
+ nodeSelector: {}
+ tolerations: []
+ resources: {}
+ # limits:
+ # cpu: 8
+ # memory: 8Gi
+ # requests:
+ # cpu: 8
+ # memory: 4Gi
+ # podAnnotations:
+ # example: oap-foo
+ env:
+ # more env, please refer to
https://hub.docker.com/r/apache/skywalking-oap-server
+
+ui:
+ name: skywalking-ui
+ replicas: 1
+ image:
+ repository: apache/skywalking-ui
+ tag: 6.1.0
+ pullPolicy: IfNotPresent
+ # podAnnotations:
+ # example: oap-foo
+ ingress:
+ enabled: false
+ annotations: {}
+ # kubernetes.io/ingress.class: nginx
+ # kubernetes.io/tls-acme: "true"
+ path: /
+ hosts: []
+ # - skywalking.local
+ tls: []
+ # - secretName: skywalking-tls
+ # hosts:
+ # - skywalking.local
+ service:
+ type: ClusterIP
+ # clusterIP: None
+ externalPort: 80
+ internalPort: 8080
+ ## External IP addresses of service
+ ## Default: nil
+ ##
+ # externalIPs:
+ # - 192.168.0.1
+ #
+ ## LoadBalancer IP if service.type is LoadBalancer
+ ## Default: nil
+ ##
+ # loadBalancerIP: 10.2.2.2
+ # Annotation example: setup ssl with aws cert when service.type is
LoadBalancer
+ # service.beta.kubernetes.io/aws-load-balancer-ssl-cert:
arn:aws:acm:us-east-1:EXAMPLE_CERT
+ annotations: {}
+ ## Limit load balancer source ips to list of CIDRs (where available)
+ # loadBalancerSourceRanges: []
+
+elasticsearch:
+ enabled: true
+ # If elasticsearch,enabled=true values for elasticsearch.
+
+ ## Define serviceAccount names for components. Defaults to component's fully
qualified name.
+ serviceAccounts:
+ client:
+ create: true
+ name:
+ master:
+ create: true
+ name:
+ data:
+ create: true
+ name:
+
+ client:
+ name: client
+ replicas: 2
+ serviceType: ClusterIP
+ ## If coupled with serviceType = "NodePort", this will set a specific
nodePort to the client HTTP port
+ # httpNodePort: 30920
+ loadBalancerIP: {}
+ loadBalancerSourceRanges: {}
+ ## (dict) If specified, apply these annotations to the client service
+ # serviceAnnotations:
+ # example: client-svc-foo
+ heapSize: "512m"
+ # additionalJavaOpts: "-XX:MaxRAM=512m"
+ antiAffinity: "soft"
+ nodeAffinity: {}
+ nodeSelector: {}
+ tolerations: []
+ initResources: {}
+ # limits:
+ # cpu: "25m"
+ # # memory: "128Mi"
+ # requests:
+ # cpu: "25m"
+ # memory: "128Mi"
+ resources:
+ limits:
+ cpu: "1"
+ # memory: "1024Mi"
+ requests:
+ cpu: "25m"
+ memory: "512Mi"
+ priorityClassName: ""
+ ## (dict) If specified, apply these annotations to each client Pod
+ # podAnnotations:
+ # example: client-foo
+ podDisruptionBudget:
+ enabled: false
+ minAvailable: 1
+ # maxUnavailable: 1
+ ingress:
+ enabled: false
+ # user: NAME
+ # password: PASSWORD
+ annotations: {}
+ # kubernetes.io/ingress.class: nginx
+ # kubernetes.io/tls-acme: "true"
+ path: /
+ hosts:
+ - chart-example.local
+ tls: []
+ # - secretName: chart-example-tls
+ # hosts:
+ # - chart-example.local
+
+ master:
+ name: master
+ exposeHttp: false
+ replicas: 3
+ heapSize: "512m"
+ # additionalJavaOpts: "-XX:MaxRAM=512m"
+ persistence:
+ enabled: true
+ accessMode: ReadWriteOnce
+ name: data
+ size: "4Gi"
+ # storageClass: "ssd"
+ readinessProbe:
+ httpGet:
+ path: /_cluster/health?local=true
+ port: 9200
+ initialDelaySeconds: 5
+ antiAffinity: "soft"
+ nodeAffinity: {}
+ nodeSelector: {}
+ tolerations: []
+ initResources: {}
+ # limits:
+ # cpu: "25m"
+ # # memory: "128Mi"
+ # requests:
+ # cpu: "25m"
+ # memory: "128Mi"
+ resources:
+ limits:
+ cpu: "1"
+ # memory: "1024Mi"
+ requests:
+ cpu: "25m"
+ memory: "512Mi"
+ priorityClassName: ""
+ ## (dict) If specified, apply these annotations to each master Pod
+ # podAnnotations:
+ # example: master-foo
+ podManagementPolicy: OrderedReady
+ podDisruptionBudget:
+ enabled: false
+ minAvailable: 2 # Same as `cluster.env.MINIMUM_MASTER_NODES`
+ # maxUnavailable: 1
+ updateStrategy:
+ type: OnDelete
+
+ data:
+ name: data
+ exposeHttp: false
+ replicas: 2
+ heapSize: "1536m"
+ # additionalJavaOpts: "-XX:MaxRAM=1536m"
+ persistence:
+ enabled: true
+ accessMode: ReadWriteOnce
+ name: data
+ size: "30Gi"
+ # storageClass: "ssd"
+ readinessProbe:
+ httpGet:
+ path: /_cluster/health?local=true
+ port: 9200
+ initialDelaySeconds: 5
+ terminationGracePeriodSeconds: 3600
+ antiAffinity: "soft"
+ nodeAffinity: {}
+ nodeSelector: {}
+ tolerations: []
+ initResources: {}
+ # limits:
+ # cpu: "25m"
+ # # memory: "128Mi"
+ # requests:
+ # cpu: "25m"
+ # memory: "128Mi"
+ resources:
+ limits:
+ cpu: "1"
+ # memory: "2048Mi"
+ requests:
+ cpu: "25m"
+ memory: "1536Mi"
+ priorityClassName: ""
+ ## (dict) If specified, apply these annotations to each data Pod
+ # podAnnotations:
+ # example: data-foo
+ podDisruptionBudget:
+ enabled: false
+ # minAvailable: 1
+ maxUnavailable: 1
+ podManagementPolicy: OrderedReady
+ updateStrategy:
+ type: OnDelete
+ hooks: # post-start and pre-stop hooks
+ drain: # drain the node before stopping it and re-integrate it into the
cluster after start
+ enabled: true
+
+nameOverride: ""
diff --git a/helm-chart/6.1.0/values.yaml b/helm-chart/6.1.0/values.yaml
deleted file mode 100644
index 0864e69..0000000
--- a/helm-chart/6.1.0/values.yaml
+++ /dev/null
@@ -1,82 +0,0 @@
-# Default values for skywalking.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-serviceAccounts:
- oap:
-
-oap:
- name: skywalking-oap
- image:
- repository: apache/skywalking-oap-server
- tag: 6.1.0
- pullPolicy: IfNotPresent
- ports:
- grpc: 11800
- rest: 12800
- replicas: 2
- service:
- type: ClusterIP
- javaOpts: -Xmx2g -Xms2g
- antiAffinity: "soft"
- nodeAffinity: {}
- nodeSelector: {}
- tolerations: []
- resources: {}
- # limits:
- # cpu: 8
- # memory: 8Gi
- # requests:
- # cpu: 8
- # memory: 4Gi
- # podAnnotations:
- # example: oap-foo
- env:
- # more env, please refer to
https://hub.docker.com/r/apache/skywalking-oap-server
-
-ui:
- name: skywalking-ui
- replicas: 1
- image:
- repository: apache/skywalking-ui
- tag: 6.1.0
- pullPolicy: IfNotPresent
- # podAnnotations:
- # example: oap-foo
- ingress:
- enabled: false
- annotations: {}
- # kubernetes.io/ingress.class: nginx
- # kubernetes.io/tls-acme: "true"
- path: /
- hosts: []
- # - skywalking.local
- tls: []
- # - secretName: skywalking-tls
- # hosts:
- # - skywalking.local
- service:
- type: ClusterIP
- # clusterIP: None
- externalPort: 80
- internalPort: 8080
- ## External IP addresses of service
- ## Default: nil
- ##
- # externalIPs:
- # - 192.168.0.1
- #
- ## LoadBalancer IP if service.type is LoadBalancer
- ## Default: nil
- ##
- # loadBalancerIP: 10.2.2.2
- # Annotation example: setup ssl with aws cert when service.type is
LoadBalancer
- # service.beta.kubernetes.io/aws-load-balancer-ssl-cert:
arn:aws:acm:us-east-1:EXAMPLE_CERT
- annotations: {}
- ## Limit load balancer source ips to list of CIDRs (where available)
- # loadBalancerSourceRanges: []
-
-elasticsearch:
- enabled: true
-
-nameOverride: ""
