You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by in...@apache.org on 2019/10/22 05:58:16 UTC
[skywalking-kubernetes] branch master updated (fafaa1c -> f0e0f13)
This is an automated email from the ASF dual-hosted git repository.
innerpeacez pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking-kubernetes.git.
from fafaa1c Merge pull request #20 from innerpeacez/modify-logo-url
new 9edb82b modify role to clusterrole
new 435af53 Support for envoy sla and turn off es persistence enabled by default
new f112302 fixed some typo
new f0e0f13 Merge pull request #21 from innerpeacez/modify
The 48 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
helm-chart/helm3/6.4.0/skywalking/Chart.yaml | 4 ++--
helm-chart/helm3/6.4.0/skywalking/README.md | 22 +++++++++++++++++++---
.../{oap-role.yaml => oap-clusterrole.yaml} | 7 ++++++-
...olebinding.yaml => oap-clusterrolebinding.yaml} | 6 ++++--
.../6.4.0/skywalking/templates/oap-deployment.yaml | 4 ++++
.../helm3/6.4.0/skywalking/templates/oap-role.yaml | 8 +++++---
.../skywalking/templates/oap-rolebinding.yaml | 8 +++++---
helm-chart/helm3/6.4.0/skywalking/values.yaml | 10 +++++++---
8 files changed, 52 insertions(+), 17 deletions(-)
copy helm-chart/helm3/6.4.0/skywalking/templates/{oap-role.yaml => oap-clusterrole.yaml} (67%)
copy helm-chart/helm3/6.4.0/skywalking/templates/{oap-rolebinding.yaml => oap-clusterrolebinding.yaml} (84%)
[skywalking-kubernetes] 35/48: add elasticsearch master,
data and client Values
Posted by in...@apache.org.
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 <zh...@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.zhai@gmail.com
\ No newline at end of file
+ email: innerpeace.zhai@gmail.com
+- name: hanahmily
+ email: hanahmily@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: hanahmily@gmail.com
+- name: innerpeacez
+ email: innerpeace.zhai@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: ""
[skywalking-kubernetes] 39/48: sw chart 6.4.0
Posted by in...@apache.org.
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 be3164b6f6bde87fe0defd90fd54dd5f13dd3126
Author: innerpeacez <in...@gmail.com>
AuthorDate: Tue Oct 8 16:19:33 2019 +0800
sw chart 6.4.0
---
helm-chart/helm3/6.4.0/skywalking/.helmignore | 22 ++
helm-chart/helm3/6.4.0/skywalking/Chart.yaml | 20 ++
helm-chart/helm3/6.4.0/skywalking/OWNERS | 6 +
helm-chart/helm3/6.4.0/skywalking/README.md | 198 +++++++++++++++++
.../helm3/6.4.0/skywalking/templates/NOTES.txt | 19 ++
.../helm3/6.4.0/skywalking/templates/_helpers.tpl | 61 +++++
.../6.4.0/skywalking/templates/es-init.job.yaml | 38 ++++
.../6.4.0/skywalking/templates/oap-deployment.yaml | 99 +++++++++
.../helm3/6.4.0/skywalking/templates/oap-role.yaml | 13 ++
.../skywalking/templates/oap-rolebinding.yaml | 17 ++
.../skywalking/templates/oap-serviceaccount.yaml | 10 +
.../helm3/6.4.0/skywalking/templates/oap-svc.yaml | 21 ++
.../6.4.0/skywalking/templates/ui-deployment.yaml | 42 ++++
.../6.4.0/skywalking/templates/ui-ingress.yaml | 34 +++
.../helm3/6.4.0/skywalking/templates/ui-svc.yaml | 48 ++++
helm-chart/helm3/6.4.0/skywalking/values.yaml | 247 +++++++++++++++++++++
16 files changed, 895 insertions(+)
diff --git a/helm-chart/helm3/6.4.0/skywalking/.helmignore b/helm-chart/helm3/6.4.0/skywalking/.helmignore
new file mode 100644
index 0000000..7c04072
--- /dev/null
+++ b/helm-chart/helm3/6.4.0/skywalking/.helmignore
@@ -0,0 +1,22 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+OWNERS
diff --git a/helm-chart/helm3/6.4.0/skywalking/Chart.yaml b/helm-chart/helm3/6.4.0/skywalking/Chart.yaml
new file mode 100644
index 0000000..0e44bc2
--- /dev/null
+++ b/helm-chart/helm3/6.4.0/skywalking/Chart.yaml
@@ -0,0 +1,20 @@
+apiVersion: v1
+name: skywalking
+home: https://skywalking.apache.org
+version: 0.1.1
+appVersion: 6.4.0
+description: Apache SkyWalking APM System
+icon: https://github.com/apache/skywalking-website/blob/master/docs/.vuepress/public/assets/logo.svg
+sources:
+- https://github.com/apache/skywalking-kubernetes
+maintainers:
+- name: hanahmily
+ email: hanahmily@gmail.com
+- name: innerpeacez
+ email: innerpeace.zhai@gmail.com
+
+dependencies:
+ - name: elasticsearch
+ version: ~1.28.2
+ repository: https://kubernetes-charts.storage.googleapis.com/
+ condition: elasticsearch.enabled
\ No newline at end of file
diff --git a/helm-chart/helm3/6.4.0/skywalking/OWNERS b/helm-chart/helm3/6.4.0/skywalking/OWNERS
new file mode 100644
index 0000000..5d00621
--- /dev/null
+++ b/helm-chart/helm3/6.4.0/skywalking/OWNERS
@@ -0,0 +1,6 @@
+approvers:
+- hanahmily
+- wu-sheng
+reviewers:
+- hanahmily
+- wu-sheng
diff --git a/helm-chart/helm3/6.4.0/skywalking/README.md b/helm-chart/helm3/6.4.0/skywalking/README.md
new file mode 100644
index 0000000..0421897
--- /dev/null
+++ b/helm-chart/helm3/6.4.0/skywalking/README.md
@@ -0,0 +1,198 @@
+# Apache Skywalking Helm Chart
+
+[Apache SkyWalking](https://skywalking.apache.org/) is application performance monitor tool for distributed systems, especially designed for microservices, cloud native and container-based (Docker, K8s, Mesos) architectures.
+
+## Introduction
+
+This chart bootstraps a [Apache SkyWalking](https://skywalking.apache.org/) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager.
+
+## Prerequisites
+
+ - Kubernetes 1.9.6+
+ - PV dynamic provisioning support on the underlying infrastructure (StorageClass)
+ - Helm 3
+
+## Installing the Chart
+
+To install the chart with the release name `my-release`:
+
+```shell
+$ helm install my-release skywalking -n <namespace>
+```
+
+The command deploys Apache Skywalking on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation.
+
+> **Tip**: List all releases using `helm list`
+
+## Uninstalling the Chart
+
+To uninstall/delete the `my-release` deployment:
+
+```shell
+$ helm delete my-release -n <namespace>
+```
+
+The command removes all the Kubernetes components associated with the chart and deletes the release.
+
+## Configuration
+
+The following table lists the configurable parameters of the Skywalking chart and their default values.
+
+| Parameter | Description | Default |
+|---------------------------------------|--------------------------------------------------------------------|-------------------------------------|
+| `nameOverride` | Override name | `nil` |
+| `serviceAccounts.oap` | Name of the OAP service account to use or create | `nil` |
+| `oap.name` | OAP deployment name | `oap` |
+| `oap.image.repository` | OAP container image name | `apache/skywalking-oap-server` |
+| `oap.image.tag` | OAP container image tag | `6.1.0` |
+| `oap.image.pullPolicy` | OAP container image pull policy | `IfNotPresent` |
+| `oap.ports.grpc` | OAP grpc port for tracing or metric | `11800` |
+| `oap.ports.rest` | OAP http port for Web UI | `12800` |
+| `oap.replicas` | OAP k8s deployment replicas | `2` |
+| `oap.service.type` | OAP svc type | `ClusterIP` |
+| `oap.javaOpts` | Parameters to be added to `JAVA_OPTS`environment variable for OAP | `-Xms2g -Xmx2g` |
+| `oap.antiAffinity` | OAP anti-affinity policy | `soft` |
+| `oap.nodeAffinity` | OAP node affinity policy | `{}` |
+| `oap.nodeSelector` | OAP labels for master pod assignment | `{}` |
+| `oap.tolerations` | OAP tolerations | `[]` |
+| `oap.resources` | OAP node resources requests & limits | `{} - cpu limit must be an integer` |
+| `oap.env` | OAP environment variables | `[]` |
+| `ui.name` | Web UI deployment name | `ui` |
+| `ui.replicas` | Web UI k8s deployment replicas | `1` |
+| `ui.image.repository` | Web UI container image name | `apache/skywalking-ui` |
+| `ui.image.tag` | Web UI container image tag | `6.1.0` |
+| `ui.image.pullPolicy` | Web UI container image pull policy | `IfNotPresent` |
+| `ui.ingress.enabled` | Create Ingress for Web UI | `false` |
+| `ui.ingress.annotations` | Associate annotations to the Ingress | `{}` |
+| `ui.ingress.path` | Associate path with the Ingress | `/` |
+| `ui.ingress.hosts` | Associate hosts with the Ingress | `[]` |
+| `ui.ingress.tls` | Associate TLS with the Ingress | `[]` |
+| `ui.service.type` | Web UI svc type | `ClusterIP` |
+| `ui.service.externalPort` | external port for the service | `80` |
+| `ui.service.internalPort` | internal port for the service | `8080` |
+| `ui.service.externalIPs` | external IP addresses | `nil` |
+| `ui.service.loadBalancerIP` | Load Balancer IP address | `nil` |
+| `ui.service.annotations` | Kubernetes service annotations | `{}` |
+| `ui.service.loadBalancerSourceRanges` | Limit load balancer source IPs to list of CIDRs (where available)) | `[]` |
+| `elasticsearch.enabled` | Spin up a new elasticsearch cluster for SkyWalking | `true` |
+| `elasticsearch.client.name` | `client` | Client component name |
+| `elasticsearch.client.replicas` | `2` | Client node replicas (deployment) |
+| `elasticsearch.client.resources` | `{} - cpu limit must be an integer` | Client node resources requests & limits |
+| `elasticsearch.client.priorityClassName` | `nil` | Client priorityClass |
+| `elasticsearch.client.heapSize` | `512m` | Client node heap size |
+| `elasticsearch.client.podAnnotations` | `{}` | Client Deployment annotations |
+| `elasticsearch.client.nodeSelector` | `{}` | Node labels for client pod assignment |
+| `elasticsearch.client.tolerations` | `[]` | Client tolerations |
+| `elasticsearch.client.serviceAnnotations` | `{}` | Client Service annotations |
+| `elasticsearch.client.serviceType` | `ClusterIP` | Client service type |
+| `elasticsearch.client.httpNodePort` | `nil` | Client service HTTP NodePort port number. Has no effect if client.serviceType is not `NodePort`. |
+| `elasticsearch.client.loadBalancerIP` | `{}` | Client loadBalancerIP |
+| `elasticsearch.client.loadBalancerSourceRanges` | `{}` | Client loadBalancerSourceRanges |
+| `elasticsearch.client.antiAffinity` | `soft` | Client anti-affinity policy |
+| `elasticsearch.client.nodeAffinity` | `{}` | Client node affinity policy |
+| `elasticsearch.client.initResources` | `{}` | Client initContainer resources requests & limits |
+| `elasticsearch.client.additionalJavaOpts` | `""` | Parameters to be added to `ES_JAVA_OPTS` environment variable for client |
+| `elasticsearch.client.ingress.enabled` | `false` | Enable Client Ingress |
+| `elasticsearch.client.ingress.user` | `nil` | If this & password are set, enable basic-auth on ingress |
+| `elasticsearch.client.ingress.password` | `nil` | If this & user are set, enable basic-auth on ingress |
+| `elasticsearch.client.ingress.annotations` | `{}` | Client Ingress annotations |
+| `elasticsearch.client.ingress.hosts` | `[]` | Client Ingress Hostnames |
+| `elasticsearch.client.ingress.tls` | `[]` | Client Ingress TLS configuration |
+| `elasticsearch.client.exposeTransportPort` | `false` | Expose transport port 9300 on client service (ClusterIP) |
+| `elasticsearch.master.initResources` | `{}` | Master initContainer resources requests & limits |
+| `elasticsearch.master.additionalJavaOpts` | `""` | Parameters to be added to `ES_JAVA_OPTS` environment variable for master |
+| `elasticsearch.master.exposeHttp` | `false` | Expose http port 9200 on master Pods for monitoring, etc |
+| `elasticsearch.master.name` | `master` | Master component name |
+| `elasticsearch.master.replicas` | `2` | Master node replicas (deployment) |
+| `elasticsearch.master.resources` | `{} - cpu limit must be an integer` | Master node resources requests & limits |
+| `elasticsearch.master.priorityClassName` | `nil` | Master priorityClass |
+| `elasticsearch.master.podAnnotations` | `{}` | Master Deployment annotations |
+| `elasticsearch.master.nodeSelector` | `{}` | Node labels for master pod assignment |
+| `elasticsearch.master.tolerations` | `[]` | Master tolerations |
+| `elasticsearch.master.heapSize` | `512m` | Master node heap size |
+| `elasticsearch.master.name` | `master` | Master component name |
+| `elasticsearch.master.persistence.enabled` | `true` | Master persistent enabled/disabled |
+| `elasticsearch.master.persistence.name` | `data` | Master statefulset PVC template name |
+| `elasticsearch.master.persistence.size` | `4Gi` | Master persistent volume size |
+| `elasticsearch.master.persistence.storageClass` | `nil` | Master persistent volume Class |
+| `elasticsearch.master.persistence.accessMode` | `ReadWriteOnce` | Master persistent Access Mode |
+| `elasticsearch.master.readinessProbe` | see `values.yaml` for defaults | Master container readiness probes |
+| `elasticsearch.master.antiAffinity` | `soft` | Master anti-affinity policy |
+| `elasticsearch.master.nodeAffinity` | `{}` | Master node affinity policy |
+| `elasticsearch.master.podManagementPolicy` | `OrderedReady` | Master pod creation strategy |
+| `elasticsearch.master.updateStrategy` | `{type: "onDelete"}` | Master node update strategy policy |
+| `elasticsearch.data.initResources` | `{}` | Data initContainer resources requests & limits |
+| `elasticsearch.data.additionalJavaOpts` | `""` | Parameters to be added to `ES_JAVA_OPTS` environment variable for data |
+| `elasticsearch.data.exposeHttp` | `false` | Expose http port 9200 on data Pods for monitoring, etc |
+| `elasticsearch.data.replicas` | `2` | Data node replicas (statefulset) |
+| `elasticsearch.data.resources` | `{} - cpu limit must be an integer` | Data node resources requests & limits |
+| `elasticsearch.data.priorityClassName` | `nil` | Data priorityClass |
+| `elasticsearch.data.heapSize` | `1536m` | Data node heap size |
+| `elasticsearch.data.hooks.drain.enabled` | `true` | Data nodes: Enable drain pre-stop and post-start hook |
+| `elasticsearch.data.persistence.enabled` | `true` | Data persistent enabled/disabled |
+| `elasticsearch.data.persistence.name` | `data` | Data statefulset PVC template name |
+| `elasticsearch.data.persistence.size` | `30Gi` | Data persistent volume size |
+| `elasticsearch.data.persistence.storageClass` | `nil` | Data persistent volume Class |
+| `elasticsearch.data.persistence.accessMode` | `ReadWriteOnce` | Data persistent Access Mode |
+| `elasticsearch.data.readinessProbe` | see `values.yaml` for defaults | Readiness probes for data-containers |
+| `elasticsearch.data.podAnnotations` | `{}` | Data StatefulSet annotations |
+| `elasticsearch.data.nodeSelector` | `{}` | Node labels for data pod assignment |
+| `elasticsearch.data.tolerations` | `[]` | Data tolerations |
+| `elasticsearch.data.terminationGracePeriodSeconds` | `3600` | Data termination grace period (seconds) |
+| `elasticsearch.data.antiAffinity` | `soft` | Data anti-affinity policy |
+| `elasticsearch.data.nodeAffinity` | `{}` | Data node affinity policy |
+| `elasticsearch.data.podManagementPolicy` | `OrderedReady` | Data pod creation strategy |
+| `elasticsearch.data.updateStrategy` | `{type: "onDelete"}` | Data node update strategy policy |
+
+
+Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
+
+```console
+$ helm install myrelease skywalking --set nameOverride=newSkywalking
+```
+
+Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example,
+
+```console
+$ helm install my-release skywalking -f values.yaml
+```
+
+> **Tip**: You can use the default [values.yaml](values.yaml)
+
+### RBAC Configuration
+Roles and RoleBindings resources will be created automatically for `OAP` .
+
+> **Tip**: You can refer to the default `oap-role.yaml` file in [templates](templates/) to customize your own.
+
+### Ingress TLS
+If your cluster allows automatic create/retrieve of TLS certificates (e.g. [kube-lego](https://github.com/jetstack/kube-lego)), please refer to the documentation for that mechanism.
+
+To manually configure TLS, first create/retrieve a key & certificate pair for the address(skywalking ui) you wish to protect. Then create a TLS secret in the namespace:
+
+```console
+kubectl create secret tls skywalking-tls --cert=path/to/tls.cert --key=path/to/tls.key
+```
+
+Include the secret's name, along with the desired hostnames, in the skywalking-ui Ingress TLS section of your custom `values.yaml` file:
+
+```yaml
+ui:
+ ingress:
+ ## If true, Skywalking ui server Ingress will be created
+ ##
+ enabled: true
+
+ ## Skywalking ui server Ingress hostnames
+ ## Must be provided if Ingress is enabled
+ ##
+ hosts:
+ - skywalking.domain.com
+
+ ## Skywalking ui server Ingress TLS configuration
+ ## Secrets must be manually created in the namespace
+ ##
+ tls:
+ - secretName: skywalking-tls
+ hosts:
+ - skywalking.domain.com
+```
diff --git a/helm-chart/helm3/6.4.0/skywalking/templates/NOTES.txt b/helm-chart/helm3/6.4.0/skywalking/templates/NOTES.txt
new file mode 100644
index 0000000..c7b38cf
--- /dev/null
+++ b/helm-chart/helm3/6.4.0/skywalking/templates/NOTES.txt
@@ -0,0 +1,19 @@
+Get the UI URL by running these commands:
+{{- if .Values.ui.ingress.enabled }}
+{{- range .Values.ui.ingress.hosts }}
+ http{{ if $.Values.ui.ingress.tls }}s{{ end }}://{{ . }}{{ $.Values.ui.ingress.path }}
+{{- end }}
+{{- else if contains "NodePort" .Values.ui.service.type }}
+ export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "skywalking.ui.fullname" . }})
+ export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
+ echo http://$NODE_IP:$NODE_PORT
+{{- else if contains "LoadBalancer" .Values.ui.service.type }}
+ NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+ You can watch the status of by running 'kubectl get svc -w {{ include "skywalking.ui.fullname" . }} -n {{ .Release.Namespace }}'
+ export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "skywalking.ui.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+ echo http://$SERVICE_IP:{{ .Values.ui.service.externalPort }}
+{{- else if contains "ClusterIP" .Values.ui.service.type }}
+ export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "skywalking.name" . }},release={{ .Release.Name }},component={{ .Values.ui.name }}" -o jsonpath="{.items[0].metadata.name}")
+ echo "Visit http://127.0.0.1:8080 to use your application"
+ kubectl port-forward $POD_NAME 8080:{{ .Values.ui.service.internalPort }}
+{{- end }}
diff --git a/helm-chart/helm3/6.4.0/skywalking/templates/_helpers.tpl b/helm-chart/helm3/6.4.0/skywalking/templates/_helpers.tpl
new file mode 100644
index 0000000..49657be
--- /dev/null
+++ b/helm-chart/helm3/6.4.0/skywalking/templates/_helpers.tpl
@@ -0,0 +1,61 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "skywalking.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "skywalking.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified oap name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "skywalking.oap.fullname" -}}
+{{ template "skywalking.fullname" . }}-{{ .Values.oap.name }}
+{{- end -}}
+
+{{/*
+Create a default fully qualified ui name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "skywalking.ui.fullname" -}}
+{{ template "skywalking.fullname" . }}-{{ .Values.ui.name }}
+{{- end -}}
+
+{{/*
+Create the name of the service account to use for the oap cluster
+*/}}
+{{- define "skywalking.serviceAccountName.oap" -}}
+{{ default (include "skywalking.oap.fullname" .) .Values.serviceAccounts.oap }}
+{{- end -}}
+
+{{- define "call-nested" }}
+{{- $dot := index . 0 }}
+{{- $subchart := index . 1 }}
+{{- $template := index . 2 }}
+{{- include $template (dict "Chart" (dict "Name" $subchart) "Values" (index $dot.Values $subchart) "Release" $dot.Release "Capabilities" $dot.Capabilities) }}
+{{- end }}
+
+{{- define "skywalking.containers.wait-for-es" -}}
+- name: wait-for-elasticsearch
+ image: busybox:1.30
+ imagePullPolicy: IfNotPresent
+ command: ['sh', '-c', 'for i in $(seq 1 60); do nc -z -w3 {{ include "call-nested" (list . "elasticsearch" "elasticsearch.client.fullname") }} 9200 && exit 0 || sleep 5; done; exit 1']
+{{- end -}}
diff --git a/helm-chart/helm3/6.4.0/skywalking/templates/es-init.job.yaml b/helm-chart/helm3/6.4.0/skywalking/templates/es-init.job.yaml
new file mode 100644
index 0000000..983a002
--- /dev/null
+++ b/helm-chart/helm3/6.4.0/skywalking/templates/es-init.job.yaml
@@ -0,0 +1,38 @@
+# https://docs.sentry.io/server/installation/docker/#running-migrations
+apiVersion: batch/v1
+kind: Job
+metadata:
+ name: "{{ .Release.Name }}-es-init"
+ labels:
+ app: {{ template "skywalking.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+ component: "{{ template "skywalking.fullname" . }}-job"
+ heritage: {{ .Release.Service }}
+ release: {{ .Release.Name }}
+spec:
+ template:
+ metadata:
+ name: "{{ .Release.Name }}-es-init"
+ labels:
+ app: {{ template "skywalking.name" . }}
+ component: "{{ template "skywalking.fullname" . }}-job"
+ release: {{ .Release.Name }}
+ spec:
+ restartPolicy: Never
+ initContainers:
+ {{- include "skywalking.containers.wait-for-es" . | nindent 6 }}
+ containers:
+ - name: {{ .Values.oap.name }}
+ image: "{{ .Values.oap.image.repository }}:{{ .Values.oap.image.tag }}"
+ imagePullPolicy: {{ .Values.oap.image.pullPolicy }}
+{{- if .Values.oap.resources }}
+ resources:
+{{ toYaml .Values.oap.resources | indent 10 }}
+{{- end }}
+ env:
+ - name: JAVA_OPTS
+ value: "{{ .Values.oap.javaOpts }} -Dmode=init"
+ - name: SW_STORAGE
+ value: elasticsearch
+ - name: SW_STORAGE_ES_CLUSTER_NODES
+ value: "{{ include "call-nested" (list . "elasticsearch" "elasticsearch.client.fullname") }}:9200"
diff --git a/helm-chart/helm3/6.4.0/skywalking/templates/oap-deployment.yaml b/helm-chart/helm3/6.4.0/skywalking/templates/oap-deployment.yaml
new file mode 100644
index 0000000..ecc7436
--- /dev/null
+++ b/helm-chart/helm3/6.4.0/skywalking/templates/oap-deployment.yaml
@@ -0,0 +1,99 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ labels:
+ app: {{ template "skywalking.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+ component: "{{ .Values.oap.name }}"
+ heritage: {{ .Release.Service }}
+ release: {{ .Release.Name }}
+ name: {{ template "skywalking.oap.fullname" . }}
+spec:
+ replicas: {{ .Values.oap.replicas }}
+ selector:
+ matchLabels:
+ app: {{ template "skywalking.name" . }}
+ component: "{{ .Values.oap.name }}"
+ release: {{ .Release.Name }}
+ template:
+ metadata:
+ labels:
+ app: {{ template "skywalking.name" . }}
+ component: "{{ .Values.oap.name }}"
+ release: {{ .Release.Name }}
+ {{- if .Values.oap.podAnnotations }}
+ annotations:
+{{ toYaml .Values.oap.podAnnotations | indent 8 }}
+ {{- end }}
+ spec:
+ serviceAccountName: {{ template "skywalking.serviceAccountName.oap" . }}
+ affinity:
+ {{- if eq .Values.oap.antiAffinity "hard" }}
+ podAntiAffinity:
+ requiredDuringSchedulingIgnoredDuringExecution:
+ - topologyKey: "kubernetes.io/hostname"
+ labelSelector:
+ matchLabels:
+ app: "{{ template "skywalking.name" . }}"
+ release: "{{ .Release.Name }}"
+ component: "{{ .Values.oap.name }}"
+ {{- else if eq .Values.oap.antiAffinity "soft" }}
+ podAntiAffinity:
+ preferredDuringSchedulingIgnoredDuringExecution:
+ - weight: 1
+ podAffinityTerm:
+ topologyKey: kubernetes.io/hostname
+ labelSelector:
+ matchLabels:
+ app: "{{ template "skywalking.name" . }}"
+ release: "{{ .Release.Name }}"
+ component: "{{ .Values.oap.name }}"
+ {{- end }}
+ {{- with .Values.oap.nodeAffinity }}
+ nodeAffinity:
+{{ toYaml . | indent 10 }}
+ {{- end }}
+{{- if .Values.oap.nodeSelector }}
+ nodeSelector:
+{{ toYaml .Values.oap.nodeSelector | indent 8 }}
+{{- end }}
+{{- if .Values.oap.tolerations }}
+ tolerations:
+{{ toYaml .Values.oap.tolerations | indent 8 }}
+{{- end }}
+ initContainers:
+ {{- include "skywalking.containers.wait-for-es" . | nindent 6 }}
+ containers:
+ - name: {{ .Values.oap.name }}
+ image: "{{ .Values.oap.image.repository }}:{{ .Values.oap.image.tag }}"
+ imagePullPolicy: {{ .Values.oap.image.pullPolicy }}
+ ports:
+ - containerPort: 11800
+ name: grpc
+ - containerPort: 12800
+ name: rest
+{{- if .Values.oap.resources }}
+ resources:
+{{ toYaml .Values.oap.resources | indent 10 }}
+{{- end }}
+ env:
+ - name: JAVA_OPTS
+ value: "{{ .Values.oap.javaOpts }} -Dmode=no-init"
+ - name: SW_CLUSTER
+ value: kubernetes
+ - name: SW_CLUSTER_K8S_NAMESPACE
+ value: "{{ .Release.Namespace }}"
+ - name: SW_CLUSTER_K8S_LABEL
+ value: "app={{ template "skywalking.name" . }},release={{ .Release.Name }},component={{ .Values.oap.name }}"
+ - name: SKYWALKING_COLLECTOR_UID
+ valueFrom:
+ fieldRef:
+ fieldPath: metadata.uid
+ - name: SW_STORAGE
+ value: elasticsearch
+ - name: SW_STORAGE_ES_CLUSTER_NODES
+ value: "{{ include "call-nested" (list . "elasticsearch" "elasticsearch.client.fullname") }}:9200"
+ {{- range $key, $value := .Values.oap.env }}
+ - name: {{ $key }}
+ value: {{ $value | quote }}
+ {{- end }}
diff --git a/helm-chart/helm3/6.4.0/skywalking/templates/oap-role.yaml b/helm-chart/helm3/6.4.0/skywalking/templates/oap-role.yaml
new file mode 100644
index 0000000..a867072
--- /dev/null
+++ b/helm-chart/helm3/6.4.0/skywalking/templates/oap-role.yaml
@@ -0,0 +1,13 @@
+kind: Role
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+ name: {{ template "skywalking.fullname" . }}
+ labels:
+ app: {{ template "skywalking.name" . }}
+ chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+ release: "{{ .Release.Name }}"
+ heritage: "{{ .Release.Service }}"
+rules:
+- apiGroups: [""]
+ resources: ["pods"]
+ verbs: ["get", "watch", "list"]
diff --git a/helm-chart/helm3/6.4.0/skywalking/templates/oap-rolebinding.yaml b/helm-chart/helm3/6.4.0/skywalking/templates/oap-rolebinding.yaml
new file mode 100644
index 0000000..e3894fe
--- /dev/null
+++ b/helm-chart/helm3/6.4.0/skywalking/templates/oap-rolebinding.yaml
@@ -0,0 +1,17 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+ name: {{ template "skywalking.fullname" . }}
+ labels:
+ app: {{ template "skywalking.name" . }}
+ chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+ release: "{{ .Release.Name }}"
+ heritage: "{{ .Release.Service }}"
+roleRef:
+ apiGroup: rbac.authorization.k8s.io
+ kind: Role
+ name: {{ template "skywalking.fullname" . }}
+subjects:
+- kind: ServiceAccount
+ name: {{ template "skywalking.serviceAccountName.oap" . }}
+ namespace: {{ .Release.Namespace }}
diff --git a/helm-chart/helm3/6.4.0/skywalking/templates/oap-serviceaccount.yaml b/helm-chart/helm3/6.4.0/skywalking/templates/oap-serviceaccount.yaml
new file mode 100644
index 0000000..702a50f
--- /dev/null
+++ b/helm-chart/helm3/6.4.0/skywalking/templates/oap-serviceaccount.yaml
@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+ labels:
+ app: {{ template "skywalking.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+ component: "{{ .Values.oap.name }}"
+ heritage: {{ .Release.Service }}
+ release: {{ .Release.Name }}
+ name: {{ template "skywalking.serviceAccountName.oap" . }}
diff --git a/helm-chart/helm3/6.4.0/skywalking/templates/oap-svc.yaml b/helm-chart/helm3/6.4.0/skywalking/templates/oap-svc.yaml
new file mode 100644
index 0000000..f7a7d6e
--- /dev/null
+++ b/helm-chart/helm3/6.4.0/skywalking/templates/oap-svc.yaml
@@ -0,0 +1,21 @@
+apiVersion: v1
+kind: Service
+metadata:
+ name: {{ template "skywalking.oap.fullname" . }}
+ labels:
+ app: {{ template "skywalking.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+ component: "{{ .Values.oap.name }}"
+ heritage: {{ .Release.Service }}
+ release: {{ .Release.Name }}
+spec:
+ type: {{ .Values.oap.service.type }}
+ ports:
+ - port: {{ .Values.oap.ports.rest }}
+ name: rest
+ - port: {{ .Values.oap.ports.grpc }}
+ name: grpc
+ selector:
+ app: {{ template "skywalking.name" . }}
+ component: "{{ .Values.oap.name }}"
+ release: {{ .Release.Name }}
diff --git a/helm-chart/helm3/6.4.0/skywalking/templates/ui-deployment.yaml b/helm-chart/helm3/6.4.0/skywalking/templates/ui-deployment.yaml
new file mode 100644
index 0000000..a8a6ee8
--- /dev/null
+++ b/helm-chart/helm3/6.4.0/skywalking/templates/ui-deployment.yaml
@@ -0,0 +1,42 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: {{ template "skywalking.ui.fullname" . }}
+ labels:
+ app: {{ template "skywalking.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+ component: "{{ .Values.ui.name }}"
+ heritage: {{ .Release.Service }}
+ release: {{ .Release.Name }}
+spec:
+ replicas: {{ .Values.ui.replicas }}
+ selector:
+ matchLabels:
+ app: {{ template "skywalking.name" . }}
+ component: "{{ .Values.ui.name }}"
+ release: {{ .Release.Name }}
+ template:
+ metadata:
+ labels:
+ app: {{ template "skywalking.name" . }}
+ component: "{{ .Values.ui.name }}"
+ release: {{ .Release.Name }}
+ {{- if .Values.ui.podAnnotations }}
+ annotations:
+{{ toYaml .Values.ui.podAnnotations | indent 8 }}
+ {{- end }}
+ spec:
+ containers:
+ - name: {{ .Values.ui.name }}
+ image: {{ .Values.ui.image.repository }}:{{ .Values.ui.image.tag }}
+ imagePullPolicy: {{ .Values.ui.image.pullPolicy }}
+ ports:
+ - containerPort: {{ .Values.ui.service.internalPort }}
+ name: page
+{{- if .Values.ui.resources }}
+ resources:
+{{ toYaml .Values.ui.resources | indent 10 }}
+{{- end }}
+ env:
+ - name: SW_OAP_ADDRESS
+ value: {{ template "skywalking.oap.fullname" . }}:{{ .Values.oap.ports.rest }}
diff --git a/helm-chart/helm3/6.4.0/skywalking/templates/ui-ingress.yaml b/helm-chart/helm3/6.4.0/skywalking/templates/ui-ingress.yaml
new file mode 100644
index 0000000..406a48b
--- /dev/null
+++ b/helm-chart/helm3/6.4.0/skywalking/templates/ui-ingress.yaml
@@ -0,0 +1,34 @@
+{{- if .Values.ui.ingress.enabled -}}
+{{- $serviceName := include "skywalking.ui.fullname" . -}}
+{{- $servicePort := .Values.ui.service.externalPort -}}
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+ labels:
+ app: {{ template "skywalking.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+ component: "{{ .Values.ui.name }}"
+ heritage: {{ .Release.Service }}
+ release: {{ .Release.Name }}
+ name: {{ template "skywalking.ui.fullname" . }}
+ annotations:
+ {{- range $key, $value := .Values.ui.ingress.annotations }}
+ {{ $key }}: {{ $value | quote }}
+ {{- end }}
+spec:
+ rules:
+ {{- range .Values.ui.ingress.hosts }}
+ {{- $url := splitList "/" . }}
+ - host: {{ first $url }}
+ http:
+ paths:
+ - path: /{{ rest $url | join "/" }}
+ backend:
+ serviceName: {{ $serviceName }}
+ servicePort: {{ $servicePort }}
+ {{- end -}}
+ {{- if .Values.ui.ingress.tls }}
+ tls:
+{{ toYaml .Values.ui.ingress.tls | indent 4 }}
+ {{- end -}}
+{{- end -}}
diff --git a/helm-chart/helm3/6.4.0/skywalking/templates/ui-svc.yaml b/helm-chart/helm3/6.4.0/skywalking/templates/ui-svc.yaml
new file mode 100644
index 0000000..fb727aa
--- /dev/null
+++ b/helm-chart/helm3/6.4.0/skywalking/templates/ui-svc.yaml
@@ -0,0 +1,48 @@
+apiVersion: v1
+kind: Service
+metadata:
+ labels:
+ app: {{ template "skywalking.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+ component: "{{ .Values.ui.name }}"
+ heritage: {{ .Release.Service }}
+ release: {{ .Release.Name }}
+ name: {{ template "skywalking.ui.fullname" . }}
+ {{- with .Values.ui.service.annotations }}
+ annotations:
+ {{- range $key, $value := . }}
+ {{ $key }}: {{ $value | quote }}
+ {{- end }}
+ {{- end }}
+spec:
+ {{- if .Values.ui.service.loadBalancerSourceRanges }}
+ loadBalancerSourceRanges:
+ {{- range $cidr := .Values.ui.service.loadBalancerSourceRanges }}
+ - {{ $cidr }}
+ {{- end }}
+ {{- end }}
+ type: {{ .Values.ui.service.type }}
+ {{- if and (eq .Values.ui.service.type "ClusterIP") .Values.ui.service.clusterIP }}
+ clusterIP: {{ .Values.ui.service.clusterIP }}
+ {{- end }}
+ ports:
+ - port: {{ .Values.ui.service.externalPort }}
+ targetPort: {{ .Values.ui.service.internalPort }}
+ protocol: TCP
+{{ if (and (eq .Values.ui.service.type "NodePort") (not (empty .Values.ui.service.nodePort))) }}
+ nodePort: {{ .Values.ui.service.nodePort }}
+{{ end }}
+{{- if .Values.ui.service.portName }}
+ name: {{ .Values.ui.service.portName }}
+{{- end }}
+{{- if .Values.ui.service.externalIPs }}
+ externalIPs:
+{{ toYaml .Values.ui.service.externalIPs | indent 4 }}
+{{- end }}
+ selector:
+ app: {{ template "skywalking.name" . }}
+ component: "{{ .Values.ui.name }}"
+ release: {{ .Release.Name }}
+{{- if .Values.ui.service.loadBalancerIP }}
+ loadBalancerIP: {{ .Values.ui.service.loadBalancerIP }}
+{{- end }}
diff --git a/helm-chart/helm3/6.4.0/skywalking/values.yaml b/helm-chart/helm3/6.4.0/skywalking/values.yaml
new file mode 100644
index 0000000..a9f798a
--- /dev/null
+++ b/helm-chart/helm3/6.4.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.4.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.4.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: ""
[skywalking-kubernetes] 11/48: add 6.0.0-beta
Posted by in...@apache.org.
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 131cb8608dfcd1abc6ec98435184db5081adfdac
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Thu Jan 3 15:21:44 2019 +0800
add 6.0.0-beta
---
6/6.0.0-alpha/namespace.yml | 6 +
6/6.0.0-beta/elasticsearch/01-storageclass.yml | 24 ++
6/6.0.0-beta/elasticsearch/02-service.yml | 32 +++
6/6.0.0-beta/elasticsearch/03-statefulset.yml | 117 +++++++++
6/6.0.0-beta/istio/01-metrictemplete.yml | 24 ++
6/6.0.0-beta/istio/02-skywalingadapter.yml | 26 ++
6/6.0.0-beta/istio/03-operator_cfg.yml | 65 +++++
6/6.0.0-beta/namespace.yml | 6 +
6/6.0.0-beta/oap/00-rbac.yml | 50 ++++
6/6.0.0-beta/oap/01-config.yml | 338 +++++++++++++++++++++++++
6/6.0.0-beta/oap/02-service.yml | 31 +++
6/6.0.0-beta/oap/03-deployment.yml | 61 +++++
6/6.0.0-beta/ui/01-service.yml | 31 +++
6/6.0.0-beta/ui/02-deployment.yml | 47 ++++
14 files changed, 858 insertions(+)
diff --git a/6/6.0.0-alpha/namespace.yml b/6/6.0.0-alpha/namespace.yml
index e69de29..73a3d63 100644
--- a/6/6.0.0-alpha/namespace.yml
+++ b/6/6.0.0-alpha/namespace.yml
@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+ name: skywalking
+ labels:
+ name: skywalking
\ No newline at end of file
diff --git a/6/6.0.0-beta/elasticsearch/01-storageclass.yml b/6/6.0.0-beta/elasticsearch/01-storageclass.yml
new file mode 100644
index 0000000..ecdd70e
--- /dev/null
+++ b/6/6.0.0-beta/elasticsearch/01-storageclass.yml
@@ -0,0 +1,24 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+kind: StorageClass
+apiVersion: storage.k8s.io/v1
+metadata:
+ name: ssd
+provisioner: kubernetes.io/gce-pd
+parameters:
+ type: pd-ssd
+
diff --git a/6/6.0.0-beta/elasticsearch/02-service.yml b/6/6.0.0-beta/elasticsearch/02-service.yml
new file mode 100644
index 0000000..00d7e0d
--- /dev/null
+++ b/6/6.0.0-beta/elasticsearch/02-service.yml
@@ -0,0 +1,32 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+apiVersion: v1
+kind: Service
+metadata:
+ name: elasticsearch
+ namespace: skywalking
+ labels:
+ service: elasticsearch
+spec:
+ clusterIP: None
+ ports:
+ - port: 9200
+ name: serving
+ - port: 9300
+ name: node-to-node
+ selector:
+ service: elasticsearch
\ No newline at end of file
diff --git a/6/6.0.0-beta/elasticsearch/03-statefulset.yml b/6/6.0.0-beta/elasticsearch/03-statefulset.yml
new file mode 100644
index 0000000..6c6e3a4
--- /dev/null
+++ b/6/6.0.0-beta/elasticsearch/03-statefulset.yml
@@ -0,0 +1,117 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+ name: elasticsearch
+ namespace: skywalking
+ labels:
+ service: elasticsearch
+spec:
+ serviceName: elasticsearch
+ # NOTE: This is number of nodes that we want to run
+ # you may update this
+ replicas: 3
+ selector:
+ matchLabels:
+ service: elasticsearch
+ template:
+ metadata:
+ labels:
+ service: elasticsearch
+ spec:
+ terminationGracePeriodSeconds: 300
+ initContainers:
+ # NOTE:
+ # This is to fix the permission on the volume
+ # By default elasticsearch container is not run as
+ # non root user.
+ # https://www.elastic.co/guide/en/elasticsearch/reference/current/docker.html#_notes_for_production_use_and_defaults
+ - name: fix-the-volume-permission
+ image: busybox
+ command:
+ - sh
+ - -c
+ - chown -R 1000:1000 /usr/share/elasticsearch/data
+ securityContext:
+ privileged: true
+ volumeMounts:
+ - name: data
+ mountPath: /usr/share/elasticsearch/data
+ # NOTE:
+ # To increase the default vm.max_map_count to 262144
+ # https://www.elastic.co/guide/en/elasticsearch/reference/current/docker.html#docker-cli-run-prod-mode
+ - name: increase-the-vm-max-map-count
+ image: busybox
+ command:
+ - sysctl
+ - -w
+ - vm.max_map_count=262144
+ securityContext:
+ privileged: true
+ # To increase the ulimit
+ # https://www.elastic.co/guide/en/elasticsearch/reference/current/docker.html#_notes_for_production_use_and_defaults
+ - name: increase-the-ulimit
+ image: busybox
+ command:
+ - sh
+ - -c
+ - ulimit -n 65536
+ securityContext:
+ privileged: true
+ containers:
+ - name: elasticsearch
+ image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.3.2
+ ports:
+ - containerPort: 9200
+ name: http
+ - containerPort: 9300
+ name: tcp
+ # NOTE: you can increase this resources
+ resources:
+ requests:
+ memory: 8Gi
+ limits:
+ memory: 16Gi
+ env:
+ # NOTE: the cluster name; update this
+ - name: cluster.name
+ value: elasticsearch-cluster
+ - name: node.name
+ valueFrom:
+ fieldRef:
+ fieldPath: metadata.name
+ # NOTE: This will tell the elasticsearch node where to connect to other nodes to form a cluster
+ - name: discovery.zen.ping.unicast.hosts
+ value: elasticsearch:9300
+ # NOTE: You can increase the heap size
+ - name: ES_JAVA_OPTS
+ value: -Xms4g -Xmx4g
+ volumeMounts:
+ - name: data
+ mountPath: /usr/share/elasticsearch/data
+ volumeClaimTemplates:
+ - metadata:
+ name: data
+ spec:
+ accessModes:
+ - ReadWriteOnce
+ storageClassName: ssd
+ # NOTE: You can increase the storage size
+ resources:
+ requests:
+ storage: 500Gi
diff --git a/6/6.0.0-beta/istio/01-metrictemplete.yml b/6/6.0.0-beta/istio/01-metrictemplete.yml
new file mode 100644
index 0000000..45e814e
--- /dev/null
+++ b/6/6.0.0-beta/istio/01-metrictemplete.yml
@@ -0,0 +1,24 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+apiVersion: "config.istio.io/v1alpha2"
+kind: template
+metadata:
+ name: metric
+ namespace: istio-system
+spec:
+ descriptor: "CsD3AgogZ29vZ2xlL3Byb3RvYnVmL2Rlc2NyaXB0b3IucHJvdG8SD2dvb2dsZS5wcm90b2J1ZiJNChFGaWxlRGVzY3JpcHRvclNldBI4CgRmaWxlGAEgAygLMiQuZ29vZ2xlLnByb3RvYnVmLkZpbGVEZXNjcmlwdG9yUHJvdG9SBGZpbGUi5AQKE0ZpbGVEZXNjcmlwdG9yUHJvdG8SEgoEbmFtZRgBIAEoCVIEbmFtZRIYCgdwYWNrYWdlGAIgASgJUgdwYWNrYWdlEh4KCmRlcGVuZGVuY3kYAyADKAlSCmRlcGVuZGVuY3kSKwoRcHVibGljX2RlcGVuZGVuY3kYCiADKAVSEHB1YmxpY0RlcGVuZGVuY3kSJwoPd2Vha19kZXBlbmRlbmN5GAsgAygFUg53ZWFrRGVwZW5kZW5jeRJDCgxtZXNzYWdlX3R5cGUYBCADKAsyIC5nb29nbGUucHJvd [...]
+---
\ No newline at end of file
diff --git a/6/6.0.0-beta/istio/02-skywalingadapter.yml b/6/6.0.0-beta/istio/02-skywalingadapter.yml
new file mode 100644
index 0000000..d98ef2f
--- /dev/null
+++ b/6/6.0.0-beta/istio/02-skywalingadapter.yml
@@ -0,0 +1,26 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+apiVersion: "config.istio.io/v1alpha2"
+kind: adapter
+metadata:
+ name: swadapter
+ namespace: istio-system
+spec:
+ description:
+ session_based: false
+ templates:
+ - metric
diff --git a/6/6.0.0-beta/istio/03-operator_cfg.yml b/6/6.0.0-beta/istio/03-operator_cfg.yml
new file mode 100644
index 0000000..bb73968
--- /dev/null
+++ b/6/6.0.0-beta/istio/03-operator_cfg.yml
@@ -0,0 +1,65 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+apiVersion: "config.istio.io/v1alpha2"
+kind: handler
+metadata:
+ name: sw
+ namespace: istio-system
+spec:
+ adapter: swadapter
+ connection:
+ address: "oap.skywalking.svc.cluster.local:11800"
+---
+
+# instance for template metric
+apiVersion: "config.istio.io/v1alpha2"
+kind: instance
+metadata:
+ name: swmetric
+ namespace: istio-system
+spec:
+ template: metric
+ params:
+ value: request.size | 0
+ dimensions:
+ sourceService: source.workload.name | ""
+ sourceNamespace: source.workload.namespace | ""
+ sourceUID: source.uid | ""
+ destinationService: destination.workload.name | ""
+ destinationNamespace: destination.workload.namespace | ""
+ destinationUID: destination.uid | ""
+ requestMethod: request.method | ""
+ requestPath: request.path | ""
+ requestScheme: request.scheme | ""
+ requestTime: request.time
+ responseTime: response.time
+ responseCode: response.code | 200
+ reporter: conditional((context.reporter.kind | "inbound") == "outbound", "source", "destination")
+ apiProtocol: api.protocol | ""
+---
+
+# rule to dispatch to handler sw
+apiVersion: "config.istio.io/v1alpha2"
+kind: rule
+metadata:
+ name: swmetric-rule
+ namespace: istio-system
+spec:
+ actions:
+ - handler: sw.istio-system
+ instances:
+ - swmetric
diff --git a/6/6.0.0-beta/namespace.yml b/6/6.0.0-beta/namespace.yml
new file mode 100644
index 0000000..73a3d63
--- /dev/null
+++ b/6/6.0.0-beta/namespace.yml
@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+ name: skywalking
+ labels:
+ name: skywalking
\ No newline at end of file
diff --git a/6/6.0.0-beta/oap/00-rbac.yml b/6/6.0.0-beta/oap/00-rbac.yml
new file mode 100644
index 0000000..244a88b
--- /dev/null
+++ b/6/6.0.0-beta/oap/00-rbac.yml
@@ -0,0 +1,50 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+ name: skywalking-oap
+ namespace: skywalking
+
+---
+
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+ name: skywalking-oap
+ namespace: skywalking
+roleRef:
+ apiGroup: rbac.authorization.k8s.io
+ kind: Role
+ name: skywalking-oap
+subjects:
+- kind: ServiceAccount
+ name: skywalking-oap
+ namespace: skywalking
+
+---
+
+kind: Role
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+ namespace: skywalking
+ name: skywalking-oap
+rules:
+- apiGroups: [""]
+ resources: ["pods"]
+ verbs: ["get", "watch", "list"]
\ No newline at end of file
diff --git a/6/6.0.0-beta/oap/01-config.yml b/6/6.0.0-beta/oap/01-config.yml
new file mode 100644
index 0000000..98a5b0b
--- /dev/null
+++ b/6/6.0.0-beta/oap/01-config.yml
@@ -0,0 +1,338 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: oap-config
+ namespace: skywalking
+data:
+ application.yml: |-
+ cluster:
+ kubernetes:
+ watchTimeoutSeconds: 60
+ namespace: skywalking
+ labelSelector: app=oap
+ uidEnvName: SKYWALKING_COLLECTOR_UID
+ core:
+ default:
+ restHost: 0.0.0.0
+ restPort: 12800
+ restContextPath: /
+ gRPCHost: 0.0.0.0
+ gRPCPort: 11800
+ downsampling:
+ - Hour
+ - Day
+ - Month
+ recordDataTTL: 90 # Unit is minute
+ minuteMetricsDataTTL: 90 # Unit is minute
+ hourMetricsDataTTL: 36 # Unit is hour
+ dayMetricsDataTTL: 45 # Unit is day
+ monthMetricsDataTTL: 18 # Unit is month
+ storage:
+ elasticsearch:
+ clusterNodes: elasticsearch:9200
+ indexShardsNumber: 2
+ indexReplicasNumber: 0
+ bulkActions: 2000 # Execute the bulk every 2000 requests
+ bulkSize: 20 # flush the bulk every 20mb
+ flushInterval: 10 # flush the bulk every 10 seconds whatever the number of requests
+ concurrentRequests: 2 # the number of concurrent requests
+ receiver-register:
+ default:
+ receiver-trace:
+ default:
+ bufferPath: /trace-buffer/ # Path to trace buffer files, suggest to use absolute path
+ bufferOffsetMaxFileSize: 100 # Unit is MB
+ bufferDataMaxFileSize: 500 # Unit is MB
+ bufferFileCleanWhenRestart: false
+ receiver-jvm:
+ default:
+ service-mesh:
+ default:
+ bufferPath: /mesh-buffer/ # Path to trace buffer files, suggest to use absolute path
+ bufferOffsetMaxFileSize: 100 # Unit is MB
+ bufferDataMaxFileSize: 500 # Unit is MB
+ bufferFileCleanWhenRestart: false
+ istio-telemetry:
+ default:
+ query:
+ graphql:
+ path: /graphql
+ alarm:
+ default:
+
+ log4j2.xml: |-
+ <Configuration status="INFO">
+ <Appenders>
+ <Console name="Console" target="SYSTEM_OUT">
+ <PatternLayout charset="UTF-8" pattern="%d - %c -%-4r [%t] %-5p %x - %m%n"/>
+ </Console>
+ </Appenders>
+ <Loggers>
+ <logger name="org.eclipse.jetty" level="INFO"/>
+ <logger name="org.apache.zookeeper" level="INFO"/>
+ <logger name="org.elasticsearch.common.network.IfConfig" level="INFO"/>
+ <logger name="io.grpc.netty" level="INFO"/>
+ <logger name="org.apache.skywalking.oap.server.receiver.istio.telemetry" level="DEBUG"/>
+ <Root level="INFO">
+ <AppenderRef ref="Console"/>
+ </Root>
+ </Loggers>
+ </Configuration>
+
+ alarm-settings.yml: |-
+ rules:
+ service_resp_time_rule:
+ indicator-name: service_resp_time
+ include-names:
+ - dubbox-provider
+ - dubbox-consumer
+ threshold: 1000
+ op: ">"
+ period: 10
+ count: 1
+ webhooks:
+
+ component-libraries.yml: |-
+ Tomcat:
+ id: 1
+ languages: Java
+ HttpClient:
+ id: 2
+ languages: Java,C#,Node.js
+ Dubbo:
+ id: 3
+ languages: Java
+ H2:
+ id: 4
+ languages: Java
+ Mysql:
+ id: 5
+ languages: Java,C#,Node.js
+ ORACLE:
+ id: 6
+ languages: Java
+ Redis:
+ id: 7
+ languages: Java,C#,Node.js
+ Motan:
+ id: 8
+ languages: Java
+ MongoDB:
+ id: 9
+ languages: Java,C#,Node.js
+ Resin:
+ id: 10
+ languages: Java
+ Feign:
+ id: 11
+ languages: Java
+ OKHttp:
+ id: 12
+ languages: Java
+ SpringRestTemplate:
+ id: 13
+ languages: Java
+ SpringMVC:
+ id: 14
+ languages: Java
+ Struts2:
+ id: 15
+ languages: Java
+ NutzMVC:
+ id: 16
+ languages: Java
+ NutzHttp:
+ id: 17
+ languages: Java
+ JettyClient:
+ id: 18
+ languages: Java
+ JettyServer:
+ id: 19
+ languages: Java
+ Memcached:
+ id: 20
+ languages: Java
+ ShardingJDBC:
+ id: 21
+ languages: Java
+ PostgreSQL:
+ id: 22
+ languages: Java,C#,Node.js
+ GRPC:
+ id: 23
+ languages: Java
+ ElasticJob:
+ id: 24
+ languages: Java
+ RocketMQ:
+ id: 25
+ languages: Java
+ httpasyncclient:
+ id: 26
+ languages: Java
+ Kafka:
+ id: 27
+ languages: Java
+ ServiceComb:
+ id: 28
+ languages: Java
+ Hystrix:
+ id: 29
+ languages: Java
+ Jedis:
+ id: 30
+ languages: Java
+ SQLite:
+ id: 31
+ languages: Java,C#
+ h2-jdbc-driver:
+ id: 32
+ languages: Java
+ mysql-connector-java:
+ id: 33
+ languages: Java
+ Spymemcached:
+ id: 35
+ languages: Java
+ Xmemcached:
+ id: 36
+ languages: Java
+ postgresql-jdbc-driver:
+ id: 37
+ languages: Java
+ rocketMQ-producer:
+ id: 38
+ languages: Java
+ rocketMQ-consumer:
+ id: 39
+ languages: Java
+ kafka-producer:
+ id: 40
+ languages: Java
+ kafka-consumer:
+ id: 41
+ languages: Java
+ mongodb-driver:
+ id: 42
+ languages: Java
+ SOFARPC:
+ id: 43
+ languages: Java
+ ActiveMQ:
+ id: 44
+ languages: Java
+ activemq-producer:
+ id: 45
+ languages: Java
+ activemq-consumer:
+ id: 46
+ languages: Java
+ Elasticsearch:
+ id: 47
+ languages: Java
+ transport-client:
+ id: 48
+ languages: Java
+ AspNetCore:
+ id: 3001
+ languages: C#
+ EntityFrameworkCore:
+ id: 3002
+ languages: C#
+ SqlClient:
+ id: 3003
+ languages: C#
+ CAP:
+ id: 3004
+ languages: C#
+ StackExchange.Redis:
+ id: 3005
+ languages: C#
+ SqlServer:
+ id: 3006
+ languages: C#
+ Npgsql:
+ id: 3007
+ languages: C#
+ MySqlConnector:
+ id: 3008
+ languages: C#
+ EntityFrameworkCore.InMemory:
+ id: 3009
+ languages: C#
+ EntityFrameworkCore.SqlServer:
+ id: 3010
+ languages: C#
+ EntityFrameworkCore.Sqlite:
+ id: 3011
+ languages: C#
+ Pomelo.EntityFrameworkCore.MySql:
+ id: 3012
+ languages: C#
+ Npgsql.EntityFrameworkCore.PostgreSQL:
+ id: 3013
+ languages: C#
+ InMemoryDatabase:
+ id: 3014
+ languages: C#
+ AspNet:
+ id: 3015
+ languages: C#
+
+ # NoeJS components
+ # [4000, 5000) for Node.js agent
+ HttpServer:
+ id: 4001
+ languages: Node.js
+ express:
+ id: 4002
+ languages: Node.js
+ Egg:
+ id: 4003
+ languages: Node.js
+ Koa:
+ id: 4004
+ languages: Node.js
+ Component-Server-Mappings:
+ mongodb-driver: MongoDB
+ rocketMQ-producer: RocketMQ
+ rocketMQ-consumer: RocketMQ
+ kafka-producer: Kafka
+ kafka-consumer: Kafka
+ activemq-producer: ActiveMQ
+ activemq-consumer: ActiveMQ
+ postgresql-jdbc-driver: PostgreSQL
+ Xmemcached: Memcached
+ Spymemcached: Memcached
+ h2-jdbc-driver: H2
+ mysql-connector-java: Mysql
+ Jedis: Redis
+ StackExchange.Redis: Redis
+ SqlClient: SqlServer
+ Npgsql: PostgreSQL
+ MySqlConnector: Mysql
+ EntityFrameworkCore.InMemory: InMemoryDatabase
+ EntityFrameworkCore.SqlServer: SqlServer
+ EntityFrameworkCore.Sqlite: SQLite
+ Pomelo.EntityFrameworkCore.MySql: Mysql
+ Npgsql.EntityFrameworkCore.PostgreSQL: PostgreSQL
+ transport-client: Elasticsearch
+
+
diff --git a/6/6.0.0-beta/oap/02-service.yml b/6/6.0.0-beta/oap/02-service.yml
new file mode 100644
index 0000000..34c9586
--- /dev/null
+++ b/6/6.0.0-beta/oap/02-service.yml
@@ -0,0 +1,31 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+apiVersion: v1
+kind: Service
+metadata:
+ name: oap
+ namespace: skywalking
+ labels:
+ service: oap
+spec:
+ ports:
+ - port: 12800
+ name: rest
+ - port: 11800
+ name: grpc
+ selector:
+ app: oap
\ No newline at end of file
diff --git a/6/6.0.0-beta/oap/03-deployment.yml b/6/6.0.0-beta/oap/03-deployment.yml
new file mode 100644
index 0000000..5504af8
--- /dev/null
+++ b/6/6.0.0-beta/oap/03-deployment.yml
@@ -0,0 +1,61 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: oap-deployment
+ namespace: skywalking
+ labels:
+ app: oap
+spec:
+ replicas: 3
+ selector:
+ matchLabels:
+ app: oap
+ template:
+ metadata:
+ labels:
+ app: oap
+ spec:
+ serviceAccountName: skywalking-oap
+ containers:
+ - name: oap
+ image: skywalking/oap:6.0.0-beta
+ ports:
+ - containerPort: 11800
+ name: grpc
+ - containerPort: 12800
+ name: rest
+ resources:
+ requests:
+ memory: 1Gi
+ limits:
+ memory: 2Gi
+ env:
+ - name: JAVA_OPTS
+ value: -Xms256M -Xmx512M
+ - name: SKYWALKING_COLLECTOR_UID
+ valueFrom:
+ fieldRef:
+ fieldPath: metadata.uid
+ volumeMounts:
+ - name: config
+ mountPath: /skywalking/config
+ volumes:
+ - name: config
+ configMap:
+ name: oap-config
\ No newline at end of file
diff --git a/6/6.0.0-beta/ui/01-service.yml b/6/6.0.0-beta/ui/01-service.yml
new file mode 100644
index 0000000..036ec1c
--- /dev/null
+++ b/6/6.0.0-beta/ui/01-service.yml
@@ -0,0 +1,31 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+apiVersion: v1
+kind: Service
+metadata:
+ name: ui
+ namespace: skywalking
+ labels:
+ service: ui
+spec:
+ ports:
+ - port: 80
+ name: page
+ targetPort: page
+ type: LoadBalancer
+ selector:
+ app: ui
\ No newline at end of file
diff --git a/6/6.0.0-beta/ui/02-deployment.yml b/6/6.0.0-beta/ui/02-deployment.yml
new file mode 100644
index 0000000..1944c9c
--- /dev/null
+++ b/6/6.0.0-beta/ui/02-deployment.yml
@@ -0,0 +1,47 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: ui-deployment
+ namespace: skywalking
+ labels:
+ app: ui
+spec:
+ replicas: 1
+ selector:
+ matchLabels:
+ app: ui
+ template:
+ metadata:
+ labels:
+ app: ui
+ spec:
+ containers:
+ - name: ui
+ image: skywalking/ui:6.0.0-beta
+ ports:
+ - containerPort: 8080
+ name: page
+ resources:
+ requests:
+ memory: 1Gi
+ limits:
+ memory: 2Gi
+ env:
+ - name: collector.ribbon.listOfServers
+ value: oap:12800
[skywalking-kubernetes] 24/48: add icon in Chart.yaml
Posted by in...@apache.org.
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 1aa416678480380dc1111d986a9573667ddd02ca
Author: innerpeacez <zh...@163.com>
AuthorDate: Thu May 23 19:28:35 2019 +0800
add icon in Chart.yaml
---
helm/charts/6/6.0.0-GA/skywalking/Chart.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/helm/charts/6/6.0.0-GA/skywalking/Chart.yaml b/helm/charts/6/6.0.0-GA/skywalking/Chart.yaml
index 2861d97..ebcc330 100644
--- a/helm/charts/6/6.0.0-GA/skywalking/Chart.yaml
+++ b/helm/charts/6/6.0.0-GA/skywalking/Chart.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
appVersion: 6.0.0-GA
description: Apache SkyWalking APM System
version: 0.1.0
-
+icon: https://github.com/apache/skywalking-kubernetes/blob/master/logo/skywalking-logo2.png
maintainers:
- name: innerpeacez
email: 10146749@qq.com
\ No newline at end of file
[skywalking-kubernetes] 22/48: helm charts (#8)
Posted by in...@apache.org.
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 a2f59da8d0e1753a42a562de4ac70b64cafdd052
Author: innerpeacez <37...@users.noreply.github.com>
AuthorDate: Wed May 22 23:13:23 2019 +0800
helm charts (#8)
* deploy skywalking to kubernetes using helm charts
* Configmap automatically get namespace by Release
* fix bug : A volume can only be mounted once
* Parameterize terminationGracePeriodSeconds config.
* one value is configured for elasticsearch host
* oap service type
* resources (cpu memory) "toYaml"
---
helm/charts/6/6.0.0-GA/skywalking/.helmignore | 21 ++
helm/charts/6/6.0.0-GA/skywalking/Chart.yaml | 9 +
.../6/6.0.0-GA/skywalking/templates/NOTES.txt | 19 ++
.../6/6.0.0-GA/skywalking/templates/_helpers.tpl | 32 ++
.../elasticsearch/elasticsearch-service.yml | 31 ++
.../elasticsearch/elasticsearch-statefulset.yml | 122 +++++++
.../skywalking/templates/oap/oap-config.yml | 374 +++++++++++++++++++++
.../skywalking/templates/oap/oap-deployment.yml | 59 ++++
.../skywalking/templates/oap/oap-role.yaml | 24 ++
.../skywalking/templates/oap/oap-rolebinding.yaml | 27 ++
.../skywalking/templates/oap/oap-service.yml | 31 ++
.../templates/oap/oap-serviceaccount.yml | 23 ++
.../skywalking/templates/ui/ui-deployment.yml | 45 +++
.../skywalking/templates/ui/ui-service.yml | 30 ++
helm/charts/6/6.0.0-GA/skywalking/values.yaml | 111 ++++++
15 files changed, 958 insertions(+)
diff --git a/helm/charts/6/6.0.0-GA/skywalking/.helmignore b/helm/charts/6/6.0.0-GA/skywalking/.helmignore
new file mode 100644
index 0000000..f0c1319
--- /dev/null
+++ b/helm/charts/6/6.0.0-GA/skywalking/.helmignore
@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/helm/charts/6/6.0.0-GA/skywalking/Chart.yaml b/helm/charts/6/6.0.0-GA/skywalking/Chart.yaml
new file mode 100644
index 0000000..2861d97
--- /dev/null
+++ b/helm/charts/6/6.0.0-GA/skywalking/Chart.yaml
@@ -0,0 +1,9 @@
+name: skywalking
+apiVersion: v1
+appVersion: 6.0.0-GA
+description: Apache SkyWalking APM System
+version: 0.1.0
+
+maintainers:
+- name: innerpeacez
+ email: 10146749@qq.com
\ No newline at end of file
diff --git a/helm/charts/6/6.0.0-GA/skywalking/templates/NOTES.txt b/helm/charts/6/6.0.0-GA/skywalking/templates/NOTES.txt
new file mode 100644
index 0000000..e49295c
--- /dev/null
+++ b/helm/charts/6/6.0.0-GA/skywalking/templates/NOTES.txt
@@ -0,0 +1,19 @@
+1. Get the application URL by running these commands:
+{{- if .Values.ui.ingress.enabled }}
+{{- range .Values.ui.ingress.hosts }}
+ http{{ if $.Values.ui.ingress.tls }}s{{ end }}://{{ . }}{{ $.Values.ui.ingress.path }}
+{{- end }}
+{{- else if contains "NodePort" .Values.ui.service.type }}
+ export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "skywalking.fullname" . }})
+ export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
+ echo http://$NODE_IP:$NODE_PORT
+{{- else if contains "LoadBalancer" .Values.ui.service.type }}
+ NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+ You can watch the status of by running 'kubectl get svc -w {{ include "skywalking.fullname" . }}'
+ export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "skywalking.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+ echo http://$SERVICE_IP:{{ .Values.service.port }}
+{{- else if contains "ClusterIP" .Values.ui.service.type }}
+ export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ include "skywalking.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+ echo "Visit http://127.0.0.1:8080 to use your application"
+ kubectl port-forward $POD_NAME 8080:80
+{{- end }}
diff --git a/helm/charts/6/6.0.0-GA/skywalking/templates/_helpers.tpl b/helm/charts/6/6.0.0-GA/skywalking/templates/_helpers.tpl
new file mode 100644
index 0000000..817da6d
--- /dev/null
+++ b/helm/charts/6/6.0.0-GA/skywalking/templates/_helpers.tpl
@@ -0,0 +1,32 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "skywalking.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "skywalking.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "skywalking.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
diff --git a/helm/charts/6/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-service.yml b/helm/charts/6/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-service.yml
new file mode 100644
index 0000000..78b2719
--- /dev/null
+++ b/helm/charts/6/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-service.yml
@@ -0,0 +1,31 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+apiVersion: v1
+kind: Service
+metadata:
+ name: {{ template "skywalking.fullname" . }}-elasticsearch
+ labels:
+ service: {{ .Values.elasticsearch.name }}
+spec:
+ clusterIP: None
+ ports:
+ - port: {{ .Values.elasticsearch.ports.http }}
+ name: serving
+ - port: {{ .Values.elasticsearch.ports.tcp }}
+ name: node-to-node
+ selector:
+ service: {{ .Values.elasticsearch.name }}
\ No newline at end of file
diff --git a/helm/charts/6/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-statefulset.yml b/helm/charts/6/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-statefulset.yml
new file mode 100644
index 0000000..e2919d4
--- /dev/null
+++ b/helm/charts/6/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-statefulset.yml
@@ -0,0 +1,122 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+ name: {{ template "skywalking.fullname" . }}-elasticsearch
+ labels:
+ service: {{ .Values.elasticsearch.name }}
+spec:
+ serviceName: {{ .Values.elasticsearch.name }}
+ # NOTE: This is number of nodes that we want to run
+ # you may update this
+ replicas: {{ .Values.elasticsearch.replicas }}
+ selector:
+ matchLabels:
+ service: {{ .Values.elasticsearch.name }}
+ template:
+ metadata:
+ labels:
+ service: {{ .Values.elasticsearch.name }}
+ spec:
+ terminationGracePeriodSeconds: {{ .Values.elasticsearch.terminationGracePeriodSeconds }}
+ initContainers:
+ # NOTE:
+ # This is to fix the permission on the volume
+ # By default elasticsearch container is not run as
+ # non root user.
+ # https://www.elastic.co/guide/en/elasticsearch/reference/current/docker.html#_notes_for_production_use_and_defaults
+ - name: fix-the-volume-permission
+ image: busybox
+ command:
+ - sh
+ - -c
+ - chown -R 1000:1000 /usr/share/elasticsearch/data
+ securityContext:
+ privileged: true
+ volumeMounts:
+ - name: data
+ mountPath: /usr/share/elasticsearch/data
+ # NOTE:
+ # To increase the default vm.max_map_count to 262144
+ # https://www.elastic.co/guide/en/elasticsearch/reference/current/docker.html#docker-cli-run-prod-mode
+ - name: increase-the-vm-max-map-count
+ image: busybox
+ command:
+ - sysctl
+ - -w
+ - vm.max_map_count=262144
+ securityContext:
+ privileged: true
+ # To increase the ulimit
+ # https://www.elastic.co/guide/en/elasticsearch/reference/current/docker.html#_notes_for_production_use_and_defaults
+ - name: increase-the-ulimit
+ image: busybox
+ command:
+ - sh
+ - -c
+ - ulimit -n 65536
+ securityContext:
+ privileged: true
+ containers:
+ - name: elasticsearch
+ image: {{ .Values.elasticsearch.image.repository }}:{{ .Values.elasticsearch.image.tag }}
+ ports:
+ - containerPort: {{ .Values.elasticsearch.ports.http }}
+ name: http
+ - containerPort: {{ .Values.elasticsearch.ports.tcp }}
+ name: tcp
+ # NOTE: you can increase this resources
+{{- if .Values.elasticsearch.resources }}
+ resources:
+{{ toYaml .Values.elasticsearch.resources | indent 10 }}
+{{- end }}
+ env:
+ # NOTE: the cluster name; update this
+ - name: cluster.name
+ value: elasticsearch-cluster
+ - name: node.name
+ valueFrom:
+ fieldRef:
+ 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 }}
+ # NOTE: You can increase the heap size
+ - name: ES_JAVA_OPTS
+ value: {{ .Values.elasticsearch.env.esJavaOpts }}
+ volumeMounts:
+ - name: data
+ mountPath: /usr/share/elasticsearch/data
+ {{- if .Values.elasticsearch.persistence.enabled }}
+ volumeClaimTemplates:
+ - metadata:
+ name: data
+ spec:
+ accessModes:
+ - {{ .Values.elasticsearch.persistence.accessMode }}
+ {{- if .Values.elasticsearch.persistence.storageClass }}
+ {{- if (eq "-" .Values.elasticsearch.persistence.storageClass) }}
+ storageClassName: ""
+ {{- else }}
+ storageClassName: "{{ .Values.elasticsearch.persistence.storageClass }}"
+ {{- end }}
+ {{- end }}
+ resources:
+ requests:
+ storage: "{{ .Values.elasticsearch.persistence.size }}"
+ {{- end -}}
diff --git a/helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-config.yml b/helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-config.yml
new file mode 100644
index 0000000..ea80c88
--- /dev/null
+++ b/helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-config.yml
@@ -0,0 +1,374 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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:
+ name: {{ template "skywalking.fullname" . }}-oap-config
+data:
+ application.yml: |-
+ cluster:
+ kubernetes:
+ watchTimeoutSeconds: 60
+ labelSelector: app={{ $oapService }}
+ uidEnvName: SKYWALKING_COLLECTOR_UID
+ namespace: {{ $namespace }}
+ core:
+ default:
+ restHost: 0.0.0.0
+ restPort: 12800
+ restContextPath: /
+ gRPCHost: 0.0.0.0
+ gRPCPort: 11800
+ downsampling:
+ - Hour
+ - Day
+ - Month
+ recordDataTTL: 90 # Unit is minute
+ minuteMetricsDataTTL: 90 # Unit is minute
+ hourMetricsDataTTL: 36 # Unit is hour
+ dayMetricsDataTTL: 45 # Unit is day
+ monthMetricsDataTTL: 18 # Unit is month
+ storage:
+ elasticsearch:
+ clusterNodes: skywalking-elasticsearch:9200
+ indexShardsNumber: 2
+ indexReplicasNumber: 0
+ bulkActions: 2000 # Execute the bulk every 2000 requests
+ bulkSize: 20 # flush the bulk every 20mb
+ flushInterval: 10 # flush the bulk every 10 seconds whatever the number of requests
+ concurrentRequests: 2 # the number of concurrent requests
+ receiver-register:
+ default:
+ receiver-trace:
+ default:
+ bufferPath: /trace-buffer/ # Path to trace buffer files, suggest to use absolute path
+ bufferOffsetMaxFileSize: 100 # Unit is MB
+ bufferDataMaxFileSize: 500 # Unit is MB
+ bufferFileCleanWhenRestart: false
+ receiver-jvm:
+ default:
+ service-mesh:
+ default:
+ bufferPath: /mesh-buffer/ # Path to trace buffer files, suggest to use absolute path
+ bufferOffsetMaxFileSize: 100 # Unit is MB
+ bufferDataMaxFileSize: 500 # Unit is MB
+ bufferFileCleanWhenRestart: false
+ istio-telemetry:
+ default:
+ query:
+ graphql:
+ path: /graphql
+ alarm:
+ default:
+ telemetry:
+ prometheus:
+
+ log4j2.xml: |-
+ <Configuration status="INFO">
+ <Appenders>
+ <Console name="Console" target="SYSTEM_OUT">
+ <PatternLayout charset="UTF-8" pattern="%d - %c -%-4r [%t] %-5p %x - %m%n"/>
+ </Console>
+ </Appenders>
+ <Loggers>
+ <logger name="org.eclipse.jetty" level="INFO"/>
+ <logger name="org.apache.zookeeper" level="INFO"/>
+ <logger name="org.elasticsearch.common.network.IfConfig" level="INFO"/>
+ <logger name="io.grpc.netty" level="INFO"/>
+ <logger name="org.apache.skywalking.oap.server.receiver.istio.telemetry" level="DEBUG"/>
+ <Root level="INFO">
+ <AppenderRef ref="Console"/>
+ </Root>
+ </Loggers>
+ </Configuration>
+
+ alarm-settings.yml: |-
+ rules:
+ service_resp_time_rule:
+ indicator-name: service_resp_time
+ include-names:
+ - dubbox-provider
+ - dubbox-consumer
+ threshold: 1000
+ op: ">"
+ period: 10
+ count: 1
+ webhooks:
+
+ component-libraries.yml: |-
+ Tomcat:
+ id: 1
+ languages: Java
+ HttpClient:
+ id: 2
+ languages: Java,C#,Node.js
+ Dubbo:
+ id: 3
+ languages: Java
+ H2:
+ id: 4
+ languages: Java
+ Mysql:
+ id: 5
+ languages: Java,C#,Node.js
+ ORACLE:
+ id: 6
+ languages: Java
+ Redis:
+ id: 7
+ languages: Java,C#,Node.js
+ Motan:
+ id: 8
+ languages: Java
+ MongoDB:
+ id: 9
+ languages: Java,C#,Node.js
+ Resin:
+ id: 10
+ languages: Java
+ Feign:
+ id: 11
+ languages: Java
+ OKHttp:
+ id: 12
+ languages: Java
+ SpringRestTemplate:
+ id: 13
+ languages: Java
+ SpringMVC:
+ id: 14
+ languages: Java
+ Struts2:
+ id: 15
+ languages: Java
+ NutzMVC:
+ id: 16
+ languages: Java
+ NutzHttp:
+ id: 17
+ languages: Java
+ JettyClient:
+ id: 18
+ languages: Java
+ JettyServer:
+ id: 19
+ languages: Java
+ Memcached:
+ id: 20
+ languages: Java
+ ShardingJDBC:
+ id: 21
+ languages: Java
+ PostgreSQL:
+ id: 22
+ languages: Java,C#,Node.js
+ GRPC:
+ id: 23
+ languages: Java
+ ElasticJob:
+ id: 24
+ languages: Java
+ RocketMQ:
+ id: 25
+ languages: Java
+ httpasyncclient:
+ id: 26
+ languages: Java
+ Kafka:
+ id: 27
+ languages: Java
+ ServiceComb:
+ id: 28
+ languages: Java
+ Hystrix:
+ id: 29
+ languages: Java
+ Jedis:
+ id: 30
+ languages: Java
+ SQLite:
+ id: 31
+ languages: Java,C#
+ h2-jdbc-driver:
+ id: 32
+ languages: Java
+ mysql-connector-java:
+ id: 33
+ languages: Java
+ ojdbc:
+ id: 34
+ languages: Java
+ Spymemcached:
+ id: 35
+ languages: Java
+ Xmemcached:
+ id: 36
+ languages: Java
+ postgresql-jdbc-driver:
+ id: 37
+ languages: Java
+ rocketMQ-producer:
+ id: 38
+ languages: Java
+ rocketMQ-consumer:
+ id: 39
+ languages: Java
+ kafka-producer:
+ id: 40
+ languages: Java
+ kafka-consumer:
+ id: 41
+ languages: Java
+ mongodb-driver:
+ id: 42
+ languages: Java
+ SOFARPC:
+ id: 43
+ languages: Java
+ ActiveMQ:
+ id: 44
+ languages: Java
+ activemq-producer:
+ id: 45
+ languages: Java
+ activemq-consumer:
+ id: 46
+ languages: Java
+ Elasticsearch:
+ id: 47
+ languages: Java
+ transport-client:
+ id: 48
+ languages: Java
+ http:
+ id: 49
+ languages: Java,C#,Node.js
+ rpc:
+ id: 50
+ languages: Java,C#,Node.js
+ RabbitMQ:
+ id: 51
+ languages: Java
+ rabbitmq-producer:
+ id: 52
+ languages: Java
+ rabbitmq-consumer:
+ id: 53
+ languages: Java
+ Canal:
+ id: 54
+ languages: Java
+ Gson:
+ id: 55
+ languages: Java
+ Redisson:
+ id: 56
+ languages: Java
+ AspNetCore:
+ id: 3001
+ languages: C#
+ EntityFrameworkCore:
+ id: 3002
+ languages: C#
+ SqlClient:
+ id: 3003
+ languages: C#
+ CAP:
+ id: 3004
+ languages: C#
+ StackExchange.Redis:
+ id: 3005
+ languages: C#
+ SqlServer:
+ id: 3006
+ languages: C#
+ Npgsql:
+ id: 3007
+ languages: C#
+ MySqlConnector:
+ id: 3008
+ languages: C#
+ EntityFrameworkCore.InMemory:
+ id: 3009
+ languages: C#
+ EntityFrameworkCore.SqlServer:
+ id: 3010
+ languages: C#
+ EntityFrameworkCore.Sqlite:
+ id: 3011
+ languages: C#
+ Pomelo.EntityFrameworkCore.MySql:
+ id: 3012
+ languages: C#
+ Npgsql.EntityFrameworkCore.PostgreSQL:
+ id: 3013
+ languages: C#
+ InMemoryDatabase:
+ id: 3014
+ languages: C#
+ AspNet:
+ id: 3015
+ languages: C#
+
+ # NoeJS components
+ # [4000, 5000) for Node.js agent
+ HttpServer:
+ id: 4001
+ languages: Node.js
+ express:
+ id: 4002
+ languages: Node.js
+ Egg:
+ id: 4003
+ languages: Node.js
+ Koa:
+ id: 4004
+ languages: Node.js
+
+ # Component Server mapping defines the server display names of some components
+ # e.g.
+ # Jedis is a client library in Java for Redis server
+ Component-Server-Mappings:
+ mongodb-driver: MongoDB
+ rocketMQ-producer: RocketMQ
+ rocketMQ-consumer: RocketMQ
+ kafka-producer: Kafka
+ kafka-consumer: Kafka
+ activemq-producer: ActiveMQ
+ activemq-consumer: ActiveMQ
+ rabbitmq-producer: RabbitMQ
+ rabbitmq-consumer: RabbitMQ
+ postgresql-jdbc-driver: PostgreSQL
+ Xmemcached: Memcached
+ Spymemcached: Memcached
+ h2-jdbc-driver: H2
+ mysql-connector-java: Mysql
+ Jedis: Redis
+ StackExchange.Redis: Redis
+ Redisson: Redis
+ SqlClient: SqlServer
+ Npgsql: PostgreSQL
+ MySqlConnector: Mysql
+ EntityFrameworkCore.InMemory: InMemoryDatabase
+ EntityFrameworkCore.SqlServer: SqlServer
+ EntityFrameworkCore.Sqlite: SQLite
+ Pomelo.EntityFrameworkCore.MySql: Mysql
+ Npgsql.EntityFrameworkCore.PostgreSQL: PostgreSQL
+ transport-client: Elasticsearch
+
+
diff --git a/helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-deployment.yml b/helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-deployment.yml
new file mode 100644
index 0000000..2bfd271
--- /dev/null
+++ b/helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-deployment.yml
@@ -0,0 +1,59 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: {{ template "skywalking.fullname" . }}-oap
+ labels:
+ app: {{ .Values.oap.name }}
+spec:
+ replicas: {{ .Values.oap.replicas }}
+ selector:
+ matchLabels:
+ app: {{ .Values.oap.name }}
+ template:
+ metadata:
+ labels:
+ app: {{ .Values.oap.name }}
+ spec:
+ serviceAccountName: {{ .Values.oap.name }}
+ containers:
+ - name: {{ .Values.oap.name }}
+ image: {{ .Values.oap.image.repository }}:{{ .Values.oap.image.tag }}
+ ports:
+ - containerPort: {{ .Values.oap.ports.grpc }}
+ name: grpc
+ - containerPort: {{ .Values.oap.ports.rest }}
+ name: rest
+{{- if .Values.oap.resources }}
+ resources:
+{{ toYaml .Values.oap.resources | indent 10 }}
+{{- end }}
+ env:
+ - name: JAVA_OPTS
+ value: {{ .Values.oap.env.javaOpts }}
+ - name: SKYWALKING_COLLECTOR_UID
+ valueFrom:
+ fieldRef:
+ fieldPath: metadata.uid
+ volumeMounts:
+ - name: config
+ mountPath: /skywalking/config
+ volumes:
+ - name: config
+ configMap:
+ name: {{ template "skywalking.fullname" . }}-oap-config
\ No newline at end of file
diff --git a/helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-role.yaml b/helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-role.yaml
new file mode 100644
index 0000000..a348796
--- /dev/null
+++ b/helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-role.yaml
@@ -0,0 +1,24 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+kind: Role
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+ name: {{ template "skywalking.fullname" . }}-oap
+rules:
+- apiGroups: [""]
+ resources: ["pods"]
+ verbs: ["get", "watch", "list"]
\ No newline at end of file
diff --git a/helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-rolebinding.yaml b/helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-rolebinding.yaml
new file mode 100644
index 0000000..53ce80a
--- /dev/null
+++ b/helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-rolebinding.yaml
@@ -0,0 +1,27 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+ name: {{ template "skywalking.fullname" . }}-oap
+roleRef:
+ apiGroup: rbac.authorization.k8s.io
+ kind: Role
+ name: {{ template "skywalking.fullname" . }}-oap
+subjects:
+- kind: ServiceAccount
+ name: {{ template "skywalking.fullname" . }}-oap
\ No newline at end of file
diff --git a/helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-service.yml b/helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-service.yml
new file mode 100644
index 0000000..192ea6c
--- /dev/null
+++ b/helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-service.yml
@@ -0,0 +1,31 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+apiVersion: v1
+kind: Service
+metadata:
+ name: {{ template "skywalking.fullname" . }}-oap
+ labels:
+ service: {{ .Values.oap.name }}
+spec:
+ type: {{ .Values.oap.service.type }}
+ ports:
+ - port: {{ .Values.oap.ports.rest }}
+ name: rest
+ - port: {{ .Values.oap.ports.grpc }}
+ name: grpc
+ selector:
+ app: {{ .Values.oap.name }}
\ No newline at end of file
diff --git a/helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-serviceaccount.yml b/helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-serviceaccount.yml
new file mode 100644
index 0000000..addabf9
--- /dev/null
+++ b/helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-serviceaccount.yml
@@ -0,0 +1,23 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+ name: {{ template "skywalking.fullname" . }}-oap
+
+
+
diff --git a/helm/charts/6/6.0.0-GA/skywalking/templates/ui/ui-deployment.yml b/helm/charts/6/6.0.0-GA/skywalking/templates/ui/ui-deployment.yml
new file mode 100644
index 0000000..b11f9fc
--- /dev/null
+++ b/helm/charts/6/6.0.0-GA/skywalking/templates/ui/ui-deployment.yml
@@ -0,0 +1,45 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: {{ template "skywalking.fullname" . }}-ui
+ labels:
+ app: {{ .Values.ui.name }}
+spec:
+ replicas: {{ .Values.ui.replicas }}
+ selector:
+ matchLabels:
+ app: {{ .Values.ui.name }}
+ template:
+ metadata:
+ labels:
+ app: {{ .Values.ui.name }}
+ spec:
+ containers:
+ - name: {{ .Values.ui.name }}
+ image: {{ .Values.ui.image.repository }}:{{ .Values.ui.image.tag }}
+ ports:
+ - containerPort: {{ .Values.ui.ports.page }}
+ name: page
+{{- if .Values.ui.resources }}
+ resources:
+{{ toYaml .Values.ui.resources | indent 10 }}
+{{- end }}
+ env:
+ - name: collector.ribbon.listOfServers
+ value: {{ .Values.oap.name }}:{{ .Values.oap.ports.rest }}
diff --git a/helm/charts/6/6.0.0-GA/skywalking/templates/ui/ui-service.yml b/helm/charts/6/6.0.0-GA/skywalking/templates/ui/ui-service.yml
new file mode 100644
index 0000000..ac5c26a
--- /dev/null
+++ b/helm/charts/6/6.0.0-GA/skywalking/templates/ui/ui-service.yml
@@ -0,0 +1,30 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+apiVersion: v1
+kind: Service
+metadata:
+ name: {{ template "skywalking.fullname" . }}-ui
+ labels:
+ service: {{ .Values.ui.name }}
+spec:
+ ports:
+ - port: {{ .Values.ui.ports.page }}
+ name: page
+ targetPort: page
+ type: {{ .Values.ui.service.type }}
+ selector:
+ app: {{ .Values.ui.name }}
\ No newline at end of file
diff --git a/helm/charts/6/6.0.0-GA/skywalking/values.yaml b/helm/charts/6/6.0.0-GA/skywalking/values.yaml
new file mode 100644
index 0000000..27604d9
--- /dev/null
+++ b/helm/charts/6/6.0.0-GA/skywalking/values.yaml
@@ -0,0 +1,111 @@
+# Default values for skywalking.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+elasticsearch:
+ name: skywalking-elasticsearch
+ replicas: 3
+ image:
+ repository: docker.elastic.co/elasticsearch/elasticsearch-oss
+ tag: 6.3.2
+ pullPolicy: IfNotPresent
+ ports:
+ http: 9200
+ tcp: 9300
+ clusterHost: discovery.zen.ping.unicast.hosts
+ env:
+ esJavaOpts: "-Xms4g -Xmx4g"
+ resources:
+ # We usually recommend not to specify default resources and to leave this as a conscious
+ # choice for the user. This also increases chances charts run on environments with little
+ # resources, such as Minikube. If you do want to specify resources, uncomment the following
+ # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+ limits:
+ # cpu: 100m
+ memory: 16Gi
+ requests:
+ # cpu: 100m
+ memory: 8Gi
+ persistence:
+ enabled: true
+ ## data Persistent Volume Storage Class
+ ## If defined, storageClassName: <storageClass>
+ ## If set to "-", storageClassName: "", which disables dynamic provisioning
+ ## If undefined (the default) or set to null, no storageClassName spec is
+ ## set, choosing the default provisioner. (gp2 on AWS, standard on
+ ## GKE, AWS & OpenStack)
+ ##
+ storageClass: fast
+ ##
+ ## 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
+ terminationGracePeriodSeconds: 300
+
+oap:
+ name: skywalking-oap
+ image:
+ repository: skywalking/oap
+ tag: 6.0.0-GA
+ pullPolicy: IfNotPresent
+ ports:
+ grpc: 11800
+ rest: 12800
+ replicas: 3
+ service:
+ type: ClusterIP
+ env:
+ javaOpts: "-Xms256M -Xmx512M"
+ resources:
+ # We usually recommend not to specify default resources and to leave this as a conscious
+ # choice for the user. This also increases chances charts run on environments with little
+ # resources, such as Minikube. If you do want to specify resources, uncomment the following
+ # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+ limits:
+ # cpu: 100m
+ memory: 2Gi
+ requests:
+ # cpu: 100m
+ memory: 1Gi
+
+ui:
+ name: skywalking-ui
+ replicas: 1
+ image:
+ repository: skywalking/ui
+ tag: 6.0.0-GA
+ pullPolicy: IfNotPresent
+ ports:
+ page: 8080
+ ingress:
+ enabled: false
+ 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
+ service:
+ type: NodePort
+ port: 80
+ resources:
+ # We usually recommend not to specify default resources and to leave this as a conscious
+ # choice for the user. This also increases chances charts run on environments with little
+ # resources, such as Minikube. If you do want to specify resources, uncomment the following
+ # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+ limits:
+ # cpu: 100m
+ memory: 2Gi
+ requests:
+ # cpu: 100m
+ memory: 1Gi
+
+
+nameOverride: ""
+fullnameOverride: ""
[skywalking-kubernetes] 06/48: Update README.md
Posted by in...@apache.org.
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 7862484b748ca4f5c9e3995d0692e656b48b641c
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Sat Nov 17 20:32:17 2018 +0800
Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 0db37cd..4bae8d1 100644
--- a/README.md
+++ b/README.md
@@ -37,4 +37,4 @@ Istio should be installed in kubernetes cluster.
## Setup Istio to send metric to oap
-Use `kubectl apply -f ` with the scripts in `kubernetes/istio` to setup.
+Use `kubectl apply -f ` with the scripts in `scripts/istio` to setup.
[skywalking-kubernetes] 46/48: Support for envoy sla and turn off
es persistence enabled by default
Posted by in...@apache.org.
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 435af5357930969b6e8a3f8aa43b112ab2c3549f
Author: innerpeacez <in...@gmail.com>
AuthorDate: Sun Oct 20 15:02:38 2019 +0800
Support for envoy sla and turn off es persistence enabled by default
---
helm-chart/helm3/6.4.0/skywalking/README.md | 22 +++++++++++++++++++---
.../skywalking/templates/oap-clusterrole.yaml | 4 +++-
.../templates/oap-clusterrolebinding.yaml | 2 ++
.../6.4.0/skywalking/templates/oap-deployment.yaml | 4 ++++
.../{oap-clusterrole.yaml => oap-role.yaml} | 13 ++++++-------
...lusterrolebinding.yaml => oap-rolebinding.yaml} | 12 +++++++-----
helm-chart/helm3/6.4.0/skywalking/values.yaml | 10 ++++++----
7 files changed, 47 insertions(+), 20 deletions(-)
diff --git a/helm-chart/helm3/6.4.0/skywalking/README.md b/helm-chart/helm3/6.4.0/skywalking/README.md
index 0421897..0fb8061 100644
--- a/helm-chart/helm3/6.4.0/skywalking/README.md
+++ b/helm-chart/helm3/6.4.0/skywalking/README.md
@@ -29,7 +29,7 @@ The command deploys Apache Skywalking on the Kubernetes cluster in the default c
To uninstall/delete the `my-release` deployment:
```shell
-$ helm delete my-release -n <namespace>
+$ helm uninstall my-release -n <namespace>
```
The command removes all the Kubernetes components associated with the chart and deletes the release.
@@ -56,6 +56,7 @@ The following table lists the configurable parameters of the Skywalking chart an
| `oap.nodeSelector` | OAP labels for master pod assignment | `{}` |
| `oap.tolerations` | OAP tolerations | `[]` |
| `oap.resources` | OAP node resources requests & limits | `{} - cpu limit must be an integer` |
+| `oap.envoy.sla.enabled` | Open envoy sla | `false` |
| `oap.env` | OAP environment variables | `[]` |
| `ui.name` | Web UI deployment name | `ui` |
| `ui.replicas` | Web UI k8s deployment replicas | `1` |
@@ -111,7 +112,7 @@ The following table lists the configurable parameters of the Skywalking chart an
| `elasticsearch.master.tolerations` | `[]` | Master tolerations |
| `elasticsearch.master.heapSize` | `512m` | Master node heap size |
| `elasticsearch.master.name` | `master` | Master component name |
-| `elasticsearch.master.persistence.enabled` | `true` | Master persistent enabled/disabled |
+| `elasticsearch.master.persistence.enabled` | `false` | Master persistent enabled/disabled |
| `elasticsearch.master.persistence.name` | `data` | Master statefulset PVC template name |
| `elasticsearch.master.persistence.size` | `4Gi` | Master persistent volume size |
| `elasticsearch.master.persistence.storageClass` | `nil` | Master persistent volume Class |
@@ -129,7 +130,7 @@ The following table lists the configurable parameters of the Skywalking chart an
| `elasticsearch.data.priorityClassName` | `nil` | Data priorityClass |
| `elasticsearch.data.heapSize` | `1536m` | Data node heap size |
| `elasticsearch.data.hooks.drain.enabled` | `true` | Data nodes: Enable drain pre-stop and post-start hook |
-| `elasticsearch.data.persistence.enabled` | `true` | Data persistent enabled/disabled |
+| `elasticsearch.data.persistence.enabled` | `false` | Data persistent enabled/disabled |
| `elasticsearch.data.persistence.name` | `data` | Data statefulset PVC template name |
| `elasticsearch.data.persistence.size` | `30Gi` | Data persistent volume size |
| `elasticsearch.data.persistence.storageClass` | `nil` | Data persistent volume Class |
@@ -196,3 +197,18 @@ ui:
hosts:
- skywalking.domain.com
```
+### Envoy ALS
+
+Envoy ALS(access log service) provides fully logs about RPC routed, including HTTP and TCP.
+
+If you want to open envoy sla, you can do this by modifying values.yaml.
+
+```yaml
+oap:
+ envoy:
+ sla:
+ enabled: true
+```
+
+When envoy sla , will give ServerAccount clusterrole permission.
+More envoy sla ,please refer to https://github.com/apache/skywalking/blob/master/docs/en/setup/envoy/als_setting.md#observe-service-mesh-through-als
\ No newline at end of file
diff --git a/helm-chart/helm3/6.4.0/skywalking/templates/oap-clusterrole.yaml b/helm-chart/helm3/6.4.0/skywalking/templates/oap-clusterrole.yaml
index 87fbe84..cf78e7e 100644
--- a/helm-chart/helm3/6.4.0/skywalking/templates/oap-clusterrole.yaml
+++ b/helm-chart/helm3/6.4.0/skywalking/templates/oap-clusterrole.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.oap.envoy.als.enabled }}
kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1
metadata:
@@ -13,4 +14,5 @@ rules:
verbs: ["get", "watch", "list"]
- apiGroups: ["extensions"]
resources: ["deployments", "replicasets"]
- verbs: ["get", "watch", "list"]
\ No newline at end of file
+ verbs: ["get", "watch", "list"]
+{{- end }}
\ No newline at end of file
diff --git a/helm-chart/helm3/6.4.0/skywalking/templates/oap-clusterrolebinding.yaml b/helm-chart/helm3/6.4.0/skywalking/templates/oap-clusterrolebinding.yaml
index 3f23c67..eeeb15f 100644
--- a/helm-chart/helm3/6.4.0/skywalking/templates/oap-clusterrolebinding.yaml
+++ b/helm-chart/helm3/6.4.0/skywalking/templates/oap-clusterrolebinding.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.oap.envoy.als.enabled }}
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
@@ -15,3 +16,4 @@ subjects:
- kind: ServiceAccount
name: {{ template "skywalking.serviceAccountName.oap" . }}
namespace: {{ .Release.Namespace }}
+{{- end }}
\ No newline at end of file
diff --git a/helm-chart/helm3/6.4.0/skywalking/templates/oap-deployment.yaml b/helm-chart/helm3/6.4.0/skywalking/templates/oap-deployment.yaml
index ecc7436..eebecfb 100644
--- a/helm-chart/helm3/6.4.0/skywalking/templates/oap-deployment.yaml
+++ b/helm-chart/helm3/6.4.0/skywalking/templates/oap-deployment.yaml
@@ -91,6 +91,10 @@ spec:
fieldPath: metadata.uid
- name: SW_STORAGE
value: elasticsearch
+ {{- if .Values.oap.envoy.als.enabled }}
+ - name: SW_ENVOY_ALS_ENABLED
+ value: {{ .Values.oap.envoy.als.enabled | quote}}
+ {{- end }}
- name: SW_STORAGE_ES_CLUSTER_NODES
value: "{{ include "call-nested" (list . "elasticsearch" "elasticsearch.client.fullname") }}:9200"
{{- range $key, $value := .Values.oap.env }}
diff --git a/helm-chart/helm3/6.4.0/skywalking/templates/oap-clusterrole.yaml b/helm-chart/helm3/6.4.0/skywalking/templates/oap-role.yaml
similarity index 59%
copy from helm-chart/helm3/6.4.0/skywalking/templates/oap-clusterrole.yaml
copy to helm-chart/helm3/6.4.0/skywalking/templates/oap-role.yaml
index 87fbe84..bbf21ce 100644
--- a/helm-chart/helm3/6.4.0/skywalking/templates/oap-clusterrole.yaml
+++ b/helm-chart/helm3/6.4.0/skywalking/templates/oap-role.yaml
@@ -1,4 +1,5 @@
-kind: ClusterRole
+{{- if not .Values.oap.envoy.als.enabled }}
+kind: Role
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: {{ template "skywalking.fullname" . }}
@@ -8,9 +9,7 @@ metadata:
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
rules:
-- apiGroups: [""]
- resources: ["pods"]
- verbs: ["get", "watch", "list"]
-- apiGroups: ["extensions"]
- resources: ["deployments", "replicasets"]
- verbs: ["get", "watch", "list"]
\ No newline at end of file
+ - apiGroups: [""]
+ resources: ["pods"]
+ verbs: ["get", "watch", "list"]
+{{- end }}
\ No newline at end of file
diff --git a/helm-chart/helm3/6.4.0/skywalking/templates/oap-clusterrolebinding.yaml b/helm-chart/helm3/6.4.0/skywalking/templates/oap-rolebinding.yaml
similarity index 64%
copy from helm-chart/helm3/6.4.0/skywalking/templates/oap-clusterrolebinding.yaml
copy to helm-chart/helm3/6.4.0/skywalking/templates/oap-rolebinding.yaml
index 3f23c67..1eae86a 100644
--- a/helm-chart/helm3/6.4.0/skywalking/templates/oap-clusterrolebinding.yaml
+++ b/helm-chart/helm3/6.4.0/skywalking/templates/oap-rolebinding.yaml
@@ -1,5 +1,6 @@
+{{- if not .Values.oap.envoy.als.enabled }}
apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
+kind: RoleBinding
metadata:
name: {{ template "skywalking.fullname" . }}
labels:
@@ -9,9 +10,10 @@ metadata:
heritage: "{{ .Release.Service }}"
roleRef:
apiGroup: rbac.authorization.k8s.io
- kind: ClusterRole
+ kind: Role
name: {{ template "skywalking.fullname" . }}
subjects:
-- kind: ServiceAccount
- name: {{ template "skywalking.serviceAccountName.oap" . }}
- namespace: {{ .Release.Namespace }}
+ - kind: ServiceAccount
+ name: {{ template "skywalking.serviceAccountName.oap" . }}
+ namespace: {{ .Release.Namespace }}
+{{- end }}
\ No newline at end of file
diff --git a/helm-chart/helm3/6.4.0/skywalking/values.yaml b/helm-chart/helm3/6.4.0/skywalking/values.yaml
index 3e45335..397d314 100644
--- a/helm-chart/helm3/6.4.0/skywalking/values.yaml
+++ b/helm-chart/helm3/6.4.0/skywalking/values.yaml
@@ -31,11 +31,13 @@ oap:
# memory: 4Gi
# podAnnotations:
# example: oap-foo
+ envoy:
+ als:
+ enabled: false
+ # more envoy sla ,please refer to https://github.com/apache/skywalking/blob/master/docs/en/setup/envoy/als_setting.md#observe-service-mesh-through-als
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
@@ -155,7 +157,7 @@ elasticsearch:
heapSize: "512m"
# additionalJavaOpts: "-XX:MaxRAM=512m"
persistence:
- enabled: true
+ enabled: false
accessMode: ReadWriteOnce
name: data
size: "4Gi"
@@ -202,7 +204,7 @@ elasticsearch:
heapSize: "1536m"
# additionalJavaOpts: "-XX:MaxRAM=1536m"
persistence:
- enabled: true
+ enabled: false
accessMode: ReadWriteOnce
name: data
size: "30Gi"
[skywalking-kubernetes] 48/48: Merge pull request #21 from
innerpeacez/modify
Posted by in...@apache.org.
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 f0e0f1387ec21fd4f8a5ca6c2924213453e862ac
Merge: fafaa1c f112302
Author: innerpeacez <in...@gmail.com>
AuthorDate: Tue Oct 22 13:58:07 2019 +0800
Merge pull request #21 from innerpeacez/modify
modify role to clusterrole
helm-chart/helm3/6.4.0/skywalking/Chart.yaml | 4 ++--
helm-chart/helm3/6.4.0/skywalking/README.md | 22 +++++++++++++++++++---
.../{oap-role.yaml => oap-clusterrole.yaml} | 7 ++++++-
...olebinding.yaml => oap-clusterrolebinding.yaml} | 6 ++++--
.../6.4.0/skywalking/templates/oap-deployment.yaml | 4 ++++
.../helm3/6.4.0/skywalking/templates/oap-role.yaml | 8 +++++---
.../skywalking/templates/oap-rolebinding.yaml | 8 +++++---
helm-chart/helm3/6.4.0/skywalking/values.yaml | 10 +++++++---
8 files changed, 52 insertions(+), 17 deletions(-)
[skywalking-kubernetes] 15/48: Merge pull request #3 from
apache/6.0.0-alpha
Posted by in...@apache.org.
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 0dcefa719c119d45cc168a3f8c047605c89f549b
Merge: c37f77c 5ad94d8
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Wed Jan 30 15:56:22 2019 +0800
Merge pull request #3 from apache/6.0.0-alpha
6.0.0GA
6/6.0.0-GA/elasticsearch/01-storageclass.yml | 24 ++
6/6.0.0-GA/elasticsearch/02-service.yml | 32 +++
6/6.0.0-GA/elasticsearch/03-statefulset.yml | 117 +++++++++
6/6.0.0-GA/istio/01-metrictemplete.yml | 24 ++
6/6.0.0-GA/istio/02-skywalingadapter.yml | 26 ++
6/6.0.0-GA/istio/03-operator_cfg.yml | 65 +++++
6/{6.0.0-beta => 6.0.0-GA}/namespace.yml | 0
6/6.0.0-GA/oap/00-rbac.yml | 50 ++++
6/6.0.0-GA/oap/01-config.yml | 374 +++++++++++++++++++++++++++
6/6.0.0-GA/oap/02-service.yml | 31 +++
6/6.0.0-GA/oap/03-deployment.yml | 61 +++++
6/6.0.0-GA/ui/01-service.yml | 31 +++
6/6.0.0-GA/ui/02-deployment.yml | 47 ++++
6/6.0.0-alpha/namespace.yml | 2 +-
6/6.0.0-beta/namespace.yml | 2 +-
15 files changed, 884 insertions(+), 2 deletions(-)
[skywalking-kubernetes] 41/48: Merge pull request #18 from
innerpeacez/logo
Posted by in...@apache.org.
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 b6e2d3547a01eb733334bb118d8c522ca00d4c14
Merge: 0bc427f 81c5699
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Tue Oct 8 17:48:04 2019 +0800
Merge pull request #18 from innerpeacez/logo
logo for chart
logo/sw-logo-for-chart.jpg | Bin 0 -> 7080 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
[skywalking-kubernetes] 13/48: Add 6.0.0-GA and 6.0.0-beta
Posted by in...@apache.org.
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 aaad9f68c48188227cdd219dd4de9622a4dfd136
Author: gaohongtao <ha...@gmail.com>
AuthorDate: Wed Jan 30 15:46:54 2019 +0800
Add 6.0.0-GA and 6.0.0-beta
---
6/6.0.0-GA/elasticsearch/01-storageclass.yml | 24 ++
6/6.0.0-GA/elasticsearch/02-service.yml | 32 +++
6/6.0.0-GA/elasticsearch/03-statefulset.yml | 117 ++++++++
6/6.0.0-GA/istio/01-metrictemplete.yml | 24 ++
6/6.0.0-GA/istio/02-skywalingadapter.yml | 26 ++
6/6.0.0-GA/istio/03-operator_cfg.yml | 65 +++++
6/6.0.0-GA/namespace.yml | 4 +
6/6.0.0-GA/oap/00-rbac.yml | 50 ++++
6/6.0.0-GA/oap/01-config.yml | 374 +++++++++++++++++++++++++
6/6.0.0-GA/oap/02-service.yml | 31 ++
6/6.0.0-GA/oap/03-deployment.yml | 61 ++++
6/6.0.0-GA/ui/01-service.yml | 31 ++
6/6.0.0-GA/ui/02-deployment.yml | 47 ++++
6/6.0.0-alpha/namespace.yml | 4 +
6/6.0.0-beta/elasticsearch/01-storageclass.yml | 24 ++
6/6.0.0-beta/elasticsearch/02-service.yml | 32 +++
6/6.0.0-beta/elasticsearch/03-statefulset.yml | 117 ++++++++
6/6.0.0-beta/istio/01-metrictemplete.yml | 24 ++
6/6.0.0-beta/istio/02-skywalingadapter.yml | 26 ++
6/6.0.0-beta/istio/03-operator_cfg.yml | 65 +++++
6/6.0.0-beta/namespace.yml | 4 +
6/6.0.0-beta/oap/00-rbac.yml | 50 ++++
6/6.0.0-beta/oap/01-config.yml | 338 ++++++++++++++++++++++
6/6.0.0-beta/oap/02-service.yml | 31 ++
6/6.0.0-beta/oap/03-deployment.yml | 61 ++++
6/6.0.0-beta/ui/01-service.yml | 31 ++
6/6.0.0-beta/ui/02-deployment.yml | 47 ++++
27 files changed, 1740 insertions(+)
diff --git a/6/6.0.0-GA/elasticsearch/01-storageclass.yml b/6/6.0.0-GA/elasticsearch/01-storageclass.yml
new file mode 100644
index 0000000..ecdd70e
--- /dev/null
+++ b/6/6.0.0-GA/elasticsearch/01-storageclass.yml
@@ -0,0 +1,24 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+kind: StorageClass
+apiVersion: storage.k8s.io/v1
+metadata:
+ name: ssd
+provisioner: kubernetes.io/gce-pd
+parameters:
+ type: pd-ssd
+
diff --git a/6/6.0.0-GA/elasticsearch/02-service.yml b/6/6.0.0-GA/elasticsearch/02-service.yml
new file mode 100644
index 0000000..00d7e0d
--- /dev/null
+++ b/6/6.0.0-GA/elasticsearch/02-service.yml
@@ -0,0 +1,32 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+apiVersion: v1
+kind: Service
+metadata:
+ name: elasticsearch
+ namespace: skywalking
+ labels:
+ service: elasticsearch
+spec:
+ clusterIP: None
+ ports:
+ - port: 9200
+ name: serving
+ - port: 9300
+ name: node-to-node
+ selector:
+ service: elasticsearch
\ No newline at end of file
diff --git a/6/6.0.0-GA/elasticsearch/03-statefulset.yml b/6/6.0.0-GA/elasticsearch/03-statefulset.yml
new file mode 100644
index 0000000..6c6e3a4
--- /dev/null
+++ b/6/6.0.0-GA/elasticsearch/03-statefulset.yml
@@ -0,0 +1,117 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+ name: elasticsearch
+ namespace: skywalking
+ labels:
+ service: elasticsearch
+spec:
+ serviceName: elasticsearch
+ # NOTE: This is number of nodes that we want to run
+ # you may update this
+ replicas: 3
+ selector:
+ matchLabels:
+ service: elasticsearch
+ template:
+ metadata:
+ labels:
+ service: elasticsearch
+ spec:
+ terminationGracePeriodSeconds: 300
+ initContainers:
+ # NOTE:
+ # This is to fix the permission on the volume
+ # By default elasticsearch container is not run as
+ # non root user.
+ # https://www.elastic.co/guide/en/elasticsearch/reference/current/docker.html#_notes_for_production_use_and_defaults
+ - name: fix-the-volume-permission
+ image: busybox
+ command:
+ - sh
+ - -c
+ - chown -R 1000:1000 /usr/share/elasticsearch/data
+ securityContext:
+ privileged: true
+ volumeMounts:
+ - name: data
+ mountPath: /usr/share/elasticsearch/data
+ # NOTE:
+ # To increase the default vm.max_map_count to 262144
+ # https://www.elastic.co/guide/en/elasticsearch/reference/current/docker.html#docker-cli-run-prod-mode
+ - name: increase-the-vm-max-map-count
+ image: busybox
+ command:
+ - sysctl
+ - -w
+ - vm.max_map_count=262144
+ securityContext:
+ privileged: true
+ # To increase the ulimit
+ # https://www.elastic.co/guide/en/elasticsearch/reference/current/docker.html#_notes_for_production_use_and_defaults
+ - name: increase-the-ulimit
+ image: busybox
+ command:
+ - sh
+ - -c
+ - ulimit -n 65536
+ securityContext:
+ privileged: true
+ containers:
+ - name: elasticsearch
+ image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.3.2
+ ports:
+ - containerPort: 9200
+ name: http
+ - containerPort: 9300
+ name: tcp
+ # NOTE: you can increase this resources
+ resources:
+ requests:
+ memory: 8Gi
+ limits:
+ memory: 16Gi
+ env:
+ # NOTE: the cluster name; update this
+ - name: cluster.name
+ value: elasticsearch-cluster
+ - name: node.name
+ valueFrom:
+ fieldRef:
+ fieldPath: metadata.name
+ # NOTE: This will tell the elasticsearch node where to connect to other nodes to form a cluster
+ - name: discovery.zen.ping.unicast.hosts
+ value: elasticsearch:9300
+ # NOTE: You can increase the heap size
+ - name: ES_JAVA_OPTS
+ value: -Xms4g -Xmx4g
+ volumeMounts:
+ - name: data
+ mountPath: /usr/share/elasticsearch/data
+ volumeClaimTemplates:
+ - metadata:
+ name: data
+ spec:
+ accessModes:
+ - ReadWriteOnce
+ storageClassName: ssd
+ # NOTE: You can increase the storage size
+ resources:
+ requests:
+ storage: 500Gi
diff --git a/6/6.0.0-GA/istio/01-metrictemplete.yml b/6/6.0.0-GA/istio/01-metrictemplete.yml
new file mode 100644
index 0000000..45e814e
--- /dev/null
+++ b/6/6.0.0-GA/istio/01-metrictemplete.yml
@@ -0,0 +1,24 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+apiVersion: "config.istio.io/v1alpha2"
+kind: template
+metadata:
+ name: metric
+ namespace: istio-system
+spec:
+ descriptor: "CsD3AgogZ29vZ2xlL3Byb3RvYnVmL2Rlc2NyaXB0b3IucHJvdG8SD2dvb2dsZS5wcm90b2J1ZiJNChFGaWxlRGVzY3JpcHRvclNldBI4CgRmaWxlGAEgAygLMiQuZ29vZ2xlLnByb3RvYnVmLkZpbGVEZXNjcmlwdG9yUHJvdG9SBGZpbGUi5AQKE0ZpbGVEZXNjcmlwdG9yUHJvdG8SEgoEbmFtZRgBIAEoCVIEbmFtZRIYCgdwYWNrYWdlGAIgASgJUgdwYWNrYWdlEh4KCmRlcGVuZGVuY3kYAyADKAlSCmRlcGVuZGVuY3kSKwoRcHVibGljX2RlcGVuZGVuY3kYCiADKAVSEHB1YmxpY0RlcGVuZGVuY3kSJwoPd2Vha19kZXBlbmRlbmN5GAsgAygFUg53ZWFrRGVwZW5kZW5jeRJDCgxtZXNzYWdlX3R5cGUYBCADKAsyIC5nb29nbGUucHJvd [...]
+---
\ No newline at end of file
diff --git a/6/6.0.0-GA/istio/02-skywalingadapter.yml b/6/6.0.0-GA/istio/02-skywalingadapter.yml
new file mode 100644
index 0000000..d98ef2f
--- /dev/null
+++ b/6/6.0.0-GA/istio/02-skywalingadapter.yml
@@ -0,0 +1,26 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+apiVersion: "config.istio.io/v1alpha2"
+kind: adapter
+metadata:
+ name: swadapter
+ namespace: istio-system
+spec:
+ description:
+ session_based: false
+ templates:
+ - metric
diff --git a/6/6.0.0-GA/istio/03-operator_cfg.yml b/6/6.0.0-GA/istio/03-operator_cfg.yml
new file mode 100644
index 0000000..bb73968
--- /dev/null
+++ b/6/6.0.0-GA/istio/03-operator_cfg.yml
@@ -0,0 +1,65 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+apiVersion: "config.istio.io/v1alpha2"
+kind: handler
+metadata:
+ name: sw
+ namespace: istio-system
+spec:
+ adapter: swadapter
+ connection:
+ address: "oap.skywalking.svc.cluster.local:11800"
+---
+
+# instance for template metric
+apiVersion: "config.istio.io/v1alpha2"
+kind: instance
+metadata:
+ name: swmetric
+ namespace: istio-system
+spec:
+ template: metric
+ params:
+ value: request.size | 0
+ dimensions:
+ sourceService: source.workload.name | ""
+ sourceNamespace: source.workload.namespace | ""
+ sourceUID: source.uid | ""
+ destinationService: destination.workload.name | ""
+ destinationNamespace: destination.workload.namespace | ""
+ destinationUID: destination.uid | ""
+ requestMethod: request.method | ""
+ requestPath: request.path | ""
+ requestScheme: request.scheme | ""
+ requestTime: request.time
+ responseTime: response.time
+ responseCode: response.code | 200
+ reporter: conditional((context.reporter.kind | "inbound") == "outbound", "source", "destination")
+ apiProtocol: api.protocol | ""
+---
+
+# rule to dispatch to handler sw
+apiVersion: "config.istio.io/v1alpha2"
+kind: rule
+metadata:
+ name: swmetric-rule
+ namespace: istio-system
+spec:
+ actions:
+ - handler: sw.istio-system
+ instances:
+ - swmetric
diff --git a/6/6.0.0-GA/namespace.yml b/6/6.0.0-GA/namespace.yml
new file mode 100644
index 0000000..85bd8cb
--- /dev/null
+++ b/6/6.0.0-GA/namespace.yml
@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+ name: skywalking
\ No newline at end of file
diff --git a/6/6.0.0-GA/oap/00-rbac.yml b/6/6.0.0-GA/oap/00-rbac.yml
new file mode 100644
index 0000000..244a88b
--- /dev/null
+++ b/6/6.0.0-GA/oap/00-rbac.yml
@@ -0,0 +1,50 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+ name: skywalking-oap
+ namespace: skywalking
+
+---
+
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+ name: skywalking-oap
+ namespace: skywalking
+roleRef:
+ apiGroup: rbac.authorization.k8s.io
+ kind: Role
+ name: skywalking-oap
+subjects:
+- kind: ServiceAccount
+ name: skywalking-oap
+ namespace: skywalking
+
+---
+
+kind: Role
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+ namespace: skywalking
+ name: skywalking-oap
+rules:
+- apiGroups: [""]
+ resources: ["pods"]
+ verbs: ["get", "watch", "list"]
\ No newline at end of file
diff --git a/6/6.0.0-GA/oap/01-config.yml b/6/6.0.0-GA/oap/01-config.yml
new file mode 100644
index 0000000..2652bb8
--- /dev/null
+++ b/6/6.0.0-GA/oap/01-config.yml
@@ -0,0 +1,374 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: oap-config
+ namespace: skywalking
+data:
+ application.yml: |-
+ cluster:
+ kubernetes:
+ watchTimeoutSeconds: 60
+ namespace: skywalking
+ labelSelector: app=oap
+ uidEnvName: SKYWALKING_COLLECTOR_UID
+ core:
+ default:
+ restHost: 0.0.0.0
+ restPort: 12800
+ restContextPath: /
+ gRPCHost: 0.0.0.0
+ gRPCPort: 11800
+ downsampling:
+ - Hour
+ - Day
+ - Month
+ recordDataTTL: 90 # Unit is minute
+ minuteMetricsDataTTL: 90 # Unit is minute
+ hourMetricsDataTTL: 36 # Unit is hour
+ dayMetricsDataTTL: 45 # Unit is day
+ monthMetricsDataTTL: 18 # Unit is month
+ storage:
+ elasticsearch:
+ clusterNodes: elasticsearch:9200
+ indexShardsNumber: 2
+ indexReplicasNumber: 0
+ bulkActions: 2000 # Execute the bulk every 2000 requests
+ bulkSize: 20 # flush the bulk every 20mb
+ flushInterval: 10 # flush the bulk every 10 seconds whatever the number of requests
+ concurrentRequests: 2 # the number of concurrent requests
+ receiver-register:
+ default:
+ receiver-trace:
+ default:
+ bufferPath: /trace-buffer/ # Path to trace buffer files, suggest to use absolute path
+ bufferOffsetMaxFileSize: 100 # Unit is MB
+ bufferDataMaxFileSize: 500 # Unit is MB
+ bufferFileCleanWhenRestart: false
+ receiver-jvm:
+ default:
+ service-mesh:
+ default:
+ bufferPath: /mesh-buffer/ # Path to trace buffer files, suggest to use absolute path
+ bufferOffsetMaxFileSize: 100 # Unit is MB
+ bufferDataMaxFileSize: 500 # Unit is MB
+ bufferFileCleanWhenRestart: false
+ istio-telemetry:
+ default:
+ query:
+ graphql:
+ path: /graphql
+ alarm:
+ default:
+ telemetry:
+ prometheus:
+
+ log4j2.xml: |-
+ <Configuration status="INFO">
+ <Appenders>
+ <Console name="Console" target="SYSTEM_OUT">
+ <PatternLayout charset="UTF-8" pattern="%d - %c -%-4r [%t] %-5p %x - %m%n"/>
+ </Console>
+ </Appenders>
+ <Loggers>
+ <logger name="org.eclipse.jetty" level="INFO"/>
+ <logger name="org.apache.zookeeper" level="INFO"/>
+ <logger name="org.elasticsearch.common.network.IfConfig" level="INFO"/>
+ <logger name="io.grpc.netty" level="INFO"/>
+ <logger name="org.apache.skywalking.oap.server.receiver.istio.telemetry" level="DEBUG"/>
+ <Root level="INFO">
+ <AppenderRef ref="Console"/>
+ </Root>
+ </Loggers>
+ </Configuration>
+
+ alarm-settings.yml: |-
+ rules:
+ service_resp_time_rule:
+ indicator-name: service_resp_time
+ include-names:
+ - dubbox-provider
+ - dubbox-consumer
+ threshold: 1000
+ op: ">"
+ period: 10
+ count: 1
+ webhooks:
+
+ component-libraries.yml: |-
+ Tomcat:
+ id: 1
+ languages: Java
+HttpClient:
+ id: 2
+ languages: Java,C#,Node.js
+Dubbo:
+ id: 3
+ languages: Java
+H2:
+ id: 4
+ languages: Java
+Mysql:
+ id: 5
+ languages: Java,C#,Node.js
+ORACLE:
+ id: 6
+ languages: Java
+Redis:
+ id: 7
+ languages: Java,C#,Node.js
+Motan:
+ id: 8
+ languages: Java
+MongoDB:
+ id: 9
+ languages: Java,C#,Node.js
+Resin:
+ id: 10
+ languages: Java
+Feign:
+ id: 11
+ languages: Java
+OKHttp:
+ id: 12
+ languages: Java
+SpringRestTemplate:
+ id: 13
+ languages: Java
+SpringMVC:
+ id: 14
+ languages: Java
+Struts2:
+ id: 15
+ languages: Java
+NutzMVC:
+ id: 16
+ languages: Java
+NutzHttp:
+ id: 17
+ languages: Java
+JettyClient:
+ id: 18
+ languages: Java
+JettyServer:
+ id: 19
+ languages: Java
+Memcached:
+ id: 20
+ languages: Java
+ShardingJDBC:
+ id: 21
+ languages: Java
+PostgreSQL:
+ id: 22
+ languages: Java,C#,Node.js
+GRPC:
+ id: 23
+ languages: Java
+ElasticJob:
+ id: 24
+ languages: Java
+RocketMQ:
+ id: 25
+ languages: Java
+httpasyncclient:
+ id: 26
+ languages: Java
+Kafka:
+ id: 27
+ languages: Java
+ServiceComb:
+ id: 28
+ languages: Java
+Hystrix:
+ id: 29
+ languages: Java
+Jedis:
+ id: 30
+ languages: Java
+SQLite:
+ id: 31
+ languages: Java,C#
+h2-jdbc-driver:
+ id: 32
+ languages: Java
+mysql-connector-java:
+ id: 33
+ languages: Java
+ojdbc:
+ id: 34
+ languages: Java
+Spymemcached:
+ id: 35
+ languages: Java
+Xmemcached:
+ id: 36
+ languages: Java
+postgresql-jdbc-driver:
+ id: 37
+ languages: Java
+rocketMQ-producer:
+ id: 38
+ languages: Java
+rocketMQ-consumer:
+ id: 39
+ languages: Java
+kafka-producer:
+ id: 40
+ languages: Java
+kafka-consumer:
+ id: 41
+ languages: Java
+mongodb-driver:
+ id: 42
+ languages: Java
+SOFARPC:
+ id: 43
+ languages: Java
+ActiveMQ:
+ id: 44
+ languages: Java
+activemq-producer:
+ id: 45
+ languages: Java
+activemq-consumer:
+ id: 46
+ languages: Java
+Elasticsearch:
+ id: 47
+ languages: Java
+transport-client:
+ id: 48
+ languages: Java
+http:
+ id: 49
+ languages: Java,C#,Node.js
+rpc:
+ id: 50
+ languages: Java,C#,Node.js
+RabbitMQ:
+ id: 51
+ languages: Java
+rabbitmq-producer:
+ id: 52
+ languages: Java
+rabbitmq-consumer:
+ id: 53
+ languages: Java
+Canal:
+ id: 54
+ languages: Java
+Gson:
+ id: 55
+ languages: Java
+Redisson:
+ id: 56
+ languages: Java
+AspNetCore:
+ id: 3001
+ languages: C#
+EntityFrameworkCore:
+ id: 3002
+ languages: C#
+SqlClient:
+ id: 3003
+ languages: C#
+CAP:
+ id: 3004
+ languages: C#
+StackExchange.Redis:
+ id: 3005
+ languages: C#
+SqlServer:
+ id: 3006
+ languages: C#
+Npgsql:
+ id: 3007
+ languages: C#
+MySqlConnector:
+ id: 3008
+ languages: C#
+EntityFrameworkCore.InMemory:
+ id: 3009
+ languages: C#
+EntityFrameworkCore.SqlServer:
+ id: 3010
+ languages: C#
+EntityFrameworkCore.Sqlite:
+ id: 3011
+ languages: C#
+Pomelo.EntityFrameworkCore.MySql:
+ id: 3012
+ languages: C#
+Npgsql.EntityFrameworkCore.PostgreSQL:
+ id: 3013
+ languages: C#
+InMemoryDatabase:
+ id: 3014
+ languages: C#
+AspNet:
+ id: 3015
+ languages: C#
+
+# NoeJS components
+# [4000, 5000) for Node.js agent
+HttpServer:
+ id: 4001
+ languages: Node.js
+express:
+ id: 4002
+ languages: Node.js
+Egg:
+ id: 4003
+ languages: Node.js
+Koa:
+ id: 4004
+ languages: Node.js
+
+# Component Server mapping defines the server display names of some components
+# e.g.
+# Jedis is a client library in Java for Redis server
+Component-Server-Mappings:
+ mongodb-driver: MongoDB
+ rocketMQ-producer: RocketMQ
+ rocketMQ-consumer: RocketMQ
+ kafka-producer: Kafka
+ kafka-consumer: Kafka
+ activemq-producer: ActiveMQ
+ activemq-consumer: ActiveMQ
+ rabbitmq-producer: RabbitMQ
+ rabbitmq-consumer: RabbitMQ
+ postgresql-jdbc-driver: PostgreSQL
+ Xmemcached: Memcached
+ Spymemcached: Memcached
+ h2-jdbc-driver: H2
+ mysql-connector-java: Mysql
+ Jedis: Redis
+ StackExchange.Redis: Redis
+ Redisson: Redis
+ SqlClient: SqlServer
+ Npgsql: PostgreSQL
+ MySqlConnector: Mysql
+ EntityFrameworkCore.InMemory: InMemoryDatabase
+ EntityFrameworkCore.SqlServer: SqlServer
+ EntityFrameworkCore.Sqlite: SQLite
+ Pomelo.EntityFrameworkCore.MySql: Mysql
+ Npgsql.EntityFrameworkCore.PostgreSQL: PostgreSQL
+ transport-client: Elasticsearch
+
+
diff --git a/6/6.0.0-GA/oap/02-service.yml b/6/6.0.0-GA/oap/02-service.yml
new file mode 100644
index 0000000..34c9586
--- /dev/null
+++ b/6/6.0.0-GA/oap/02-service.yml
@@ -0,0 +1,31 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+apiVersion: v1
+kind: Service
+metadata:
+ name: oap
+ namespace: skywalking
+ labels:
+ service: oap
+spec:
+ ports:
+ - port: 12800
+ name: rest
+ - port: 11800
+ name: grpc
+ selector:
+ app: oap
\ No newline at end of file
diff --git a/6/6.0.0-GA/oap/03-deployment.yml b/6/6.0.0-GA/oap/03-deployment.yml
new file mode 100644
index 0000000..efcb261
--- /dev/null
+++ b/6/6.0.0-GA/oap/03-deployment.yml
@@ -0,0 +1,61 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: oap-deployment
+ namespace: skywalking
+ labels:
+ app: oap
+spec:
+ replicas: 3
+ selector:
+ matchLabels:
+ app: oap
+ template:
+ metadata:
+ labels:
+ app: oap
+ spec:
+ serviceAccountName: skywalking-oap
+ containers:
+ - name: oap
+ image: skywalking/oap:6.0.0-GA
+ ports:
+ - containerPort: 11800
+ name: grpc
+ - containerPort: 12800
+ name: rest
+ resources:
+ requests:
+ memory: 1Gi
+ limits:
+ memory: 2Gi
+ env:
+ - name: JAVA_OPTS
+ value: -Xms256M -Xmx512M
+ - name: SKYWALKING_COLLECTOR_UID
+ valueFrom:
+ fieldRef:
+ fieldPath: metadata.uid
+ volumeMounts:
+ - name: config
+ mountPath: /skywalking/config
+ volumes:
+ - name: config
+ configMap:
+ name: oap-config
\ No newline at end of file
diff --git a/6/6.0.0-GA/ui/01-service.yml b/6/6.0.0-GA/ui/01-service.yml
new file mode 100644
index 0000000..036ec1c
--- /dev/null
+++ b/6/6.0.0-GA/ui/01-service.yml
@@ -0,0 +1,31 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+apiVersion: v1
+kind: Service
+metadata:
+ name: ui
+ namespace: skywalking
+ labels:
+ service: ui
+spec:
+ ports:
+ - port: 80
+ name: page
+ targetPort: page
+ type: LoadBalancer
+ selector:
+ app: ui
\ No newline at end of file
diff --git a/6/6.0.0-GA/ui/02-deployment.yml b/6/6.0.0-GA/ui/02-deployment.yml
new file mode 100644
index 0000000..ff9feb3
--- /dev/null
+++ b/6/6.0.0-GA/ui/02-deployment.yml
@@ -0,0 +1,47 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: ui-deployment
+ namespace: skywalking
+ labels:
+ app: ui
+spec:
+ replicas: 1
+ selector:
+ matchLabels:
+ app: ui
+ template:
+ metadata:
+ labels:
+ app: ui
+ spec:
+ containers:
+ - name: ui
+ image: skywalking/ui:6.0.0-GA
+ ports:
+ - containerPort: 8080
+ name: page
+ resources:
+ requests:
+ memory: 1Gi
+ limits:
+ memory: 2Gi
+ env:
+ - name: collector.ribbon.listOfServers
+ value: oap:12800
diff --git a/6/6.0.0-alpha/namespace.yml b/6/6.0.0-alpha/namespace.yml
index e69de29..85bd8cb 100644
--- a/6/6.0.0-alpha/namespace.yml
+++ b/6/6.0.0-alpha/namespace.yml
@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+ name: skywalking
\ No newline at end of file
diff --git a/6/6.0.0-beta/elasticsearch/01-storageclass.yml b/6/6.0.0-beta/elasticsearch/01-storageclass.yml
new file mode 100644
index 0000000..ecdd70e
--- /dev/null
+++ b/6/6.0.0-beta/elasticsearch/01-storageclass.yml
@@ -0,0 +1,24 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+kind: StorageClass
+apiVersion: storage.k8s.io/v1
+metadata:
+ name: ssd
+provisioner: kubernetes.io/gce-pd
+parameters:
+ type: pd-ssd
+
diff --git a/6/6.0.0-beta/elasticsearch/02-service.yml b/6/6.0.0-beta/elasticsearch/02-service.yml
new file mode 100644
index 0000000..00d7e0d
--- /dev/null
+++ b/6/6.0.0-beta/elasticsearch/02-service.yml
@@ -0,0 +1,32 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+apiVersion: v1
+kind: Service
+metadata:
+ name: elasticsearch
+ namespace: skywalking
+ labels:
+ service: elasticsearch
+spec:
+ clusterIP: None
+ ports:
+ - port: 9200
+ name: serving
+ - port: 9300
+ name: node-to-node
+ selector:
+ service: elasticsearch
\ No newline at end of file
diff --git a/6/6.0.0-beta/elasticsearch/03-statefulset.yml b/6/6.0.0-beta/elasticsearch/03-statefulset.yml
new file mode 100644
index 0000000..6c6e3a4
--- /dev/null
+++ b/6/6.0.0-beta/elasticsearch/03-statefulset.yml
@@ -0,0 +1,117 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+ name: elasticsearch
+ namespace: skywalking
+ labels:
+ service: elasticsearch
+spec:
+ serviceName: elasticsearch
+ # NOTE: This is number of nodes that we want to run
+ # you may update this
+ replicas: 3
+ selector:
+ matchLabels:
+ service: elasticsearch
+ template:
+ metadata:
+ labels:
+ service: elasticsearch
+ spec:
+ terminationGracePeriodSeconds: 300
+ initContainers:
+ # NOTE:
+ # This is to fix the permission on the volume
+ # By default elasticsearch container is not run as
+ # non root user.
+ # https://www.elastic.co/guide/en/elasticsearch/reference/current/docker.html#_notes_for_production_use_and_defaults
+ - name: fix-the-volume-permission
+ image: busybox
+ command:
+ - sh
+ - -c
+ - chown -R 1000:1000 /usr/share/elasticsearch/data
+ securityContext:
+ privileged: true
+ volumeMounts:
+ - name: data
+ mountPath: /usr/share/elasticsearch/data
+ # NOTE:
+ # To increase the default vm.max_map_count to 262144
+ # https://www.elastic.co/guide/en/elasticsearch/reference/current/docker.html#docker-cli-run-prod-mode
+ - name: increase-the-vm-max-map-count
+ image: busybox
+ command:
+ - sysctl
+ - -w
+ - vm.max_map_count=262144
+ securityContext:
+ privileged: true
+ # To increase the ulimit
+ # https://www.elastic.co/guide/en/elasticsearch/reference/current/docker.html#_notes_for_production_use_and_defaults
+ - name: increase-the-ulimit
+ image: busybox
+ command:
+ - sh
+ - -c
+ - ulimit -n 65536
+ securityContext:
+ privileged: true
+ containers:
+ - name: elasticsearch
+ image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.3.2
+ ports:
+ - containerPort: 9200
+ name: http
+ - containerPort: 9300
+ name: tcp
+ # NOTE: you can increase this resources
+ resources:
+ requests:
+ memory: 8Gi
+ limits:
+ memory: 16Gi
+ env:
+ # NOTE: the cluster name; update this
+ - name: cluster.name
+ value: elasticsearch-cluster
+ - name: node.name
+ valueFrom:
+ fieldRef:
+ fieldPath: metadata.name
+ # NOTE: This will tell the elasticsearch node where to connect to other nodes to form a cluster
+ - name: discovery.zen.ping.unicast.hosts
+ value: elasticsearch:9300
+ # NOTE: You can increase the heap size
+ - name: ES_JAVA_OPTS
+ value: -Xms4g -Xmx4g
+ volumeMounts:
+ - name: data
+ mountPath: /usr/share/elasticsearch/data
+ volumeClaimTemplates:
+ - metadata:
+ name: data
+ spec:
+ accessModes:
+ - ReadWriteOnce
+ storageClassName: ssd
+ # NOTE: You can increase the storage size
+ resources:
+ requests:
+ storage: 500Gi
diff --git a/6/6.0.0-beta/istio/01-metrictemplete.yml b/6/6.0.0-beta/istio/01-metrictemplete.yml
new file mode 100644
index 0000000..45e814e
--- /dev/null
+++ b/6/6.0.0-beta/istio/01-metrictemplete.yml
@@ -0,0 +1,24 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+apiVersion: "config.istio.io/v1alpha2"
+kind: template
+metadata:
+ name: metric
+ namespace: istio-system
+spec:
+ descriptor: "CsD3AgogZ29vZ2xlL3Byb3RvYnVmL2Rlc2NyaXB0b3IucHJvdG8SD2dvb2dsZS5wcm90b2J1ZiJNChFGaWxlRGVzY3JpcHRvclNldBI4CgRmaWxlGAEgAygLMiQuZ29vZ2xlLnByb3RvYnVmLkZpbGVEZXNjcmlwdG9yUHJvdG9SBGZpbGUi5AQKE0ZpbGVEZXNjcmlwdG9yUHJvdG8SEgoEbmFtZRgBIAEoCVIEbmFtZRIYCgdwYWNrYWdlGAIgASgJUgdwYWNrYWdlEh4KCmRlcGVuZGVuY3kYAyADKAlSCmRlcGVuZGVuY3kSKwoRcHVibGljX2RlcGVuZGVuY3kYCiADKAVSEHB1YmxpY0RlcGVuZGVuY3kSJwoPd2Vha19kZXBlbmRlbmN5GAsgAygFUg53ZWFrRGVwZW5kZW5jeRJDCgxtZXNzYWdlX3R5cGUYBCADKAsyIC5nb29nbGUucHJvd [...]
+---
\ No newline at end of file
diff --git a/6/6.0.0-beta/istio/02-skywalingadapter.yml b/6/6.0.0-beta/istio/02-skywalingadapter.yml
new file mode 100644
index 0000000..d98ef2f
--- /dev/null
+++ b/6/6.0.0-beta/istio/02-skywalingadapter.yml
@@ -0,0 +1,26 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+apiVersion: "config.istio.io/v1alpha2"
+kind: adapter
+metadata:
+ name: swadapter
+ namespace: istio-system
+spec:
+ description:
+ session_based: false
+ templates:
+ - metric
diff --git a/6/6.0.0-beta/istio/03-operator_cfg.yml b/6/6.0.0-beta/istio/03-operator_cfg.yml
new file mode 100644
index 0000000..bb73968
--- /dev/null
+++ b/6/6.0.0-beta/istio/03-operator_cfg.yml
@@ -0,0 +1,65 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+apiVersion: "config.istio.io/v1alpha2"
+kind: handler
+metadata:
+ name: sw
+ namespace: istio-system
+spec:
+ adapter: swadapter
+ connection:
+ address: "oap.skywalking.svc.cluster.local:11800"
+---
+
+# instance for template metric
+apiVersion: "config.istio.io/v1alpha2"
+kind: instance
+metadata:
+ name: swmetric
+ namespace: istio-system
+spec:
+ template: metric
+ params:
+ value: request.size | 0
+ dimensions:
+ sourceService: source.workload.name | ""
+ sourceNamespace: source.workload.namespace | ""
+ sourceUID: source.uid | ""
+ destinationService: destination.workload.name | ""
+ destinationNamespace: destination.workload.namespace | ""
+ destinationUID: destination.uid | ""
+ requestMethod: request.method | ""
+ requestPath: request.path | ""
+ requestScheme: request.scheme | ""
+ requestTime: request.time
+ responseTime: response.time
+ responseCode: response.code | 200
+ reporter: conditional((context.reporter.kind | "inbound") == "outbound", "source", "destination")
+ apiProtocol: api.protocol | ""
+---
+
+# rule to dispatch to handler sw
+apiVersion: "config.istio.io/v1alpha2"
+kind: rule
+metadata:
+ name: swmetric-rule
+ namespace: istio-system
+spec:
+ actions:
+ - handler: sw.istio-system
+ instances:
+ - swmetric
diff --git a/6/6.0.0-beta/namespace.yml b/6/6.0.0-beta/namespace.yml
new file mode 100644
index 0000000..85bd8cb
--- /dev/null
+++ b/6/6.0.0-beta/namespace.yml
@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+ name: skywalking
\ No newline at end of file
diff --git a/6/6.0.0-beta/oap/00-rbac.yml b/6/6.0.0-beta/oap/00-rbac.yml
new file mode 100644
index 0000000..244a88b
--- /dev/null
+++ b/6/6.0.0-beta/oap/00-rbac.yml
@@ -0,0 +1,50 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+ name: skywalking-oap
+ namespace: skywalking
+
+---
+
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+ name: skywalking-oap
+ namespace: skywalking
+roleRef:
+ apiGroup: rbac.authorization.k8s.io
+ kind: Role
+ name: skywalking-oap
+subjects:
+- kind: ServiceAccount
+ name: skywalking-oap
+ namespace: skywalking
+
+---
+
+kind: Role
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+ namespace: skywalking
+ name: skywalking-oap
+rules:
+- apiGroups: [""]
+ resources: ["pods"]
+ verbs: ["get", "watch", "list"]
\ No newline at end of file
diff --git a/6/6.0.0-beta/oap/01-config.yml b/6/6.0.0-beta/oap/01-config.yml
new file mode 100644
index 0000000..98a5b0b
--- /dev/null
+++ b/6/6.0.0-beta/oap/01-config.yml
@@ -0,0 +1,338 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: oap-config
+ namespace: skywalking
+data:
+ application.yml: |-
+ cluster:
+ kubernetes:
+ watchTimeoutSeconds: 60
+ namespace: skywalking
+ labelSelector: app=oap
+ uidEnvName: SKYWALKING_COLLECTOR_UID
+ core:
+ default:
+ restHost: 0.0.0.0
+ restPort: 12800
+ restContextPath: /
+ gRPCHost: 0.0.0.0
+ gRPCPort: 11800
+ downsampling:
+ - Hour
+ - Day
+ - Month
+ recordDataTTL: 90 # Unit is minute
+ minuteMetricsDataTTL: 90 # Unit is minute
+ hourMetricsDataTTL: 36 # Unit is hour
+ dayMetricsDataTTL: 45 # Unit is day
+ monthMetricsDataTTL: 18 # Unit is month
+ storage:
+ elasticsearch:
+ clusterNodes: elasticsearch:9200
+ indexShardsNumber: 2
+ indexReplicasNumber: 0
+ bulkActions: 2000 # Execute the bulk every 2000 requests
+ bulkSize: 20 # flush the bulk every 20mb
+ flushInterval: 10 # flush the bulk every 10 seconds whatever the number of requests
+ concurrentRequests: 2 # the number of concurrent requests
+ receiver-register:
+ default:
+ receiver-trace:
+ default:
+ bufferPath: /trace-buffer/ # Path to trace buffer files, suggest to use absolute path
+ bufferOffsetMaxFileSize: 100 # Unit is MB
+ bufferDataMaxFileSize: 500 # Unit is MB
+ bufferFileCleanWhenRestart: false
+ receiver-jvm:
+ default:
+ service-mesh:
+ default:
+ bufferPath: /mesh-buffer/ # Path to trace buffer files, suggest to use absolute path
+ bufferOffsetMaxFileSize: 100 # Unit is MB
+ bufferDataMaxFileSize: 500 # Unit is MB
+ bufferFileCleanWhenRestart: false
+ istio-telemetry:
+ default:
+ query:
+ graphql:
+ path: /graphql
+ alarm:
+ default:
+
+ log4j2.xml: |-
+ <Configuration status="INFO">
+ <Appenders>
+ <Console name="Console" target="SYSTEM_OUT">
+ <PatternLayout charset="UTF-8" pattern="%d - %c -%-4r [%t] %-5p %x - %m%n"/>
+ </Console>
+ </Appenders>
+ <Loggers>
+ <logger name="org.eclipse.jetty" level="INFO"/>
+ <logger name="org.apache.zookeeper" level="INFO"/>
+ <logger name="org.elasticsearch.common.network.IfConfig" level="INFO"/>
+ <logger name="io.grpc.netty" level="INFO"/>
+ <logger name="org.apache.skywalking.oap.server.receiver.istio.telemetry" level="DEBUG"/>
+ <Root level="INFO">
+ <AppenderRef ref="Console"/>
+ </Root>
+ </Loggers>
+ </Configuration>
+
+ alarm-settings.yml: |-
+ rules:
+ service_resp_time_rule:
+ indicator-name: service_resp_time
+ include-names:
+ - dubbox-provider
+ - dubbox-consumer
+ threshold: 1000
+ op: ">"
+ period: 10
+ count: 1
+ webhooks:
+
+ component-libraries.yml: |-
+ Tomcat:
+ id: 1
+ languages: Java
+ HttpClient:
+ id: 2
+ languages: Java,C#,Node.js
+ Dubbo:
+ id: 3
+ languages: Java
+ H2:
+ id: 4
+ languages: Java
+ Mysql:
+ id: 5
+ languages: Java,C#,Node.js
+ ORACLE:
+ id: 6
+ languages: Java
+ Redis:
+ id: 7
+ languages: Java,C#,Node.js
+ Motan:
+ id: 8
+ languages: Java
+ MongoDB:
+ id: 9
+ languages: Java,C#,Node.js
+ Resin:
+ id: 10
+ languages: Java
+ Feign:
+ id: 11
+ languages: Java
+ OKHttp:
+ id: 12
+ languages: Java
+ SpringRestTemplate:
+ id: 13
+ languages: Java
+ SpringMVC:
+ id: 14
+ languages: Java
+ Struts2:
+ id: 15
+ languages: Java
+ NutzMVC:
+ id: 16
+ languages: Java
+ NutzHttp:
+ id: 17
+ languages: Java
+ JettyClient:
+ id: 18
+ languages: Java
+ JettyServer:
+ id: 19
+ languages: Java
+ Memcached:
+ id: 20
+ languages: Java
+ ShardingJDBC:
+ id: 21
+ languages: Java
+ PostgreSQL:
+ id: 22
+ languages: Java,C#,Node.js
+ GRPC:
+ id: 23
+ languages: Java
+ ElasticJob:
+ id: 24
+ languages: Java
+ RocketMQ:
+ id: 25
+ languages: Java
+ httpasyncclient:
+ id: 26
+ languages: Java
+ Kafka:
+ id: 27
+ languages: Java
+ ServiceComb:
+ id: 28
+ languages: Java
+ Hystrix:
+ id: 29
+ languages: Java
+ Jedis:
+ id: 30
+ languages: Java
+ SQLite:
+ id: 31
+ languages: Java,C#
+ h2-jdbc-driver:
+ id: 32
+ languages: Java
+ mysql-connector-java:
+ id: 33
+ languages: Java
+ Spymemcached:
+ id: 35
+ languages: Java
+ Xmemcached:
+ id: 36
+ languages: Java
+ postgresql-jdbc-driver:
+ id: 37
+ languages: Java
+ rocketMQ-producer:
+ id: 38
+ languages: Java
+ rocketMQ-consumer:
+ id: 39
+ languages: Java
+ kafka-producer:
+ id: 40
+ languages: Java
+ kafka-consumer:
+ id: 41
+ languages: Java
+ mongodb-driver:
+ id: 42
+ languages: Java
+ SOFARPC:
+ id: 43
+ languages: Java
+ ActiveMQ:
+ id: 44
+ languages: Java
+ activemq-producer:
+ id: 45
+ languages: Java
+ activemq-consumer:
+ id: 46
+ languages: Java
+ Elasticsearch:
+ id: 47
+ languages: Java
+ transport-client:
+ id: 48
+ languages: Java
+ AspNetCore:
+ id: 3001
+ languages: C#
+ EntityFrameworkCore:
+ id: 3002
+ languages: C#
+ SqlClient:
+ id: 3003
+ languages: C#
+ CAP:
+ id: 3004
+ languages: C#
+ StackExchange.Redis:
+ id: 3005
+ languages: C#
+ SqlServer:
+ id: 3006
+ languages: C#
+ Npgsql:
+ id: 3007
+ languages: C#
+ MySqlConnector:
+ id: 3008
+ languages: C#
+ EntityFrameworkCore.InMemory:
+ id: 3009
+ languages: C#
+ EntityFrameworkCore.SqlServer:
+ id: 3010
+ languages: C#
+ EntityFrameworkCore.Sqlite:
+ id: 3011
+ languages: C#
+ Pomelo.EntityFrameworkCore.MySql:
+ id: 3012
+ languages: C#
+ Npgsql.EntityFrameworkCore.PostgreSQL:
+ id: 3013
+ languages: C#
+ InMemoryDatabase:
+ id: 3014
+ languages: C#
+ AspNet:
+ id: 3015
+ languages: C#
+
+ # NoeJS components
+ # [4000, 5000) for Node.js agent
+ HttpServer:
+ id: 4001
+ languages: Node.js
+ express:
+ id: 4002
+ languages: Node.js
+ Egg:
+ id: 4003
+ languages: Node.js
+ Koa:
+ id: 4004
+ languages: Node.js
+ Component-Server-Mappings:
+ mongodb-driver: MongoDB
+ rocketMQ-producer: RocketMQ
+ rocketMQ-consumer: RocketMQ
+ kafka-producer: Kafka
+ kafka-consumer: Kafka
+ activemq-producer: ActiveMQ
+ activemq-consumer: ActiveMQ
+ postgresql-jdbc-driver: PostgreSQL
+ Xmemcached: Memcached
+ Spymemcached: Memcached
+ h2-jdbc-driver: H2
+ mysql-connector-java: Mysql
+ Jedis: Redis
+ StackExchange.Redis: Redis
+ SqlClient: SqlServer
+ Npgsql: PostgreSQL
+ MySqlConnector: Mysql
+ EntityFrameworkCore.InMemory: InMemoryDatabase
+ EntityFrameworkCore.SqlServer: SqlServer
+ EntityFrameworkCore.Sqlite: SQLite
+ Pomelo.EntityFrameworkCore.MySql: Mysql
+ Npgsql.EntityFrameworkCore.PostgreSQL: PostgreSQL
+ transport-client: Elasticsearch
+
+
diff --git a/6/6.0.0-beta/oap/02-service.yml b/6/6.0.0-beta/oap/02-service.yml
new file mode 100644
index 0000000..34c9586
--- /dev/null
+++ b/6/6.0.0-beta/oap/02-service.yml
@@ -0,0 +1,31 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+apiVersion: v1
+kind: Service
+metadata:
+ name: oap
+ namespace: skywalking
+ labels:
+ service: oap
+spec:
+ ports:
+ - port: 12800
+ name: rest
+ - port: 11800
+ name: grpc
+ selector:
+ app: oap
\ No newline at end of file
diff --git a/6/6.0.0-beta/oap/03-deployment.yml b/6/6.0.0-beta/oap/03-deployment.yml
new file mode 100644
index 0000000..5504af8
--- /dev/null
+++ b/6/6.0.0-beta/oap/03-deployment.yml
@@ -0,0 +1,61 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: oap-deployment
+ namespace: skywalking
+ labels:
+ app: oap
+spec:
+ replicas: 3
+ selector:
+ matchLabels:
+ app: oap
+ template:
+ metadata:
+ labels:
+ app: oap
+ spec:
+ serviceAccountName: skywalking-oap
+ containers:
+ - name: oap
+ image: skywalking/oap:6.0.0-beta
+ ports:
+ - containerPort: 11800
+ name: grpc
+ - containerPort: 12800
+ name: rest
+ resources:
+ requests:
+ memory: 1Gi
+ limits:
+ memory: 2Gi
+ env:
+ - name: JAVA_OPTS
+ value: -Xms256M -Xmx512M
+ - name: SKYWALKING_COLLECTOR_UID
+ valueFrom:
+ fieldRef:
+ fieldPath: metadata.uid
+ volumeMounts:
+ - name: config
+ mountPath: /skywalking/config
+ volumes:
+ - name: config
+ configMap:
+ name: oap-config
\ No newline at end of file
diff --git a/6/6.0.0-beta/ui/01-service.yml b/6/6.0.0-beta/ui/01-service.yml
new file mode 100644
index 0000000..036ec1c
--- /dev/null
+++ b/6/6.0.0-beta/ui/01-service.yml
@@ -0,0 +1,31 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+apiVersion: v1
+kind: Service
+metadata:
+ name: ui
+ namespace: skywalking
+ labels:
+ service: ui
+spec:
+ ports:
+ - port: 80
+ name: page
+ targetPort: page
+ type: LoadBalancer
+ selector:
+ app: ui
\ No newline at end of file
diff --git a/6/6.0.0-beta/ui/02-deployment.yml b/6/6.0.0-beta/ui/02-deployment.yml
new file mode 100644
index 0000000..1944c9c
--- /dev/null
+++ b/6/6.0.0-beta/ui/02-deployment.yml
@@ -0,0 +1,47 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: ui-deployment
+ namespace: skywalking
+ labels:
+ app: ui
+spec:
+ replicas: 1
+ selector:
+ matchLabels:
+ app: ui
+ template:
+ metadata:
+ labels:
+ app: ui
+ spec:
+ containers:
+ - name: ui
+ image: skywalking/ui:6.0.0-beta
+ ports:
+ - containerPort: 8080
+ name: page
+ resources:
+ requests:
+ memory: 1Gi
+ limits:
+ memory: 2Gi
+ env:
+ - name: collector.ribbon.listOfServers
+ value: oap:12800
[skywalking-kubernetes] 01/48: Init commit
Posted by in...@apache.org.
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 16e1399704bdac6f7f73c77e87d5baaea3a936ed
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Mon Oct 29 16:09:55 2018 +0800
Init commit
---
.gitignore | 2 +
README.md | 29 +++
scripts/elasticsearch/01-storageclass.yml | 25 +++
scripts/elasticsearch/02-service.yml | 32 +++
scripts/elasticsearch/03-statefulset.yml | 117 +++++++++++
scripts/istio/01-metrictemplete.yml | 24 +++
scripts/istio/02-skywalingadapter.yml | 26 +++
scripts/istio/03-operator_cfg.yml | 63 ++++++
scripts/namespace.yml | 22 ++
scripts/oap/00-rbac.yml | 50 +++++
scripts/oap/01-config.yml | 338 ++++++++++++++++++++++++++++++
scripts/oap/01-service.yml | 31 +++
scripts/oap/02-deployment.yml | 61 ++++++
scripts/ui/01-service.yml | 31 +++
scripts/ui/02-deployment.yml | 47 +++++
15 files changed, 898 insertions(+)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..538c8c5
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.DS_Store
+*~
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..26e65d2
--- /dev/null
+++ b/README.md
@@ -0,0 +1,29 @@
+# Apache SkyWalking Kubernetes
+
+To install and configure skywalking in a Kubernetes cluster, follow these instructions.
+
+## Prerequisites
+
+Please promise the `skywalking` namespace existed in the cluster, otherwise, create a new one.
+
+`kubctl apply -f scripts/namespace.yml`
+
+## Deploy Elasticsearch
+
+Use `kubectl apply -f ` with the scripts in `scripts/elasticsearch` to deploy elasticsearch servers
+in the cluster.
+
+> `01-storageclass.yml` assume to use GKE as the kubernetes provisioner. You could fix it according
+to your kubernetes environment.
+
+## Deploy OAP server
+
+Use `kubectl apply -f ` with the scripts in `scripts/opa` to deploy oap server
+in the cluster.
+
+## Deploy UI server
+
+Use `kubectl apply -f ` with the scripts in `scripts/ui` to deploy oap server
+in the cluster.
+
+
diff --git a/scripts/elasticsearch/01-storageclass.yml b/scripts/elasticsearch/01-storageclass.yml
new file mode 100644
index 0000000..b34e294
--- /dev/null
+++ b/scripts/elasticsearch/01-storageclass.yml
@@ -0,0 +1,25 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+kind: StorageClass
+apiVersion: storage.k8s.io/v1
+metadata:
+ name: ssd
+ namespace: skywalking
+provisioner: kubernetes.io/gce-pd
+parameters:
+ type: pd-ssd
+ zone: us-west1-a
\ No newline at end of file
diff --git a/scripts/elasticsearch/02-service.yml b/scripts/elasticsearch/02-service.yml
new file mode 100644
index 0000000..00d7e0d
--- /dev/null
+++ b/scripts/elasticsearch/02-service.yml
@@ -0,0 +1,32 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+apiVersion: v1
+kind: Service
+metadata:
+ name: elasticsearch
+ namespace: skywalking
+ labels:
+ service: elasticsearch
+spec:
+ clusterIP: None
+ ports:
+ - port: 9200
+ name: serving
+ - port: 9300
+ name: node-to-node
+ selector:
+ service: elasticsearch
\ No newline at end of file
diff --git a/scripts/elasticsearch/03-statefulset.yml b/scripts/elasticsearch/03-statefulset.yml
new file mode 100644
index 0000000..60b827a
--- /dev/null
+++ b/scripts/elasticsearch/03-statefulset.yml
@@ -0,0 +1,117 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+ name: elasticsearch
+ namespace: skywalking
+ labels:
+ service: elasticsearch
+spec:
+ serviceName: elasticsearch
+ # NOTE: This is number of nodes that we want to run
+ # you may update this
+ replicas: 3
+ selector:
+ matchLabels:
+ service: elasticsearch
+ template:
+ metadata:
+ labels:
+ service: elasticsearch
+ spec:
+ terminationGracePeriodSeconds: 300
+ initContainers:
+ # NOTE:
+ # This is to fix the permission on the volume
+ # By default elasticsearch container is not run as
+ # non root user.
+ # https://www.elastic.co/guide/en/elasticsearch/reference/current/docker.html#_notes_for_production_use_and_defaults
+ - name: fix-the-volume-permission
+ image: busybox
+ command:
+ - sh
+ - -c
+ - chown -R 1000:1000 /usr/share/elasticsearch/data
+ securityContext:
+ privileged: true
+ volumeMounts:
+ - name: data
+ mountPath: /usr/share/elasticsearch/data
+ # NOTE:
+ # To increase the default vm.max_map_count to 262144
+ # https://www.elastic.co/guide/en/elasticsearch/reference/current/docker.html#docker-cli-run-prod-mode
+ - name: increase-the-vm-max-map-count
+ image: busybox
+ command:
+ - sysctl
+ - -w
+ - vm.max_map_count=262144
+ securityContext:
+ privileged: true
+ # To increase the ulimit
+ # https://www.elastic.co/guide/en/elasticsearch/reference/current/docker.html#_notes_for_production_use_and_defaults
+ - name: increase-the-ulimit
+ image: busybox
+ command:
+ - sh
+ - -c
+ - ulimit -n 65536
+ securityContext:
+ privileged: true
+ containers:
+ - name: elasticsearch
+ image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.3.2
+ ports:
+ - containerPort: 9200
+ name: http
+ - containerPort: 9300
+ name: tcp
+ # NOTE: you can increase this resources
+ resources:
+ requests:
+ memory: 8Gi
+ limits:
+ memory: 16Gi
+ env:
+ # NOTE: the cluster name; update this
+ - name: cluster.name
+ value: elasticsearch-cluster
+ - name: node.name
+ valueFrom:
+ fieldRef:
+ fieldPath: metadata.name
+ # NOTE: This will tell the elasticsearch node where to connect to other nodes to form a cluster
+ - name: discovery.zen.ping.unicast.hosts
+ value: "elasticsearch-0.elasticsearch.skywalking.svc.cluster.local,elasticsearch-1.elasticsearch.skywalking.svc.cluster.local,elasticsearch-2.elasticsearch.skywalking.svc.cluster.local"
+ # NOTE: You can increase the heap size
+ - name: ES_JAVA_OPTS
+ value: -Xms4g -Xmx4g
+ volumeMounts:
+ - name: data
+ mountPath: /usr/share/elasticsearch/data
+ volumeClaimTemplates:
+ - metadata:
+ name: data
+ spec:
+ accessModes:
+ - ReadWriteOnce
+ storageClassName: ssd
+ # NOTE: You can increase the storage size
+ resources:
+ requests:
+ storage: 500Gi
diff --git a/scripts/istio/01-metrictemplete.yml b/scripts/istio/01-metrictemplete.yml
new file mode 100644
index 0000000..45e814e
--- /dev/null
+++ b/scripts/istio/01-metrictemplete.yml
@@ -0,0 +1,24 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+apiVersion: "config.istio.io/v1alpha2"
+kind: template
+metadata:
+ name: metric
+ namespace: istio-system
+spec:
+ descriptor: "CsD3AgogZ29vZ2xlL3Byb3RvYnVmL2Rlc2NyaXB0b3IucHJvdG8SD2dvb2dsZS5wcm90b2J1ZiJNChFGaWxlRGVzY3JpcHRvclNldBI4CgRmaWxlGAEgAygLMiQuZ29vZ2xlLnByb3RvYnVmLkZpbGVEZXNjcmlwdG9yUHJvdG9SBGZpbGUi5AQKE0ZpbGVEZXNjcmlwdG9yUHJvdG8SEgoEbmFtZRgBIAEoCVIEbmFtZRIYCgdwYWNrYWdlGAIgASgJUgdwYWNrYWdlEh4KCmRlcGVuZGVuY3kYAyADKAlSCmRlcGVuZGVuY3kSKwoRcHVibGljX2RlcGVuZGVuY3kYCiADKAVSEHB1YmxpY0RlcGVuZGVuY3kSJwoPd2Vha19kZXBlbmRlbmN5GAsgAygFUg53ZWFrRGVwZW5kZW5jeRJDCgxtZXNzYWdlX3R5cGUYBCADKAsyIC5nb29nbGUucHJvd [...]
+---
\ No newline at end of file
diff --git a/scripts/istio/02-skywalingadapter.yml b/scripts/istio/02-skywalingadapter.yml
new file mode 100644
index 0000000..d98ef2f
--- /dev/null
+++ b/scripts/istio/02-skywalingadapter.yml
@@ -0,0 +1,26 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+apiVersion: "config.istio.io/v1alpha2"
+kind: adapter
+metadata:
+ name: swadapter
+ namespace: istio-system
+spec:
+ description:
+ session_based: false
+ templates:
+ - metric
diff --git a/scripts/istio/03-operator_cfg.yml b/scripts/istio/03-operator_cfg.yml
new file mode 100644
index 0000000..cd292c4
--- /dev/null
+++ b/scripts/istio/03-operator_cfg.yml
@@ -0,0 +1,63 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+apiVersion: "config.istio.io/v1alpha2"
+kind: handler
+metadata:
+ name: sw
+ namespace: istio-system
+spec:
+ adapter: swadapter
+ connection:
+ address: "oap.skywalking.svc.cluster.local:11800"
+---
+
+# instance for template metric
+apiVersion: "config.istio.io/v1alpha2"
+kind: instance
+metadata:
+ name: swmetric
+ namespace: istio-system
+spec:
+ template: metric
+ params:
+ value: request.size | 0
+ dimensions:
+ sourceService: source.workload.name | ""
+ sourceUID: source.uid | ""
+ destinationService: destination.workload.name | ""
+ destinationUID: destination.uid | ""
+ requestMethod: request.method | ""
+ requestPath: request.path | ""
+ requestScheme: request.scheme | ""
+ requestTime: request.time
+ responseTime: response.time
+ responseCode: response.code | 200
+ reporter: conditional((context.reporter.kind | "inbound") == "outbound", "source", "destination")
+ apiProtocol: api.protocol | ""
+---
+
+# rule to dispatch to handler sw
+apiVersion: "config.istio.io/v1alpha2"
+kind: rule
+metadata:
+ name: swmetric-rule
+ namespace: istio-system
+spec:
+ actions:
+ - handler: sw.istio-system
+ instances:
+ - swmetric
diff --git a/scripts/namespace.yml b/scripts/namespace.yml
new file mode 100644
index 0000000..c0ebe1d
--- /dev/null
+++ b/scripts/namespace.yml
@@ -0,0 +1,22 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+apiVersion: v1
+kind: Namespace
+metadata:
+ name: skywalking
+ labels:
+ istio-injection: disabled
diff --git a/scripts/oap/00-rbac.yml b/scripts/oap/00-rbac.yml
new file mode 100644
index 0000000..244a88b
--- /dev/null
+++ b/scripts/oap/00-rbac.yml
@@ -0,0 +1,50 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+ name: skywalking-oap
+ namespace: skywalking
+
+---
+
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+ name: skywalking-oap
+ namespace: skywalking
+roleRef:
+ apiGroup: rbac.authorization.k8s.io
+ kind: Role
+ name: skywalking-oap
+subjects:
+- kind: ServiceAccount
+ name: skywalking-oap
+ namespace: skywalking
+
+---
+
+kind: Role
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+ namespace: skywalking
+ name: skywalking-oap
+rules:
+- apiGroups: [""]
+ resources: ["pods"]
+ verbs: ["get", "watch", "list"]
\ No newline at end of file
diff --git a/scripts/oap/01-config.yml b/scripts/oap/01-config.yml
new file mode 100644
index 0000000..c3c2eaf
--- /dev/null
+++ b/scripts/oap/01-config.yml
@@ -0,0 +1,338 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: oap-config
+ namespace: skywalking
+data:
+ application.yml: |-
+ cluster:
+ kubernetes:
+ watchTimeoutSeconds: 60
+ namespace: skywalking
+ labelSelector: app=oap
+ uidEnvName: SKYWALKING_COLLECTOR_UID
+ core:
+ default:
+ restHost: 0.0.0.0
+ restPort: 12800
+ restContextPath: /
+ gRPCHost: 0.0.0.0
+ gRPCPort: 11800
+ downsampling:
+ - Hour
+ - Day
+ - Month
+ recordDataTTL: 90 # Unit is minute
+ minuteMetricsDataTTL: 90 # Unit is minute
+ hourMetricsDataTTL: 36 # Unit is hour
+ dayMetricsDataTTL: 45 # Unit is day
+ monthMetricsDataTTL: 18 # Unit is month
+ storage:
+ elasticsearch:
+ clusterNodes: elasticsearch:9200
+ indexShardsNumber: 2
+ indexReplicasNumber: 0
+ bulkActions: 2000 # Execute the bulk every 2000 requests
+ bulkSize: 20 # flush the bulk every 20mb
+ flushInterval: 10 # flush the bulk every 10 seconds whatever the number of requests
+ concurrentRequests: 2 # the number of concurrent requests
+ receiver-register:
+ default:
+ receiver-trace:
+ default:
+ bufferPath: /trace-buffer/ # Path to trace buffer files, suggest to use absolute path
+ bufferOffsetMaxFileSize: 100 # Unit is MB
+ bufferDataMaxFileSize: 500 # Unit is MB
+ bufferFileCleanWhenRestart: false
+ receiver-jvm:
+ default:
+ service-mesh:
+ default:
+ bufferPath: /mesh-buffer/ # Path to trace buffer files, suggest to use absolute path
+ bufferOffsetMaxFileSize: 100 # Unit is MB
+ bufferDataMaxFileSize: 500 # Unit is MB
+ bufferFileCleanWhenRestart: false
+ istio-telemetry:
+ default:
+ query:
+ graphql:
+ path: /graphql
+ alarm:
+ default:
+
+ log4j2.xml: |--
+ <Configuration status="INFO">
+ <Appenders>
+ <Console name="Console" target="SYSTEM_OUT">
+ <PatternLayout charset="UTF-8" pattern="%d - %c -%-4r [%t] %-5p %x - %m%n"/>
+ </Console>
+ </Appenders>
+ <Loggers>
+ <logger name="org.eclipse.jetty" level="INFO"/>
+ <logger name="org.apache.zookeeper" level="INFO"/>
+ <logger name="org.elasticsearch.common.network.IfConfig" level="INFO"/>
+ <logger name="io.grpc.netty" level="INFO"/>
+ <logger name="org.apache.skywalking.oap.server.receiver.istio.telemetry" level="DEBUG"/>
+ <Root level="INFO">
+ <AppenderRef ref="Console"/>
+ </Root>
+ </Loggers>
+ </Configuration>
+
+ alarm-settings.yml: |-
+ rules:
+ service_resp_time_rule:
+ indicator-name: service_resp_time
+ include-names:
+ - dubbox-provider
+ - dubbox-consumer
+ threshold: 1000
+ op: ">"
+ period: 10
+ count: 1
+ webhooks:
+
+ component-libraries.yml: |-
+ Tomcat:
+ id: 1
+ languages: Java
+ HttpClient:
+ id: 2
+ languages: Java,C#,Node.js
+ Dubbo:
+ id: 3
+ languages: Java
+ H2:
+ id: 4
+ languages: Java
+ Mysql:
+ id: 5
+ languages: Java,C#,Node.js
+ ORACLE:
+ id: 6
+ languages: Java
+ Redis:
+ id: 7
+ languages: Java,C#,Node.js
+ Motan:
+ id: 8
+ languages: Java
+ MongoDB:
+ id: 9
+ languages: Java,C#,Node.js
+ Resin:
+ id: 10
+ languages: Java
+ Feign:
+ id: 11
+ languages: Java
+ OKHttp:
+ id: 12
+ languages: Java
+ SpringRestTemplate:
+ id: 13
+ languages: Java
+ SpringMVC:
+ id: 14
+ languages: Java
+ Struts2:
+ id: 15
+ languages: Java
+ NutzMVC:
+ id: 16
+ languages: Java
+ NutzHttp:
+ id: 17
+ languages: Java
+ JettyClient:
+ id: 18
+ languages: Java
+ JettyServer:
+ id: 19
+ languages: Java
+ Memcached:
+ id: 20
+ languages: Java
+ ShardingJDBC:
+ id: 21
+ languages: Java
+ PostgreSQL:
+ id: 22
+ languages: Java,C#,Node.js
+ GRPC:
+ id: 23
+ languages: Java
+ ElasticJob:
+ id: 24
+ languages: Java
+ RocketMQ:
+ id: 25
+ languages: Java
+ httpasyncclient:
+ id: 26
+ languages: Java
+ Kafka:
+ id: 27
+ languages: Java
+ ServiceComb:
+ id: 28
+ languages: Java
+ Hystrix:
+ id: 29
+ languages: Java
+ Jedis:
+ id: 30
+ languages: Java
+ SQLite:
+ id: 31
+ languages: Java,C#
+ h2-jdbc-driver:
+ id: 32
+ languages: Java
+ mysql-connector-java:
+ id: 33
+ languages: Java
+ Spymemcached:
+ id: 35
+ languages: Java
+ Xmemcached:
+ id: 36
+ languages: Java
+ postgresql-jdbc-driver:
+ id: 37
+ languages: Java
+ rocketMQ-producer:
+ id: 38
+ languages: Java
+ rocketMQ-consumer:
+ id: 39
+ languages: Java
+ kafka-producer:
+ id: 40
+ languages: Java
+ kafka-consumer:
+ id: 41
+ languages: Java
+ mongodb-driver:
+ id: 42
+ languages: Java
+ SOFARPC:
+ id: 43
+ languages: Java
+ ActiveMQ:
+ id: 44
+ languages: Java
+ activemq-producer:
+ id: 45
+ languages: Java
+ activemq-consumer:
+ id: 46
+ languages: Java
+ Elasticsearch:
+ id: 47
+ languages: Java
+ transport-client:
+ id: 48
+ languages: Java
+ AspNetCore:
+ id: 3001
+ languages: C#
+ EntityFrameworkCore:
+ id: 3002
+ languages: C#
+ SqlClient:
+ id: 3003
+ languages: C#
+ CAP:
+ id: 3004
+ languages: C#
+ StackExchange.Redis:
+ id: 3005
+ languages: C#
+ SqlServer:
+ id: 3006
+ languages: C#
+ Npgsql:
+ id: 3007
+ languages: C#
+ MySqlConnector:
+ id: 3008
+ languages: C#
+ EntityFrameworkCore.InMemory:
+ id: 3009
+ languages: C#
+ EntityFrameworkCore.SqlServer:
+ id: 3010
+ languages: C#
+ EntityFrameworkCore.Sqlite:
+ id: 3011
+ languages: C#
+ Pomelo.EntityFrameworkCore.MySql:
+ id: 3012
+ languages: C#
+ Npgsql.EntityFrameworkCore.PostgreSQL:
+ id: 3013
+ languages: C#
+ InMemoryDatabase:
+ id: 3014
+ languages: C#
+ AspNet:
+ id: 3015
+ languages: C#
+
+ # NoeJS components
+ # [4000, 5000) for Node.js agent
+ HttpServer:
+ id: 4001
+ languages: Node.js
+ express:
+ id: 4002
+ languages: Node.js
+ Egg:
+ id: 4003
+ languages: Node.js
+ Koa:
+ id: 4004
+ languages: Node.js
+ Component-Server-Mappings:
+ mongodb-driver: MongoDB
+ rocketMQ-producer: RocketMQ
+ rocketMQ-consumer: RocketMQ
+ kafka-producer: Kafka
+ kafka-consumer: Kafka
+ activemq-producer: ActiveMQ
+ activemq-consumer: ActiveMQ
+ postgresql-jdbc-driver: PostgreSQL
+ Xmemcached: Memcached
+ Spymemcached: Memcached
+ h2-jdbc-driver: H2
+ mysql-connector-java: Mysql
+ Jedis: Redis
+ StackExchange.Redis: Redis
+ SqlClient: SqlServer
+ Npgsql: PostgreSQL
+ MySqlConnector: Mysql
+ EntityFrameworkCore.InMemory: InMemoryDatabase
+ EntityFrameworkCore.SqlServer: SqlServer
+ EntityFrameworkCore.Sqlite: SQLite
+ Pomelo.EntityFrameworkCore.MySql: Mysql
+ Npgsql.EntityFrameworkCore.PostgreSQL: PostgreSQL
+ transport-client: Elasticsearch
+
+
diff --git a/scripts/oap/01-service.yml b/scripts/oap/01-service.yml
new file mode 100644
index 0000000..34c9586
--- /dev/null
+++ b/scripts/oap/01-service.yml
@@ -0,0 +1,31 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+apiVersion: v1
+kind: Service
+metadata:
+ name: oap
+ namespace: skywalking
+ labels:
+ service: oap
+spec:
+ ports:
+ - port: 12800
+ name: rest
+ - port: 11800
+ name: grpc
+ selector:
+ app: oap
\ No newline at end of file
diff --git a/scripts/oap/02-deployment.yml b/scripts/oap/02-deployment.yml
new file mode 100644
index 0000000..b525878
--- /dev/null
+++ b/scripts/oap/02-deployment.yml
@@ -0,0 +1,61 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: oap-deployment
+ namespace: skywalking
+ labels:
+ app: oap
+spec:
+ replicas: 3
+ selector:
+ matchLabels:
+ app: oap
+ template:
+ metadata:
+ labels:
+ app: oap
+ spec:
+ serviceAccountName: skywalking-oap
+ containers:
+ - name: oap
+ image: us.gcr.io/skywalking-live-demo/skywalking/oap:latest
+ ports:
+ - containerPort: 11800
+ name: grpc
+ - containerPort: 12800
+ name: rest
+ resources:
+ requests:
+ memory: 1Gi
+ limits:
+ memory: 2Gi
+ env:
+ - name: JAVA_OPTS
+ value: -Xms256M -Xmx512M
+ - name: SKYWALKING_COLLECTOR_UID
+ valueFrom:
+ fieldRef:
+ fieldPath: metadata.uid
+ volumeMounts:
+ - name: config
+ mountPath: /apache-skywalking-apm-incubating/config
+ volumes:
+ - name: config
+ configMap:
+ name: oap-config
\ No newline at end of file
diff --git a/scripts/ui/01-service.yml b/scripts/ui/01-service.yml
new file mode 100644
index 0000000..036ec1c
--- /dev/null
+++ b/scripts/ui/01-service.yml
@@ -0,0 +1,31 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+apiVersion: v1
+kind: Service
+metadata:
+ name: ui
+ namespace: skywalking
+ labels:
+ service: ui
+spec:
+ ports:
+ - port: 80
+ name: page
+ targetPort: page
+ type: LoadBalancer
+ selector:
+ app: ui
\ No newline at end of file
diff --git a/scripts/ui/02-deployment.yml b/scripts/ui/02-deployment.yml
new file mode 100644
index 0000000..2839981
--- /dev/null
+++ b/scripts/ui/02-deployment.yml
@@ -0,0 +1,47 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: ui-deployment
+ namespace: skywalking
+ labels:
+ app: ui
+spec:
+ replicas: 1
+ selector:
+ matchLabels:
+ app: ui
+ template:
+ metadata:
+ labels:
+ app: ui
+ spec:
+ containers:
+ - name: ui
+ image: us.gcr.io/skywalking-live-demo/skywalking/ui:latest
+ ports:
+ - containerPort: 8080
+ name: page
+ resources:
+ requests:
+ memory: 1Gi
+ limits:
+ memory: 2Gi
+ env:
+ - name: collector.ribbon.listOfServers
+ value: oap:12800
[skywalking-kubernetes] 38/48: Merge pull request #17 from
innerpeacez/change
Posted by in...@apache.org.
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 0bc427fcdd384ba4320c4dde7eab3e7bb4e4ed48
Merge: 2f58edb fa754a0
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Sun Oct 6 17:25:05 2019 +0800
Merge pull request #17 from innerpeacez/change
And helm 3 and skywalking 6.3.0 Chart
helm-chart/6.1.0/values.yaml | 82 -------
.../{ => helm2}/6.0.0-GA/skywalking/.helmignore | 0
.../{ => helm2}/6.0.0-GA/skywalking/Chart.yaml | 4 +-
.../{ => helm2}/6.0.0-GA/skywalking/README.md | 0
.../6.0.0-GA/skywalking/templates/NOTES.txt | 0
.../6.0.0-GA/skywalking/templates/_helpers.tpl | 0
.../elasticsearch/elasticsearch-service.yaml | 0
.../elasticsearch/elasticsearch-statefulset.yaml | 0
.../skywalking/templates/oap/oap-config.yaml | 0
.../skywalking/templates/oap/oap-deployment.yaml | 0
.../skywalking/templates/oap/oap-role.yaml | 0
.../skywalking/templates/oap/oap-rolebinding.yaml | 0
.../skywalking/templates/oap/oap-service.yaml | 0
.../templates/oap/oap-serviceaccount.yaml | 0
.../skywalking/templates/ui/ui-deployment.yaml | 0
.../skywalking/templates/ui/ui-ingress.yaml | 0
.../skywalking/templates/ui/ui-service.yaml | 0
.../{ => helm2}/6.0.0-GA/skywalking/values.yaml | 0
.../{6.1.0 => helm2/6.1.0/skywalking}/.helmignore | 0
.../{6.1.0 => helm2/6.1.0/skywalking}/Chart.yaml | 2 +
.../{6.1.0 => helm2/6.1.0/skywalking}/OWNERS | 0
.../{6.1.0 => helm2/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
.../6.1.0/skywalking}/templates/es-init.job.yaml | 0
.../skywalking}/templates/oap-deployment.yaml | 0
.../6.1.0/skywalking}/templates/oap-role.yaml | 0
.../skywalking}/templates/oap-rolebinding.yaml | 0
.../skywalking}/templates/oap-serviceaccount.yaml | 0
.../6.1.0/skywalking}/templates/oap-svc.yaml | 0
.../6.1.0/skywalking}/templates/ui-deployment.yaml | 0
.../6.1.0/skywalking}/templates/ui-ingress.yaml | 0
.../6.1.0/skywalking}/templates/ui-svc.yaml | 0
helm-chart/helm2/6.1.0/skywalking/values.yaml | 247 +++++++++++++++++++++
.../{6.1.0 => helm3/6.3.0/skywalking}/.helmignore | 0
.../{6.1.0 => helm3/6.3.0/skywalking}/Chart.yaml | 12 +-
.../{6.1.0 => helm3/6.3.0/skywalking}/OWNERS | 0
.../{6.1.0 => helm3/6.3.0/skywalking}/README.md | 83 ++++++-
.../6.3.0/skywalking}/templates/NOTES.txt | 0
.../6.3.0/skywalking}/templates/_helpers.tpl | 0
.../6.3.0/skywalking}/templates/es-init.job.yaml | 0
.../skywalking}/templates/oap-deployment.yaml | 0
.../6.3.0/skywalking}/templates/oap-role.yaml | 0
.../skywalking}/templates/oap-rolebinding.yaml | 0
.../skywalking}/templates/oap-serviceaccount.yaml | 0
.../6.3.0/skywalking}/templates/oap-svc.yaml | 0
.../6.3.0/skywalking}/templates/ui-deployment.yaml | 0
.../6.3.0/skywalking}/templates/ui-ingress.yaml | 0
.../6.3.0/skywalking}/templates/ui-svc.yaml | 0
helm-chart/helm3/6.3.0/skywalking/values.yaml | 247 +++++++++++++++++++++
52 files changed, 585 insertions(+), 92 deletions(-)
[skywalking-kubernetes] 34/48: email
Posted by in...@apache.org.
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 f3c478ed602b65f9edf87fb093f2e92f003d6853
Author: innerpeacez <zh...@163.com>
AuthorDate: Tue Aug 13 09:16:07 2019 +0800
email
---
helm-chart/6.0.0-GA/skywalking/Chart.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/helm-chart/6.0.0-GA/skywalking/Chart.yaml b/helm-chart/6.0.0-GA/skywalking/Chart.yaml
index ebcc330..1490ee9 100644
--- a/helm-chart/6.0.0-GA/skywalking/Chart.yaml
+++ b/helm-chart/6.0.0-GA/skywalking/Chart.yaml
@@ -6,4 +6,4 @@ version: 0.1.0
icon: https://github.com/apache/skywalking-kubernetes/blob/master/logo/skywalking-logo2.png
maintainers:
- name: innerpeacez
- email: 10146749@qq.com
\ No newline at end of file
+ email: innerpeace.zhai@gmail.com
\ No newline at end of file
[skywalking-kubernetes] 02/48: Add Istio script
Posted by in...@apache.org.
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 e793b4f25eb3f7ca558bb605a4f5ca6a38ac4771
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Mon Oct 29 16:10:38 2018 +0800
Add Istio script
---
README.md | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 26e65d2..0db37cd 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,7 @@
-# Apache SkyWalking Kubernetes
+Apache SkyWalking Kubernetes
+==========
+
+# Deploy SkyWalking backend to Kubernetes cluster
To install and configure skywalking in a Kubernetes cluster, follow these instructions.
@@ -26,4 +29,12 @@ in the cluster.
Use `kubectl apply -f ` with the scripts in `scripts/ui` to deploy oap server
in the cluster.
+# Setup Istio to send metric to oap
+
+## Prerequisites
+
+Istio should be installed in kubernetes cluster.
+
+## Setup Istio to send metric to oap
+Use `kubectl apply -f ` with the scripts in `kubernetes/istio` to setup.
[skywalking-kubernetes] 07/48: Add 6.0.0-alpha scripts
Posted by in...@apache.org.
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 ed5d410376f74dce51e9628496c0d90a52ea86af
Author: gaohongtao <ha...@gmail.com>
AuthorDate: Sat Dec 1 22:29:20 2018 +0800
Add 6.0.0-alpha scripts
---
.../6.0.0-alpha}/elasticsearch/01-storageclass.yml | 0
.../6.0.0-alpha}/elasticsearch/02-service.yml | 0
.../6.0.0-alpha}/elasticsearch/03-statefulset.yml | 0
.../6.0.0-alpha}/istio/01-metrictemplete.yml | 0
.../6.0.0-alpha}/istio/02-skywalingadapter.yml | 0
.../6.0.0-alpha}/istio/03-operator_cfg.yml | 0
{scripts => 6/6.0.0-alpha}/oap/00-rbac.yml | 0
{scripts => 6/6.0.0-alpha}/oap/01-config.yml | 0
{scripts => 6/6.0.0-alpha}/oap/01-service.yml | 0
{scripts => 6/6.0.0-alpha}/oap/02-deployment.yml | 18 ++++++++++++++++--
{scripts => 6/6.0.0-alpha}/ui/01-service.yml | 0
{scripts => 6/6.0.0-alpha}/ui/02-deployment.yml | 2 +-
README.md | 8 ++++----
scripts/namespace.yml | 22 ----------------------
14 files changed, 21 insertions(+), 29 deletions(-)
diff --git a/scripts/elasticsearch/01-storageclass.yml b/6/6.0.0-alpha/elasticsearch/01-storageclass.yml
similarity index 100%
rename from scripts/elasticsearch/01-storageclass.yml
rename to 6/6.0.0-alpha/elasticsearch/01-storageclass.yml
diff --git a/scripts/elasticsearch/02-service.yml b/6/6.0.0-alpha/elasticsearch/02-service.yml
similarity index 100%
rename from scripts/elasticsearch/02-service.yml
rename to 6/6.0.0-alpha/elasticsearch/02-service.yml
diff --git a/scripts/elasticsearch/03-statefulset.yml b/6/6.0.0-alpha/elasticsearch/03-statefulset.yml
similarity index 100%
rename from scripts/elasticsearch/03-statefulset.yml
rename to 6/6.0.0-alpha/elasticsearch/03-statefulset.yml
diff --git a/scripts/istio/01-metrictemplete.yml b/6/6.0.0-alpha/istio/01-metrictemplete.yml
similarity index 100%
rename from scripts/istio/01-metrictemplete.yml
rename to 6/6.0.0-alpha/istio/01-metrictemplete.yml
diff --git a/scripts/istio/02-skywalingadapter.yml b/6/6.0.0-alpha/istio/02-skywalingadapter.yml
similarity index 100%
rename from scripts/istio/02-skywalingadapter.yml
rename to 6/6.0.0-alpha/istio/02-skywalingadapter.yml
diff --git a/scripts/istio/03-operator_cfg.yml b/6/6.0.0-alpha/istio/03-operator_cfg.yml
similarity index 100%
rename from scripts/istio/03-operator_cfg.yml
rename to 6/6.0.0-alpha/istio/03-operator_cfg.yml
diff --git a/scripts/oap/00-rbac.yml b/6/6.0.0-alpha/oap/00-rbac.yml
similarity index 100%
rename from scripts/oap/00-rbac.yml
rename to 6/6.0.0-alpha/oap/00-rbac.yml
diff --git a/scripts/oap/01-config.yml b/6/6.0.0-alpha/oap/01-config.yml
similarity index 100%
rename from scripts/oap/01-config.yml
rename to 6/6.0.0-alpha/oap/01-config.yml
diff --git a/scripts/oap/01-service.yml b/6/6.0.0-alpha/oap/01-service.yml
similarity index 100%
rename from scripts/oap/01-service.yml
rename to 6/6.0.0-alpha/oap/01-service.yml
diff --git a/scripts/oap/02-deployment.yml b/6/6.0.0-alpha/oap/02-deployment.yml
similarity index 78%
rename from scripts/oap/02-deployment.yml
rename to 6/6.0.0-alpha/oap/02-deployment.yml
index b525878..a309195 100644
--- a/scripts/oap/02-deployment.yml
+++ b/6/6.0.0-alpha/oap/02-deployment.yml
@@ -32,9 +32,23 @@ spec:
app: oap
spec:
serviceAccountName: skywalking-oap
+ initContainers:
+ - name: init-oap
+ image: skywalking/oap:6.0.0-alpha
+ resources:
+ requests:
+ memory: 1Gi
+ limits:
+ memory: 2Gi
+ env:
+ - name: JAVA_OPTS
+ value: mode=init
+ volumeMounts:
+ - name: config
+ mountPath: /skywalking/config
containers:
- name: oap
- image: us.gcr.io/skywalking-live-demo/skywalking/oap:latest
+ image: skywalking/oap:6.0.0-alpha
ports:
- containerPort: 11800
name: grpc
@@ -54,7 +68,7 @@ spec:
fieldPath: metadata.uid
volumeMounts:
- name: config
- mountPath: /apache-skywalking-apm-incubating/config
+ mountPath: /skywalking/config
volumes:
- name: config
configMap:
diff --git a/scripts/ui/01-service.yml b/6/6.0.0-alpha/ui/01-service.yml
similarity index 100%
rename from scripts/ui/01-service.yml
rename to 6/6.0.0-alpha/ui/01-service.yml
diff --git a/scripts/ui/02-deployment.yml b/6/6.0.0-alpha/ui/02-deployment.yml
similarity index 95%
rename from scripts/ui/02-deployment.yml
rename to 6/6.0.0-alpha/ui/02-deployment.yml
index 2839981..e4f3116 100644
--- a/scripts/ui/02-deployment.yml
+++ b/6/6.0.0-alpha/ui/02-deployment.yml
@@ -33,7 +33,7 @@ spec:
spec:
containers:
- name: ui
- image: us.gcr.io/skywalking-live-demo/skywalking/ui:latest
+ image: skywalking/ui:6.0.0-alpha
ports:
- containerPort: 8080
name: page
diff --git a/README.md b/README.md
index 4bae8d1..920429a 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ Please promise the `skywalking` namespace existed in the cluster, otherwise, cre
## Deploy Elasticsearch
-Use `kubectl apply -f ` with the scripts in `scripts/elasticsearch` to deploy elasticsearch servers
+Use `kubectl apply -f ` with the scripts in `elasticsearch` to deploy elasticsearch servers
in the cluster.
> `01-storageclass.yml` assume to use GKE as the kubernetes provisioner. You could fix it according
@@ -21,12 +21,12 @@ to your kubernetes environment.
## Deploy OAP server
-Use `kubectl apply -f ` with the scripts in `scripts/opa` to deploy oap server
+Use `kubectl apply -f ` with the scripts in `opa` to deploy oap server
in the cluster.
## Deploy UI server
-Use `kubectl apply -f ` with the scripts in `scripts/ui` to deploy oap server
+Use `kubectl apply -f ` with the scripts in `ui` to deploy oap server
in the cluster.
# Setup Istio to send metric to oap
@@ -37,4 +37,4 @@ Istio should be installed in kubernetes cluster.
## Setup Istio to send metric to oap
-Use `kubectl apply -f ` with the scripts in `scripts/istio` to setup.
+Use `kubectl apply -f ` with the scripts in `istio` to setup.
diff --git a/scripts/namespace.yml b/scripts/namespace.yml
deleted file mode 100644
index c0ebe1d..0000000
--- a/scripts/namespace.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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.
-
-apiVersion: v1
-kind: Namespace
-metadata:
- name: skywalking
- labels:
- istio-injection: disabled
[skywalking-kubernetes] 43/48: modify logo url
Posted by in...@apache.org.
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 4e9fd08578e246e9e3ff942aee8a77b91358c6b6
Author: innerpeacez <in...@gmail.com>
AuthorDate: Tue Oct 8 17:53:16 2019 +0800
modify logo url
---
helm-chart/helm2/6.0.0-GA/skywalking/Chart.yaml | 2 +-
helm-chart/helm2/6.1.0/skywalking/Chart.yaml | 2 +-
helm-chart/helm3/6.3.0/skywalking/Chart.yaml | 2 +-
helm-chart/helm3/6.4.0/skywalking/Chart.yaml | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/helm-chart/helm2/6.0.0-GA/skywalking/Chart.yaml b/helm-chart/helm2/6.0.0-GA/skywalking/Chart.yaml
index 566ff3c..7b789d3 100644
--- a/helm-chart/helm2/6.0.0-GA/skywalking/Chart.yaml
+++ b/helm-chart/helm2/6.0.0-GA/skywalking/Chart.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
appVersion: 6.0.0-GA
description: Apache SkyWalking APM System
version: 0.1.0
-icon: https://github.com/apache/skywalking-kubernetes/blob/master/logo/skywalking-logo2.png
+icon: https://raw.githubusercontent.com/apache/skywalking-kubernetes/master/logo/sw-logo-for-chart.jpg
maintainers:
- name: innerpeacez
email: innerpeace.zhai@gmail.com
diff --git a/helm-chart/helm2/6.1.0/skywalking/Chart.yaml b/helm-chart/helm2/6.1.0/skywalking/Chart.yaml
index 5c9a852..ee48132 100644
--- a/helm-chart/helm2/6.1.0/skywalking/Chart.yaml
+++ b/helm-chart/helm2/6.1.0/skywalking/Chart.yaml
@@ -4,7 +4,7 @@ home: https://www.elastic.co/products/elasticsearch
version: 0.1.0
appVersion: 6.1.0
description: Apache SkyWalking APM System
-icon: https://github.com/apache/skywalking-website/blob/master/docs/.vuepress/public/assets/logo.svg
+icon: https://raw.githubusercontent.com/apache/skywalking-kubernetes/master/logo/sw-logo-for-chart.jpg
sources:
- https://github.com/apache/skywalking-kubernetes
maintainers:
diff --git a/helm-chart/helm3/6.3.0/skywalking/Chart.yaml b/helm-chart/helm3/6.3.0/skywalking/Chart.yaml
index 8657909..8761668 100644
--- a/helm-chart/helm3/6.3.0/skywalking/Chart.yaml
+++ b/helm-chart/helm3/6.3.0/skywalking/Chart.yaml
@@ -4,7 +4,7 @@ home: https://skywalking.apache.org
version: 0.1.0
appVersion: 6.3.0
description: Apache SkyWalking APM System
-icon: https://github.com/apache/skywalking-website/blob/master/docs/.vuepress/public/assets/logo.svg
+icon: https://raw.githubusercontent.com/apache/skywalking-kubernetes/master/logo/sw-logo-for-chart.jpg
sources:
- https://github.com/apache/skywalking-kubernetes
maintainers:
diff --git a/helm-chart/helm3/6.4.0/skywalking/Chart.yaml b/helm-chart/helm3/6.4.0/skywalking/Chart.yaml
index 0e44bc2..57e0ba6 100644
--- a/helm-chart/helm3/6.4.0/skywalking/Chart.yaml
+++ b/helm-chart/helm3/6.4.0/skywalking/Chart.yaml
@@ -4,7 +4,7 @@ home: https://skywalking.apache.org
version: 0.1.1
appVersion: 6.4.0
description: Apache SkyWalking APM System
-icon: https://github.com/apache/skywalking-website/blob/master/docs/.vuepress/public/assets/logo.svg
+icon: https://raw.githubusercontent.com/apache/skywalking-kubernetes/master/logo/sw-logo-for-chart.jpg
sources:
- https://github.com/apache/skywalking-kubernetes
maintainers:
[skywalking-kubernetes] 36/48: helm3 and 6.3.0
Posted by in...@apache.org.
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 2faf6eb40dad6b8e62ffd809c5720564a8642d2b
Author: innerpeacez <zh...@163.com>
AuthorDate: Wed Aug 14 11:57:28 2019 +0800
helm3 and 6.3.0
---
.../{ => helm2}/6.0.0-GA/skywalking/.helmignore | 0
.../{ => helm2}/6.0.0-GA/skywalking/Chart.yaml | 0
.../{ => helm2}/6.0.0-GA/skywalking/README.md | 0
.../6.0.0-GA/skywalking/templates/NOTES.txt | 0
.../6.0.0-GA/skywalking/templates/_helpers.tpl | 0
.../elasticsearch/elasticsearch-service.yaml | 0
.../elasticsearch/elasticsearch-statefulset.yaml | 0
.../skywalking/templates/oap/oap-config.yaml | 0
.../skywalking/templates/oap/oap-deployment.yaml | 0
.../skywalking/templates/oap/oap-role.yaml | 0
.../skywalking/templates/oap/oap-rolebinding.yaml | 0
.../skywalking/templates/oap/oap-service.yaml | 0
.../templates/oap/oap-serviceaccount.yaml | 0
.../skywalking/templates/ui/ui-deployment.yaml | 0
.../skywalking/templates/ui/ui-ingress.yaml | 0
.../skywalking/templates/ui/ui-service.yaml | 0
.../{ => helm2}/6.0.0-GA/skywalking/values.yaml | 0
.../{ => helm2}/6.1.0/skywalking/.helmignore | 0
helm-chart/{ => helm2}/6.1.0/skywalking/Chart.yaml | 0
helm-chart/{ => helm2}/6.1.0/skywalking/OWNERS | 0
helm-chart/{ => helm2}/6.1.0/skywalking/README.md | 0
.../{ => helm2}/6.1.0/skywalking/requirements.lock | 0
.../{ => helm2}/6.1.0/skywalking/requirements.yaml | 0
.../6.1.0/skywalking/templates/NOTES.txt | 0
.../6.1.0/skywalking/templates/_helpers.tpl | 0
.../6.1.0/skywalking/templates/es-init.job.yaml | 0
.../6.1.0/skywalking/templates/oap-deployment.yaml | 0
.../6.1.0/skywalking/templates/oap-role.yaml | 0
.../skywalking/templates/oap-rolebinding.yaml | 0
.../skywalking/templates/oap-serviceaccount.yaml | 0
.../6.1.0/skywalking/templates/oap-svc.yaml | 0
.../6.1.0/skywalking/templates/ui-deployment.yaml | 0
.../6.1.0/skywalking/templates/ui-ingress.yaml | 0
.../6.1.0/skywalking/templates/ui-svc.yaml | 0
.../{ => helm2}/6.1.0/skywalking/values.yaml | 0
.../{6.1.0 => helm3/6.3.0}/skywalking/.helmignore | 0
.../{6.1.0 => helm3/6.3.0}/skywalking/Chart.yaml | 10 ++-
.../{6.1.0 => helm3/6.3.0}/skywalking/OWNERS | 0
.../{6.1.0 => helm3/6.3.0}/skywalking/README.md | 83 ++++++++++++++++++++--
.../6.3.0}/skywalking/templates/NOTES.txt | 0
.../6.3.0}/skywalking/templates/_helpers.tpl | 0
.../6.3.0}/skywalking/templates/es-init.job.yaml | 0
.../skywalking/templates/oap-deployment.yaml | 0
.../6.3.0}/skywalking/templates/oap-role.yaml | 0
.../skywalking/templates/oap-rolebinding.yaml | 0
.../skywalking/templates/oap-serviceaccount.yaml | 0
.../6.3.0}/skywalking/templates/oap-svc.yaml | 0
.../6.3.0}/skywalking/templates/ui-deployment.yaml | 0
.../6.3.0}/skywalking/templates/ui-ingress.yaml | 0
.../6.3.0}/skywalking/templates/ui-svc.yaml | 0
.../{6.1.0 => helm3/6.3.0}/skywalking/values.yaml | 4 +-
51 files changed, 86 insertions(+), 11 deletions(-)
diff --git a/helm-chart/6.0.0-GA/skywalking/.helmignore b/helm-chart/helm2/6.0.0-GA/skywalking/.helmignore
similarity index 100%
rename from helm-chart/6.0.0-GA/skywalking/.helmignore
rename to helm-chart/helm2/6.0.0-GA/skywalking/.helmignore
diff --git a/helm-chart/6.0.0-GA/skywalking/Chart.yaml b/helm-chart/helm2/6.0.0-GA/skywalking/Chart.yaml
similarity index 100%
rename from helm-chart/6.0.0-GA/skywalking/Chart.yaml
rename to helm-chart/helm2/6.0.0-GA/skywalking/Chart.yaml
diff --git a/helm-chart/6.0.0-GA/skywalking/README.md b/helm-chart/helm2/6.0.0-GA/skywalking/README.md
similarity index 100%
rename from helm-chart/6.0.0-GA/skywalking/README.md
rename to helm-chart/helm2/6.0.0-GA/skywalking/README.md
diff --git a/helm-chart/6.0.0-GA/skywalking/templates/NOTES.txt b/helm-chart/helm2/6.0.0-GA/skywalking/templates/NOTES.txt
similarity index 100%
rename from helm-chart/6.0.0-GA/skywalking/templates/NOTES.txt
rename to helm-chart/helm2/6.0.0-GA/skywalking/templates/NOTES.txt
diff --git a/helm-chart/6.0.0-GA/skywalking/templates/_helpers.tpl b/helm-chart/helm2/6.0.0-GA/skywalking/templates/_helpers.tpl
similarity index 100%
rename from helm-chart/6.0.0-GA/skywalking/templates/_helpers.tpl
rename to helm-chart/helm2/6.0.0-GA/skywalking/templates/_helpers.tpl
diff --git a/helm-chart/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-service.yaml b/helm-chart/helm2/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-service.yaml
similarity index 100%
rename from helm-chart/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-service.yaml
rename to helm-chart/helm2/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-service.yaml
diff --git a/helm-chart/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-statefulset.yaml b/helm-chart/helm2/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-statefulset.yaml
similarity index 100%
rename from helm-chart/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-statefulset.yaml
rename to helm-chart/helm2/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-statefulset.yaml
diff --git a/helm-chart/6.0.0-GA/skywalking/templates/oap/oap-config.yaml b/helm-chart/helm2/6.0.0-GA/skywalking/templates/oap/oap-config.yaml
similarity index 100%
rename from helm-chart/6.0.0-GA/skywalking/templates/oap/oap-config.yaml
rename to helm-chart/helm2/6.0.0-GA/skywalking/templates/oap/oap-config.yaml
diff --git a/helm-chart/6.0.0-GA/skywalking/templates/oap/oap-deployment.yaml b/helm-chart/helm2/6.0.0-GA/skywalking/templates/oap/oap-deployment.yaml
similarity index 100%
rename from helm-chart/6.0.0-GA/skywalking/templates/oap/oap-deployment.yaml
rename to helm-chart/helm2/6.0.0-GA/skywalking/templates/oap/oap-deployment.yaml
diff --git a/helm-chart/6.0.0-GA/skywalking/templates/oap/oap-role.yaml b/helm-chart/helm2/6.0.0-GA/skywalking/templates/oap/oap-role.yaml
similarity index 100%
rename from helm-chart/6.0.0-GA/skywalking/templates/oap/oap-role.yaml
rename to helm-chart/helm2/6.0.0-GA/skywalking/templates/oap/oap-role.yaml
diff --git a/helm-chart/6.0.0-GA/skywalking/templates/oap/oap-rolebinding.yaml b/helm-chart/helm2/6.0.0-GA/skywalking/templates/oap/oap-rolebinding.yaml
similarity index 100%
rename from helm-chart/6.0.0-GA/skywalking/templates/oap/oap-rolebinding.yaml
rename to helm-chart/helm2/6.0.0-GA/skywalking/templates/oap/oap-rolebinding.yaml
diff --git a/helm-chart/6.0.0-GA/skywalking/templates/oap/oap-service.yaml b/helm-chart/helm2/6.0.0-GA/skywalking/templates/oap/oap-service.yaml
similarity index 100%
rename from helm-chart/6.0.0-GA/skywalking/templates/oap/oap-service.yaml
rename to helm-chart/helm2/6.0.0-GA/skywalking/templates/oap/oap-service.yaml
diff --git a/helm-chart/6.0.0-GA/skywalking/templates/oap/oap-serviceaccount.yaml b/helm-chart/helm2/6.0.0-GA/skywalking/templates/oap/oap-serviceaccount.yaml
similarity index 100%
rename from helm-chart/6.0.0-GA/skywalking/templates/oap/oap-serviceaccount.yaml
rename to helm-chart/helm2/6.0.0-GA/skywalking/templates/oap/oap-serviceaccount.yaml
diff --git a/helm-chart/6.0.0-GA/skywalking/templates/ui/ui-deployment.yaml b/helm-chart/helm2/6.0.0-GA/skywalking/templates/ui/ui-deployment.yaml
similarity index 100%
rename from helm-chart/6.0.0-GA/skywalking/templates/ui/ui-deployment.yaml
rename to helm-chart/helm2/6.0.0-GA/skywalking/templates/ui/ui-deployment.yaml
diff --git a/helm-chart/6.0.0-GA/skywalking/templates/ui/ui-ingress.yaml b/helm-chart/helm2/6.0.0-GA/skywalking/templates/ui/ui-ingress.yaml
similarity index 100%
rename from helm-chart/6.0.0-GA/skywalking/templates/ui/ui-ingress.yaml
rename to helm-chart/helm2/6.0.0-GA/skywalking/templates/ui/ui-ingress.yaml
diff --git a/helm-chart/6.0.0-GA/skywalking/templates/ui/ui-service.yaml b/helm-chart/helm2/6.0.0-GA/skywalking/templates/ui/ui-service.yaml
similarity index 100%
rename from helm-chart/6.0.0-GA/skywalking/templates/ui/ui-service.yaml
rename to helm-chart/helm2/6.0.0-GA/skywalking/templates/ui/ui-service.yaml
diff --git a/helm-chart/6.0.0-GA/skywalking/values.yaml b/helm-chart/helm2/6.0.0-GA/skywalking/values.yaml
similarity index 100%
rename from helm-chart/6.0.0-GA/skywalking/values.yaml
rename to helm-chart/helm2/6.0.0-GA/skywalking/values.yaml
diff --git a/helm-chart/6.1.0/skywalking/.helmignore b/helm-chart/helm2/6.1.0/skywalking/.helmignore
similarity index 100%
copy from helm-chart/6.1.0/skywalking/.helmignore
copy to helm-chart/helm2/6.1.0/skywalking/.helmignore
diff --git a/helm-chart/6.1.0/skywalking/Chart.yaml b/helm-chart/helm2/6.1.0/skywalking/Chart.yaml
similarity index 100%
copy from helm-chart/6.1.0/skywalking/Chart.yaml
copy to helm-chart/helm2/6.1.0/skywalking/Chart.yaml
diff --git a/helm-chart/6.1.0/skywalking/OWNERS b/helm-chart/helm2/6.1.0/skywalking/OWNERS
similarity index 100%
copy from helm-chart/6.1.0/skywalking/OWNERS
copy to helm-chart/helm2/6.1.0/skywalking/OWNERS
diff --git a/helm-chart/6.1.0/skywalking/README.md b/helm-chart/helm2/6.1.0/skywalking/README.md
similarity index 100%
copy from helm-chart/6.1.0/skywalking/README.md
copy to helm-chart/helm2/6.1.0/skywalking/README.md
diff --git a/helm-chart/6.1.0/skywalking/requirements.lock b/helm-chart/helm2/6.1.0/skywalking/requirements.lock
similarity index 100%
rename from helm-chart/6.1.0/skywalking/requirements.lock
rename to helm-chart/helm2/6.1.0/skywalking/requirements.lock
diff --git a/helm-chart/6.1.0/skywalking/requirements.yaml b/helm-chart/helm2/6.1.0/skywalking/requirements.yaml
similarity index 100%
rename from helm-chart/6.1.0/skywalking/requirements.yaml
rename to helm-chart/helm2/6.1.0/skywalking/requirements.yaml
diff --git a/helm-chart/6.1.0/skywalking/templates/NOTES.txt b/helm-chart/helm2/6.1.0/skywalking/templates/NOTES.txt
similarity index 100%
copy from helm-chart/6.1.0/skywalking/templates/NOTES.txt
copy to helm-chart/helm2/6.1.0/skywalking/templates/NOTES.txt
diff --git a/helm-chart/6.1.0/skywalking/templates/_helpers.tpl b/helm-chart/helm2/6.1.0/skywalking/templates/_helpers.tpl
similarity index 100%
copy from helm-chart/6.1.0/skywalking/templates/_helpers.tpl
copy to helm-chart/helm2/6.1.0/skywalking/templates/_helpers.tpl
diff --git a/helm-chart/6.1.0/skywalking/templates/es-init.job.yaml b/helm-chart/helm2/6.1.0/skywalking/templates/es-init.job.yaml
similarity index 100%
copy from helm-chart/6.1.0/skywalking/templates/es-init.job.yaml
copy to helm-chart/helm2/6.1.0/skywalking/templates/es-init.job.yaml
diff --git a/helm-chart/6.1.0/skywalking/templates/oap-deployment.yaml b/helm-chart/helm2/6.1.0/skywalking/templates/oap-deployment.yaml
similarity index 100%
copy from helm-chart/6.1.0/skywalking/templates/oap-deployment.yaml
copy to helm-chart/helm2/6.1.0/skywalking/templates/oap-deployment.yaml
diff --git a/helm-chart/6.1.0/skywalking/templates/oap-role.yaml b/helm-chart/helm2/6.1.0/skywalking/templates/oap-role.yaml
similarity index 100%
copy from helm-chart/6.1.0/skywalking/templates/oap-role.yaml
copy to helm-chart/helm2/6.1.0/skywalking/templates/oap-role.yaml
diff --git a/helm-chart/6.1.0/skywalking/templates/oap-rolebinding.yaml b/helm-chart/helm2/6.1.0/skywalking/templates/oap-rolebinding.yaml
similarity index 100%
copy from helm-chart/6.1.0/skywalking/templates/oap-rolebinding.yaml
copy to helm-chart/helm2/6.1.0/skywalking/templates/oap-rolebinding.yaml
diff --git a/helm-chart/6.1.0/skywalking/templates/oap-serviceaccount.yaml b/helm-chart/helm2/6.1.0/skywalking/templates/oap-serviceaccount.yaml
similarity index 100%
copy from helm-chart/6.1.0/skywalking/templates/oap-serviceaccount.yaml
copy to helm-chart/helm2/6.1.0/skywalking/templates/oap-serviceaccount.yaml
diff --git a/helm-chart/6.1.0/skywalking/templates/oap-svc.yaml b/helm-chart/helm2/6.1.0/skywalking/templates/oap-svc.yaml
similarity index 100%
copy from helm-chart/6.1.0/skywalking/templates/oap-svc.yaml
copy to helm-chart/helm2/6.1.0/skywalking/templates/oap-svc.yaml
diff --git a/helm-chart/6.1.0/skywalking/templates/ui-deployment.yaml b/helm-chart/helm2/6.1.0/skywalking/templates/ui-deployment.yaml
similarity index 100%
copy from helm-chart/6.1.0/skywalking/templates/ui-deployment.yaml
copy to helm-chart/helm2/6.1.0/skywalking/templates/ui-deployment.yaml
diff --git a/helm-chart/6.1.0/skywalking/templates/ui-ingress.yaml b/helm-chart/helm2/6.1.0/skywalking/templates/ui-ingress.yaml
similarity index 100%
copy from helm-chart/6.1.0/skywalking/templates/ui-ingress.yaml
copy to helm-chart/helm2/6.1.0/skywalking/templates/ui-ingress.yaml
diff --git a/helm-chart/6.1.0/skywalking/templates/ui-svc.yaml b/helm-chart/helm2/6.1.0/skywalking/templates/ui-svc.yaml
similarity index 100%
copy from helm-chart/6.1.0/skywalking/templates/ui-svc.yaml
copy to helm-chart/helm2/6.1.0/skywalking/templates/ui-svc.yaml
diff --git a/helm-chart/6.1.0/skywalking/values.yaml b/helm-chart/helm2/6.1.0/skywalking/values.yaml
similarity index 100%
copy from helm-chart/6.1.0/skywalking/values.yaml
copy to helm-chart/helm2/6.1.0/skywalking/values.yaml
diff --git a/helm-chart/6.1.0/skywalking/.helmignore b/helm-chart/helm3/6.3.0/skywalking/.helmignore
similarity index 100%
rename from helm-chart/6.1.0/skywalking/.helmignore
rename to helm-chart/helm3/6.3.0/skywalking/.helmignore
diff --git a/helm-chart/6.1.0/skywalking/Chart.yaml b/helm-chart/helm3/6.3.0/skywalking/Chart.yaml
similarity index 63%
rename from helm-chart/6.1.0/skywalking/Chart.yaml
rename to helm-chart/helm3/6.3.0/skywalking/Chart.yaml
index 5c9a852..b12bc7d 100644
--- a/helm-chart/6.1.0/skywalking/Chart.yaml
+++ b/helm-chart/helm3/6.3.0/skywalking/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
name: skywalking
home: https://www.elastic.co/products/elasticsearch
version: 0.1.0
-appVersion: 6.1.0
+appVersion: 6.3.0
description: Apache SkyWalking APM System
icon: https://github.com/apache/skywalking-website/blob/master/docs/.vuepress/public/assets/logo.svg
sources:
@@ -11,4 +11,10 @@ maintainers:
- name: hanahmily
email: hanahmily@gmail.com
- name: innerpeacez
- email: innerpeace.zhai@gmail.com
\ No newline at end of file
+ email: innerpeace.zhai@gmail.com
+
+dependencies:
+ - name: elasticsearch
+ version: ~1.28.2
+ repository: https://kubernetes-charts.storage.googleapis.com/
+ condition: elasticsearch.enabled
\ No newline at end of file
diff --git a/helm-chart/6.1.0/skywalking/OWNERS b/helm-chart/helm3/6.3.0/skywalking/OWNERS
similarity index 100%
rename from helm-chart/6.1.0/skywalking/OWNERS
rename to helm-chart/helm3/6.3.0/skywalking/OWNERS
diff --git a/helm-chart/6.1.0/skywalking/README.md b/helm-chart/helm3/6.3.0/skywalking/README.md
similarity index 52%
rename from helm-chart/6.1.0/skywalking/README.md
rename to helm-chart/helm3/6.3.0/skywalking/README.md
index a78e124..0421897 100644
--- a/helm-chart/6.1.0/skywalking/README.md
+++ b/helm-chart/helm3/6.3.0/skywalking/README.md
@@ -9,14 +9,15 @@ This chart bootstraps a [Apache SkyWalking](https://skywalking.apache.org/) depl
## Prerequisites
- Kubernetes 1.9.6+
- - PV dynamic provisioning support on the underlying infrastructure
+ - PV dynamic provisioning support on the underlying infrastructure (StorageClass)
+ - Helm 3
## Installing the Chart
To install the chart with the release name `my-release`:
-```console
-$ helm install --name my-release skywalking
+```shell
+$ helm install my-release skywalking -n <namespace>
```
The command deploys Apache Skywalking on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation.
@@ -27,8 +28,8 @@ The command deploys Apache Skywalking on the Kubernetes cluster in the default c
To uninstall/delete the `my-release` deployment:
-```console
-$ helm delete my-release
+```shell
+$ helm delete my-release -n <namespace>
```
The command removes all the Kubernetes components associated with the chart and deletes the release.
@@ -74,18 +75,86 @@ The following table lists the configurable parameters of the Skywalking chart an
| `ui.service.annotations` | Kubernetes service annotations | `{}` |
| `ui.service.loadBalancerSourceRanges` | Limit load balancer source IPs to list of CIDRs (where available)) | `[]` |
| `elasticsearch.enabled` | Spin up a new elasticsearch cluster for SkyWalking | `true` |
+| `elasticsearch.client.name` | `client` | Client component name |
+| `elasticsearch.client.replicas` | `2` | Client node replicas (deployment) |
+| `elasticsearch.client.resources` | `{} - cpu limit must be an integer` | Client node resources requests & limits |
+| `elasticsearch.client.priorityClassName` | `nil` | Client priorityClass |
+| `elasticsearch.client.heapSize` | `512m` | Client node heap size |
+| `elasticsearch.client.podAnnotations` | `{}` | Client Deployment annotations |
+| `elasticsearch.client.nodeSelector` | `{}` | Node labels for client pod assignment |
+| `elasticsearch.client.tolerations` | `[]` | Client tolerations |
+| `elasticsearch.client.serviceAnnotations` | `{}` | Client Service annotations |
+| `elasticsearch.client.serviceType` | `ClusterIP` | Client service type |
+| `elasticsearch.client.httpNodePort` | `nil` | Client service HTTP NodePort port number. Has no effect if client.serviceType is not `NodePort`. |
+| `elasticsearch.client.loadBalancerIP` | `{}` | Client loadBalancerIP |
+| `elasticsearch.client.loadBalancerSourceRanges` | `{}` | Client loadBalancerSourceRanges |
+| `elasticsearch.client.antiAffinity` | `soft` | Client anti-affinity policy |
+| `elasticsearch.client.nodeAffinity` | `{}` | Client node affinity policy |
+| `elasticsearch.client.initResources` | `{}` | Client initContainer resources requests & limits |
+| `elasticsearch.client.additionalJavaOpts` | `""` | Parameters to be added to `ES_JAVA_OPTS` environment variable for client |
+| `elasticsearch.client.ingress.enabled` | `false` | Enable Client Ingress |
+| `elasticsearch.client.ingress.user` | `nil` | If this & password are set, enable basic-auth on ingress |
+| `elasticsearch.client.ingress.password` | `nil` | If this & user are set, enable basic-auth on ingress |
+| `elasticsearch.client.ingress.annotations` | `{}` | Client Ingress annotations |
+| `elasticsearch.client.ingress.hosts` | `[]` | Client Ingress Hostnames |
+| `elasticsearch.client.ingress.tls` | `[]` | Client Ingress TLS configuration |
+| `elasticsearch.client.exposeTransportPort` | `false` | Expose transport port 9300 on client service (ClusterIP) |
+| `elasticsearch.master.initResources` | `{}` | Master initContainer resources requests & limits |
+| `elasticsearch.master.additionalJavaOpts` | `""` | Parameters to be added to `ES_JAVA_OPTS` environment variable for master |
+| `elasticsearch.master.exposeHttp` | `false` | Expose http port 9200 on master Pods for monitoring, etc |
+| `elasticsearch.master.name` | `master` | Master component name |
+| `elasticsearch.master.replicas` | `2` | Master node replicas (deployment) |
+| `elasticsearch.master.resources` | `{} - cpu limit must be an integer` | Master node resources requests & limits |
+| `elasticsearch.master.priorityClassName` | `nil` | Master priorityClass |
+| `elasticsearch.master.podAnnotations` | `{}` | Master Deployment annotations |
+| `elasticsearch.master.nodeSelector` | `{}` | Node labels for master pod assignment |
+| `elasticsearch.master.tolerations` | `[]` | Master tolerations |
+| `elasticsearch.master.heapSize` | `512m` | Master node heap size |
+| `elasticsearch.master.name` | `master` | Master component name |
+| `elasticsearch.master.persistence.enabled` | `true` | Master persistent enabled/disabled |
+| `elasticsearch.master.persistence.name` | `data` | Master statefulset PVC template name |
+| `elasticsearch.master.persistence.size` | `4Gi` | Master persistent volume size |
+| `elasticsearch.master.persistence.storageClass` | `nil` | Master persistent volume Class |
+| `elasticsearch.master.persistence.accessMode` | `ReadWriteOnce` | Master persistent Access Mode |
+| `elasticsearch.master.readinessProbe` | see `values.yaml` for defaults | Master container readiness probes |
+| `elasticsearch.master.antiAffinity` | `soft` | Master anti-affinity policy |
+| `elasticsearch.master.nodeAffinity` | `{}` | Master node affinity policy |
+| `elasticsearch.master.podManagementPolicy` | `OrderedReady` | Master pod creation strategy |
+| `elasticsearch.master.updateStrategy` | `{type: "onDelete"}` | Master node update strategy policy |
+| `elasticsearch.data.initResources` | `{}` | Data initContainer resources requests & limits |
+| `elasticsearch.data.additionalJavaOpts` | `""` | Parameters to be added to `ES_JAVA_OPTS` environment variable for data |
+| `elasticsearch.data.exposeHttp` | `false` | Expose http port 9200 on data Pods for monitoring, etc |
+| `elasticsearch.data.replicas` | `2` | Data node replicas (statefulset) |
+| `elasticsearch.data.resources` | `{} - cpu limit must be an integer` | Data node resources requests & limits |
+| `elasticsearch.data.priorityClassName` | `nil` | Data priorityClass |
+| `elasticsearch.data.heapSize` | `1536m` | Data node heap size |
+| `elasticsearch.data.hooks.drain.enabled` | `true` | Data nodes: Enable drain pre-stop and post-start hook |
+| `elasticsearch.data.persistence.enabled` | `true` | Data persistent enabled/disabled |
+| `elasticsearch.data.persistence.name` | `data` | Data statefulset PVC template name |
+| `elasticsearch.data.persistence.size` | `30Gi` | Data persistent volume size |
+| `elasticsearch.data.persistence.storageClass` | `nil` | Data persistent volume Class |
+| `elasticsearch.data.persistence.accessMode` | `ReadWriteOnce` | Data persistent Access Mode |
+| `elasticsearch.data.readinessProbe` | see `values.yaml` for defaults | Readiness probes for data-containers |
+| `elasticsearch.data.podAnnotations` | `{}` | Data StatefulSet annotations |
+| `elasticsearch.data.nodeSelector` | `{}` | Node labels for data pod assignment |
+| `elasticsearch.data.tolerations` | `[]` | Data tolerations |
+| `elasticsearch.data.terminationGracePeriodSeconds` | `3600` | Data termination grace period (seconds) |
+| `elasticsearch.data.antiAffinity` | `soft` | Data anti-affinity policy |
+| `elasticsearch.data.nodeAffinity` | `{}` | Data node affinity policy |
+| `elasticsearch.data.podManagementPolicy` | `OrderedReady` | Data pod creation strategy |
+| `elasticsearch.data.updateStrategy` | `{type: "onDelete"}` | Data node update strategy policy |
Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
```console
-$ helm install skywalking --name=myrelease --set nameOverride=newSkywalking
+$ helm install myrelease skywalking --set nameOverride=newSkywalking
```
Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example,
```console
-$ helm install skywalking --name my-release -f values.yaml
+$ helm install my-release skywalking -f values.yaml
```
> **Tip**: You can use the default [values.yaml](values.yaml)
diff --git a/helm-chart/6.1.0/skywalking/templates/NOTES.txt b/helm-chart/helm3/6.3.0/skywalking/templates/NOTES.txt
similarity index 100%
rename from helm-chart/6.1.0/skywalking/templates/NOTES.txt
rename to helm-chart/helm3/6.3.0/skywalking/templates/NOTES.txt
diff --git a/helm-chart/6.1.0/skywalking/templates/_helpers.tpl b/helm-chart/helm3/6.3.0/skywalking/templates/_helpers.tpl
similarity index 100%
rename from helm-chart/6.1.0/skywalking/templates/_helpers.tpl
rename to helm-chart/helm3/6.3.0/skywalking/templates/_helpers.tpl
diff --git a/helm-chart/6.1.0/skywalking/templates/es-init.job.yaml b/helm-chart/helm3/6.3.0/skywalking/templates/es-init.job.yaml
similarity index 100%
rename from helm-chart/6.1.0/skywalking/templates/es-init.job.yaml
rename to helm-chart/helm3/6.3.0/skywalking/templates/es-init.job.yaml
diff --git a/helm-chart/6.1.0/skywalking/templates/oap-deployment.yaml b/helm-chart/helm3/6.3.0/skywalking/templates/oap-deployment.yaml
similarity index 100%
rename from helm-chart/6.1.0/skywalking/templates/oap-deployment.yaml
rename to helm-chart/helm3/6.3.0/skywalking/templates/oap-deployment.yaml
diff --git a/helm-chart/6.1.0/skywalking/templates/oap-role.yaml b/helm-chart/helm3/6.3.0/skywalking/templates/oap-role.yaml
similarity index 100%
rename from helm-chart/6.1.0/skywalking/templates/oap-role.yaml
rename to helm-chart/helm3/6.3.0/skywalking/templates/oap-role.yaml
diff --git a/helm-chart/6.1.0/skywalking/templates/oap-rolebinding.yaml b/helm-chart/helm3/6.3.0/skywalking/templates/oap-rolebinding.yaml
similarity index 100%
rename from helm-chart/6.1.0/skywalking/templates/oap-rolebinding.yaml
rename to helm-chart/helm3/6.3.0/skywalking/templates/oap-rolebinding.yaml
diff --git a/helm-chart/6.1.0/skywalking/templates/oap-serviceaccount.yaml b/helm-chart/helm3/6.3.0/skywalking/templates/oap-serviceaccount.yaml
similarity index 100%
rename from helm-chart/6.1.0/skywalking/templates/oap-serviceaccount.yaml
rename to helm-chart/helm3/6.3.0/skywalking/templates/oap-serviceaccount.yaml
diff --git a/helm-chart/6.1.0/skywalking/templates/oap-svc.yaml b/helm-chart/helm3/6.3.0/skywalking/templates/oap-svc.yaml
similarity index 100%
rename from helm-chart/6.1.0/skywalking/templates/oap-svc.yaml
rename to helm-chart/helm3/6.3.0/skywalking/templates/oap-svc.yaml
diff --git a/helm-chart/6.1.0/skywalking/templates/ui-deployment.yaml b/helm-chart/helm3/6.3.0/skywalking/templates/ui-deployment.yaml
similarity index 100%
rename from helm-chart/6.1.0/skywalking/templates/ui-deployment.yaml
rename to helm-chart/helm3/6.3.0/skywalking/templates/ui-deployment.yaml
diff --git a/helm-chart/6.1.0/skywalking/templates/ui-ingress.yaml b/helm-chart/helm3/6.3.0/skywalking/templates/ui-ingress.yaml
similarity index 100%
rename from helm-chart/6.1.0/skywalking/templates/ui-ingress.yaml
rename to helm-chart/helm3/6.3.0/skywalking/templates/ui-ingress.yaml
diff --git a/helm-chart/6.1.0/skywalking/templates/ui-svc.yaml b/helm-chart/helm3/6.3.0/skywalking/templates/ui-svc.yaml
similarity index 100%
rename from helm-chart/6.1.0/skywalking/templates/ui-svc.yaml
rename to helm-chart/helm3/6.3.0/skywalking/templates/ui-svc.yaml
diff --git a/helm-chart/6.1.0/skywalking/values.yaml b/helm-chart/helm3/6.3.0/skywalking/values.yaml
similarity index 99%
rename from helm-chart/6.1.0/skywalking/values.yaml
rename to helm-chart/helm3/6.3.0/skywalking/values.yaml
index d1db10f..c9c8de1 100644
--- a/helm-chart/6.1.0/skywalking/values.yaml
+++ b/helm-chart/helm3/6.3.0/skywalking/values.yaml
@@ -9,7 +9,7 @@ oap:
name: skywalking-oap
image:
repository: apache/skywalking-oap-server
- tag: 6.1.0
+ tag: 6.3.0
pullPolicy: IfNotPresent
ports:
grpc: 11800
@@ -39,7 +39,7 @@ ui:
replicas: 1
image:
repository: apache/skywalking-ui
- tag: 6.1.0
+ tag: 6.3.0
pullPolicy: IfNotPresent
# podAnnotations:
# example: oap-foo
[skywalking-kubernetes] 08/48: Update sciprts
Posted by in...@apache.org.
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 aa2ec5b93611656e8f022a7fc29bbc4079a1c4e7
Author: gaohongtao <ha...@gmail.com>
AuthorDate: Mon Dec 3 00:11:26 2018 +0800
Update sciprts
---
6/6.0.0-alpha/namespace.yml | 0
6/6.0.0-alpha/oap/01-config.yml | 2 +-
6/6.0.0-alpha/oap/{01-service.yml => 02-service.yml} | 0
6/6.0.0-alpha/oap/{02-deployment.yml => 03-deployment.yml} | 14 --------------
README.md | 2 +-
5 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/6/6.0.0-alpha/namespace.yml b/6/6.0.0-alpha/namespace.yml
new file mode 100644
index 0000000..e69de29
diff --git a/6/6.0.0-alpha/oap/01-config.yml b/6/6.0.0-alpha/oap/01-config.yml
index c3c2eaf..98a5b0b 100644
--- a/6/6.0.0-alpha/oap/01-config.yml
+++ b/6/6.0.0-alpha/oap/01-config.yml
@@ -76,7 +76,7 @@ data:
alarm:
default:
- log4j2.xml: |--
+ log4j2.xml: |-
<Configuration status="INFO">
<Appenders>
<Console name="Console" target="SYSTEM_OUT">
diff --git a/6/6.0.0-alpha/oap/01-service.yml b/6/6.0.0-alpha/oap/02-service.yml
similarity index 100%
rename from 6/6.0.0-alpha/oap/01-service.yml
rename to 6/6.0.0-alpha/oap/02-service.yml
diff --git a/6/6.0.0-alpha/oap/02-deployment.yml b/6/6.0.0-alpha/oap/03-deployment.yml
similarity index 82%
rename from 6/6.0.0-alpha/oap/02-deployment.yml
rename to 6/6.0.0-alpha/oap/03-deployment.yml
index a309195..cb9292e 100644
--- a/6/6.0.0-alpha/oap/02-deployment.yml
+++ b/6/6.0.0-alpha/oap/03-deployment.yml
@@ -32,20 +32,6 @@ spec:
app: oap
spec:
serviceAccountName: skywalking-oap
- initContainers:
- - name: init-oap
- image: skywalking/oap:6.0.0-alpha
- resources:
- requests:
- memory: 1Gi
- limits:
- memory: 2Gi
- env:
- - name: JAVA_OPTS
- value: mode=init
- volumeMounts:
- - name: config
- mountPath: /skywalking/config
containers:
- name: oap
image: skywalking/oap:6.0.0-alpha
diff --git a/README.md b/README.md
index 920429a..e67900d 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ To install and configure skywalking in a Kubernetes cluster, follow these instru
Please promise the `skywalking` namespace existed in the cluster, otherwise, create a new one.
-`kubctl apply -f scripts/namespace.yml`
+`kubctl apply -f namespace.yml`
## Deploy Elasticsearch
[skywalking-kubernetes] 05/48: Update 03-statefulset.yml
Posted by in...@apache.org.
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 fe66a754b6820628ee68fe5c8f6329f6781ac8b7
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Mon Nov 5 15:31:50 2018 +0800
Update 03-statefulset.yml
Improve discovery config
---
scripts/elasticsearch/03-statefulset.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/elasticsearch/03-statefulset.yml b/scripts/elasticsearch/03-statefulset.yml
index 60b827a..6c6e3a4 100644
--- a/scripts/elasticsearch/03-statefulset.yml
+++ b/scripts/elasticsearch/03-statefulset.yml
@@ -97,7 +97,7 @@ spec:
fieldPath: metadata.name
# NOTE: This will tell the elasticsearch node where to connect to other nodes to form a cluster
- name: discovery.zen.ping.unicast.hosts
- value: "elasticsearch-0.elasticsearch.skywalking.svc.cluster.local,elasticsearch-1.elasticsearch.skywalking.svc.cluster.local,elasticsearch-2.elasticsearch.skywalking.svc.cluster.local"
+ value: elasticsearch:9300
# NOTE: You can increase the heap size
- name: ES_JAVA_OPTS
value: -Xms4g -Xmx4g
[skywalking-kubernetes] 44/48: Merge pull request #20 from
innerpeacez/modify-logo-url
Posted by in...@apache.org.
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 fafaa1cb7f24f74c1528e9a448e2090528aa70fb
Merge: 40430db 4e9fd08
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Wed Oct 9 10:19:08 2019 +0800
Merge pull request #20 from innerpeacez/modify-logo-url
modify logo url
helm-chart/helm2/6.0.0-GA/skywalking/Chart.yaml | 2 +-
helm-chart/helm2/6.1.0/skywalking/Chart.yaml | 2 +-
helm-chart/helm3/6.3.0/skywalking/Chart.yaml | 2 +-
helm-chart/helm3/6.4.0/skywalking/Chart.yaml | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
[skywalking-kubernetes] 45/48: modify role to clusterrole
Posted by in...@apache.org.
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 <in...@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
[skywalking-kubernetes] 31/48: Add 6.1.0 chart
Posted by in...@apache.org.
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 08b2d4f82726ca4f4b46b29e6ec3918da90cec5f
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Wed Jun 26 08:35:09 2019 +0800
Add 6.1.0 chart
---
.../6.0.0-GA/skywalking/.helmignore | 0
.../6.0.0-GA/skywalking/Chart.yaml | 0
.../6 => helm-chart}/6.0.0-GA/skywalking/README.md | 0
.../6.0.0-GA/skywalking/templates/NOTES.txt | 0
.../6.0.0-GA/skywalking/templates/_helpers.tpl | 0
.../elasticsearch/elasticsearch-service.yaml | 0
.../elasticsearch/elasticsearch-statefulset.yaml | 0
.../skywalking/templates/oap/oap-config.yaml | 0
.../skywalking/templates/oap/oap-deployment.yaml | 0
.../skywalking/templates/oap/oap-role.yaml | 0
.../skywalking/templates/oap/oap-rolebinding.yaml | 0
.../skywalking/templates/oap/oap-service.yaml | 0
.../templates/oap/oap-serviceaccount.yaml | 0
.../skywalking/templates/ui/ui-deployment.yaml | 0
.../skywalking/templates/ui/ui-ingress.yaml | 0
.../skywalking/templates/ui/ui-service.yaml | 0
.../6.0.0-GA/skywalking/values.yaml | 0
.../skywalking => helm-chart/6.1.0}/.helmignore | 1 +
helm-chart/6.1.0/Chart.yaml | 12 ++
helm-chart/6.1.0/OWNERS | 6 +
helm-chart/6.1.0/README.md | 129 +++++++++++++++++++++
helm-chart/6.1.0/requirements.lock | 6 +
helm-chart/6.1.0/requirements.yaml | 5 +
.../6.1.0}/templates/NOTES.txt | 14 +--
helm-chart/6.1.0/templates/_helpers.tpl | 61 ++++++++++
helm-chart/6.1.0/templates/es-init.job.yaml | 38 ++++++
helm-chart/6.1.0/templates/oap-deployment.yaml | 99 ++++++++++++++++
helm-chart/6.1.0/templates/oap-role.yaml | 13 +++
helm-chart/6.1.0/templates/oap-rolebinding.yaml | 17 +++
helm-chart/6.1.0/templates/oap-serviceaccount.yaml | 10 ++
helm-chart/6.1.0/templates/oap-svc.yaml | 21 ++++
helm-chart/6.1.0/templates/ui-deployment.yaml | 42 +++++++
helm-chart/6.1.0/templates/ui-ingress.yaml | 34 ++++++
helm-chart/6.1.0/templates/ui-svc.yaml | 48 ++++++++
helm-chart/6.1.0/values.yaml | 82 +++++++++++++
35 files changed, 631 insertions(+), 7 deletions(-)
diff --git a/helm/charts/6/6.0.0-GA/skywalking/.helmignore b/helm-chart/6.0.0-GA/skywalking/.helmignore
similarity index 100%
copy from helm/charts/6/6.0.0-GA/skywalking/.helmignore
copy to helm-chart/6.0.0-GA/skywalking/.helmignore
diff --git a/helm/charts/6/6.0.0-GA/skywalking/Chart.yaml b/helm-chart/6.0.0-GA/skywalking/Chart.yaml
similarity index 100%
rename from helm/charts/6/6.0.0-GA/skywalking/Chart.yaml
rename to helm-chart/6.0.0-GA/skywalking/Chart.yaml
diff --git a/helm/charts/6/6.0.0-GA/skywalking/README.md b/helm-chart/6.0.0-GA/skywalking/README.md
similarity index 100%
rename from helm/charts/6/6.0.0-GA/skywalking/README.md
rename to helm-chart/6.0.0-GA/skywalking/README.md
diff --git a/helm/charts/6/6.0.0-GA/skywalking/templates/NOTES.txt b/helm-chart/6.0.0-GA/skywalking/templates/NOTES.txt
similarity index 100%
copy from helm/charts/6/6.0.0-GA/skywalking/templates/NOTES.txt
copy to helm-chart/6.0.0-GA/skywalking/templates/NOTES.txt
diff --git a/helm/charts/6/6.0.0-GA/skywalking/templates/_helpers.tpl b/helm-chart/6.0.0-GA/skywalking/templates/_helpers.tpl
similarity index 100%
rename from helm/charts/6/6.0.0-GA/skywalking/templates/_helpers.tpl
rename to helm-chart/6.0.0-GA/skywalking/templates/_helpers.tpl
diff --git a/helm/charts/6/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-service.yaml b/helm-chart/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-service.yaml
similarity index 100%
rename from helm/charts/6/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-service.yaml
rename to helm-chart/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-service.yaml
diff --git a/helm/charts/6/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-statefulset.yaml b/helm-chart/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-statefulset.yaml
similarity index 100%
rename from helm/charts/6/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-statefulset.yaml
rename to helm-chart/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-statefulset.yaml
diff --git a/helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-config.yaml b/helm-chart/6.0.0-GA/skywalking/templates/oap/oap-config.yaml
similarity index 100%
rename from helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-config.yaml
rename to helm-chart/6.0.0-GA/skywalking/templates/oap/oap-config.yaml
diff --git a/helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-deployment.yaml b/helm-chart/6.0.0-GA/skywalking/templates/oap/oap-deployment.yaml
similarity index 100%
rename from helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-deployment.yaml
rename to helm-chart/6.0.0-GA/skywalking/templates/oap/oap-deployment.yaml
diff --git a/helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-role.yaml b/helm-chart/6.0.0-GA/skywalking/templates/oap/oap-role.yaml
similarity index 100%
rename from helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-role.yaml
rename to helm-chart/6.0.0-GA/skywalking/templates/oap/oap-role.yaml
diff --git a/helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-rolebinding.yaml b/helm-chart/6.0.0-GA/skywalking/templates/oap/oap-rolebinding.yaml
similarity index 100%
rename from helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-rolebinding.yaml
rename to helm-chart/6.0.0-GA/skywalking/templates/oap/oap-rolebinding.yaml
diff --git a/helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-service.yaml b/helm-chart/6.0.0-GA/skywalking/templates/oap/oap-service.yaml
similarity index 100%
rename from helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-service.yaml
rename to helm-chart/6.0.0-GA/skywalking/templates/oap/oap-service.yaml
diff --git a/helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-serviceaccount.yaml b/helm-chart/6.0.0-GA/skywalking/templates/oap/oap-serviceaccount.yaml
similarity index 100%
rename from helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-serviceaccount.yaml
rename to helm-chart/6.0.0-GA/skywalking/templates/oap/oap-serviceaccount.yaml
diff --git a/helm/charts/6/6.0.0-GA/skywalking/templates/ui/ui-deployment.yaml b/helm-chart/6.0.0-GA/skywalking/templates/ui/ui-deployment.yaml
similarity index 100%
rename from helm/charts/6/6.0.0-GA/skywalking/templates/ui/ui-deployment.yaml
rename to helm-chart/6.0.0-GA/skywalking/templates/ui/ui-deployment.yaml
diff --git a/helm/charts/6/6.0.0-GA/skywalking/templates/ui/ui-ingress.yaml b/helm-chart/6.0.0-GA/skywalking/templates/ui/ui-ingress.yaml
similarity index 100%
rename from helm/charts/6/6.0.0-GA/skywalking/templates/ui/ui-ingress.yaml
rename to helm-chart/6.0.0-GA/skywalking/templates/ui/ui-ingress.yaml
diff --git a/helm/charts/6/6.0.0-GA/skywalking/templates/ui/ui-service.yaml b/helm-chart/6.0.0-GA/skywalking/templates/ui/ui-service.yaml
similarity index 100%
rename from helm/charts/6/6.0.0-GA/skywalking/templates/ui/ui-service.yaml
rename to helm-chart/6.0.0-GA/skywalking/templates/ui/ui-service.yaml
diff --git a/helm/charts/6/6.0.0-GA/skywalking/values.yaml b/helm-chart/6.0.0-GA/skywalking/values.yaml
similarity index 100%
rename from helm/charts/6/6.0.0-GA/skywalking/values.yaml
rename to helm-chart/6.0.0-GA/skywalking/values.yaml
diff --git a/helm/charts/6/6.0.0-GA/skywalking/.helmignore b/helm-chart/6.1.0/.helmignore
similarity index 97%
rename from helm/charts/6/6.0.0-GA/skywalking/.helmignore
rename to helm-chart/6.1.0/.helmignore
index f0c1319..7c04072 100644
--- a/helm/charts/6/6.0.0-GA/skywalking/.helmignore
+++ b/helm-chart/6.1.0/.helmignore
@@ -19,3 +19,4 @@
.project
.idea/
*.tmproj
+OWNERS
diff --git a/helm-chart/6.1.0/Chart.yaml b/helm-chart/6.1.0/Chart.yaml
new file mode 100644
index 0000000..df60971
--- /dev/null
+++ b/helm-chart/6.1.0/Chart.yaml
@@ -0,0 +1,12 @@
+apiVersion: v1
+name: skywalking
+home: https://www.elastic.co/products/elasticsearch
+version: 0.1.0
+appVersion: 6.1.0
+description: Apache SkyWalking APM System
+icon: https://github.com/apache/skywalking-website/blob/master/docs/.vuepress/public/assets/logo.svg
+sources:
+- https://github.com/apache/skywalking-kubernetes
+maintainers:
+- name: hanahmily
+ email: hanahmily@gmail.com
diff --git a/helm-chart/6.1.0/OWNERS b/helm-chart/6.1.0/OWNERS
new file mode 100644
index 0000000..5d00621
--- /dev/null
+++ b/helm-chart/6.1.0/OWNERS
@@ -0,0 +1,6 @@
+approvers:
+- hanahmily
+- wu-sheng
+reviewers:
+- hanahmily
+- wu-sheng
diff --git a/helm-chart/6.1.0/README.md b/helm-chart/6.1.0/README.md
new file mode 100644
index 0000000..a78e124
--- /dev/null
+++ b/helm-chart/6.1.0/README.md
@@ -0,0 +1,129 @@
+# Apache Skywalking Helm Chart
+
+[Apache SkyWalking](https://skywalking.apache.org/) is application performance monitor tool for distributed systems, especially designed for microservices, cloud native and container-based (Docker, K8s, Mesos) architectures.
+
+## Introduction
+
+This chart bootstraps a [Apache SkyWalking](https://skywalking.apache.org/) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager.
+
+## Prerequisites
+
+ - Kubernetes 1.9.6+
+ - PV dynamic provisioning support on the underlying infrastructure
+
+## Installing the Chart
+
+To install the chart with the release name `my-release`:
+
+```console
+$ helm install --name my-release skywalking
+```
+
+The command deploys Apache Skywalking on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation.
+
+> **Tip**: List all releases using `helm list`
+
+## Uninstalling the Chart
+
+To uninstall/delete the `my-release` deployment:
+
+```console
+$ helm delete my-release
+```
+
+The command removes all the Kubernetes components associated with the chart and deletes the release.
+
+## Configuration
+
+The following table lists the configurable parameters of the Skywalking chart and their default values.
+
+| Parameter | Description | Default |
+|---------------------------------------|--------------------------------------------------------------------|-------------------------------------|
+| `nameOverride` | Override name | `nil` |
+| `serviceAccounts.oap` | Name of the OAP service account to use or create | `nil` |
+| `oap.name` | OAP deployment name | `oap` |
+| `oap.image.repository` | OAP container image name | `apache/skywalking-oap-server` |
+| `oap.image.tag` | OAP container image tag | `6.1.0` |
+| `oap.image.pullPolicy` | OAP container image pull policy | `IfNotPresent` |
+| `oap.ports.grpc` | OAP grpc port for tracing or metric | `11800` |
+| `oap.ports.rest` | OAP http port for Web UI | `12800` |
+| `oap.replicas` | OAP k8s deployment replicas | `2` |
+| `oap.service.type` | OAP svc type | `ClusterIP` |
+| `oap.javaOpts` | Parameters to be added to `JAVA_OPTS`environment variable for OAP | `-Xms2g -Xmx2g` |
+| `oap.antiAffinity` | OAP anti-affinity policy | `soft` |
+| `oap.nodeAffinity` | OAP node affinity policy | `{}` |
+| `oap.nodeSelector` | OAP labels for master pod assignment | `{}` |
+| `oap.tolerations` | OAP tolerations | `[]` |
+| `oap.resources` | OAP node resources requests & limits | `{} - cpu limit must be an integer` |
+| `oap.env` | OAP environment variables | `[]` |
+| `ui.name` | Web UI deployment name | `ui` |
+| `ui.replicas` | Web UI k8s deployment replicas | `1` |
+| `ui.image.repository` | Web UI container image name | `apache/skywalking-ui` |
+| `ui.image.tag` | Web UI container image tag | `6.1.0` |
+| `ui.image.pullPolicy` | Web UI container image pull policy | `IfNotPresent` |
+| `ui.ingress.enabled` | Create Ingress for Web UI | `false` |
+| `ui.ingress.annotations` | Associate annotations to the Ingress | `{}` |
+| `ui.ingress.path` | Associate path with the Ingress | `/` |
+| `ui.ingress.hosts` | Associate hosts with the Ingress | `[]` |
+| `ui.ingress.tls` | Associate TLS with the Ingress | `[]` |
+| `ui.service.type` | Web UI svc type | `ClusterIP` |
+| `ui.service.externalPort` | external port for the service | `80` |
+| `ui.service.internalPort` | internal port for the service | `8080` |
+| `ui.service.externalIPs` | external IP addresses | `nil` |
+| `ui.service.loadBalancerIP` | Load Balancer IP address | `nil` |
+| `ui.service.annotations` | Kubernetes service annotations | `{}` |
+| `ui.service.loadBalancerSourceRanges` | Limit load balancer source IPs to list of CIDRs (where available)) | `[]` |
+| `elasticsearch.enabled` | Spin up a new elasticsearch cluster for SkyWalking | `true` |
+
+
+Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
+
+```console
+$ helm install skywalking --name=myrelease --set nameOverride=newSkywalking
+```
+
+Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example,
+
+```console
+$ helm install skywalking --name my-release -f values.yaml
+```
+
+> **Tip**: You can use the default [values.yaml](values.yaml)
+
+### RBAC Configuration
+Roles and RoleBindings resources will be created automatically for `OAP` .
+
+> **Tip**: You can refer to the default `oap-role.yaml` file in [templates](templates/) to customize your own.
+
+### Ingress TLS
+If your cluster allows automatic create/retrieve of TLS certificates (e.g. [kube-lego](https://github.com/jetstack/kube-lego)), please refer to the documentation for that mechanism.
+
+To manually configure TLS, first create/retrieve a key & certificate pair for the address(skywalking ui) you wish to protect. Then create a TLS secret in the namespace:
+
+```console
+kubectl create secret tls skywalking-tls --cert=path/to/tls.cert --key=path/to/tls.key
+```
+
+Include the secret's name, along with the desired hostnames, in the skywalking-ui Ingress TLS section of your custom `values.yaml` file:
+
+```yaml
+ui:
+ ingress:
+ ## If true, Skywalking ui server Ingress will be created
+ ##
+ enabled: true
+
+ ## Skywalking ui server Ingress hostnames
+ ## Must be provided if Ingress is enabled
+ ##
+ hosts:
+ - skywalking.domain.com
+
+ ## Skywalking ui server Ingress TLS configuration
+ ## Secrets must be manually created in the namespace
+ ##
+ tls:
+ - secretName: skywalking-tls
+ hosts:
+ - skywalking.domain.com
+```
diff --git a/helm-chart/6.1.0/requirements.lock b/helm-chart/6.1.0/requirements.lock
new file mode 100644
index 0000000..ded1e89
--- /dev/null
+++ b/helm-chart/6.1.0/requirements.lock
@@ -0,0 +1,6 @@
+dependencies:
+- name: elasticsearch
+ repository: https://kubernetes-charts.storage.googleapis.com/
+ version: 1.28.2
+digest: sha256:67d9994c349045029be4c1a5fb3865bb765a80bff936b9bf347232f25ca8578e
+generated: 2019-06-12T17:35:54.545428+08:00
diff --git a/helm-chart/6.1.0/requirements.yaml b/helm-chart/6.1.0/requirements.yaml
new file mode 100644
index 0000000..1f7ab67
--- /dev/null
+++ b/helm-chart/6.1.0/requirements.yaml
@@ -0,0 +1,5 @@
+dependencies:
+- name: elasticsearch
+ version: ~1.28.2
+ repository: https://kubernetes-charts.storage.googleapis.com/
+ condition: elasticsearch.enabled
diff --git a/helm/charts/6/6.0.0-GA/skywalking/templates/NOTES.txt b/helm-chart/6.1.0/templates/NOTES.txt
similarity index 64%
rename from helm/charts/6/6.0.0-GA/skywalking/templates/NOTES.txt
rename to helm-chart/6.1.0/templates/NOTES.txt
index e49295c..c7b38cf 100644
--- a/helm/charts/6/6.0.0-GA/skywalking/templates/NOTES.txt
+++ b/helm-chart/6.1.0/templates/NOTES.txt
@@ -1,19 +1,19 @@
-1. Get the application URL by running these commands:
+Get the UI URL by running these commands:
{{- if .Values.ui.ingress.enabled }}
{{- range .Values.ui.ingress.hosts }}
http{{ if $.Values.ui.ingress.tls }}s{{ end }}://{{ . }}{{ $.Values.ui.ingress.path }}
{{- end }}
{{- else if contains "NodePort" .Values.ui.service.type }}
- export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "skywalking.fullname" . }})
+ export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "skywalking.ui.fullname" . }})
export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
echo http://$NODE_IP:$NODE_PORT
{{- else if contains "LoadBalancer" .Values.ui.service.type }}
NOTE: It may take a few minutes for the LoadBalancer IP to be available.
- You can watch the status of by running 'kubectl get svc -w {{ include "skywalking.fullname" . }}'
- export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "skywalking.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
- echo http://$SERVICE_IP:{{ .Values.service.port }}
+ You can watch the status of by running 'kubectl get svc -w {{ include "skywalking.ui.fullname" . }} -n {{ .Release.Namespace }}'
+ export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "skywalking.ui.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+ echo http://$SERVICE_IP:{{ .Values.ui.service.externalPort }}
{{- else if contains "ClusterIP" .Values.ui.service.type }}
- export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ include "skywalking.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+ export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "skywalking.name" . }},release={{ .Release.Name }},component={{ .Values.ui.name }}" -o jsonpath="{.items[0].metadata.name}")
echo "Visit http://127.0.0.1:8080 to use your application"
- kubectl port-forward $POD_NAME 8080:80
+ kubectl port-forward $POD_NAME 8080:{{ .Values.ui.service.internalPort }}
{{- end }}
diff --git a/helm-chart/6.1.0/templates/_helpers.tpl b/helm-chart/6.1.0/templates/_helpers.tpl
new file mode 100644
index 0000000..49657be
--- /dev/null
+++ b/helm-chart/6.1.0/templates/_helpers.tpl
@@ -0,0 +1,61 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "skywalking.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "skywalking.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified oap name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "skywalking.oap.fullname" -}}
+{{ template "skywalking.fullname" . }}-{{ .Values.oap.name }}
+{{- end -}}
+
+{{/*
+Create a default fully qualified ui name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "skywalking.ui.fullname" -}}
+{{ template "skywalking.fullname" . }}-{{ .Values.ui.name }}
+{{- end -}}
+
+{{/*
+Create the name of the service account to use for the oap cluster
+*/}}
+{{- define "skywalking.serviceAccountName.oap" -}}
+{{ default (include "skywalking.oap.fullname" .) .Values.serviceAccounts.oap }}
+{{- end -}}
+
+{{- define "call-nested" }}
+{{- $dot := index . 0 }}
+{{- $subchart := index . 1 }}
+{{- $template := index . 2 }}
+{{- include $template (dict "Chart" (dict "Name" $subchart) "Values" (index $dot.Values $subchart) "Release" $dot.Release "Capabilities" $dot.Capabilities) }}
+{{- end }}
+
+{{- define "skywalking.containers.wait-for-es" -}}
+- name: wait-for-elasticsearch
+ image: busybox:1.30
+ imagePullPolicy: IfNotPresent
+ command: ['sh', '-c', 'for i in $(seq 1 60); do nc -z -w3 {{ include "call-nested" (list . "elasticsearch" "elasticsearch.client.fullname") }} 9200 && exit 0 || sleep 5; done; exit 1']
+{{- end -}}
diff --git a/helm-chart/6.1.0/templates/es-init.job.yaml b/helm-chart/6.1.0/templates/es-init.job.yaml
new file mode 100644
index 0000000..983a002
--- /dev/null
+++ b/helm-chart/6.1.0/templates/es-init.job.yaml
@@ -0,0 +1,38 @@
+# https://docs.sentry.io/server/installation/docker/#running-migrations
+apiVersion: batch/v1
+kind: Job
+metadata:
+ name: "{{ .Release.Name }}-es-init"
+ labels:
+ app: {{ template "skywalking.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+ component: "{{ template "skywalking.fullname" . }}-job"
+ heritage: {{ .Release.Service }}
+ release: {{ .Release.Name }}
+spec:
+ template:
+ metadata:
+ name: "{{ .Release.Name }}-es-init"
+ labels:
+ app: {{ template "skywalking.name" . }}
+ component: "{{ template "skywalking.fullname" . }}-job"
+ release: {{ .Release.Name }}
+ spec:
+ restartPolicy: Never
+ initContainers:
+ {{- include "skywalking.containers.wait-for-es" . | nindent 6 }}
+ containers:
+ - name: {{ .Values.oap.name }}
+ image: "{{ .Values.oap.image.repository }}:{{ .Values.oap.image.tag }}"
+ imagePullPolicy: {{ .Values.oap.image.pullPolicy }}
+{{- if .Values.oap.resources }}
+ resources:
+{{ toYaml .Values.oap.resources | indent 10 }}
+{{- end }}
+ env:
+ - name: JAVA_OPTS
+ value: "{{ .Values.oap.javaOpts }} -Dmode=init"
+ - name: SW_STORAGE
+ value: elasticsearch
+ - name: SW_STORAGE_ES_CLUSTER_NODES
+ value: "{{ include "call-nested" (list . "elasticsearch" "elasticsearch.client.fullname") }}:9200"
diff --git a/helm-chart/6.1.0/templates/oap-deployment.yaml b/helm-chart/6.1.0/templates/oap-deployment.yaml
new file mode 100644
index 0000000..ecc7436
--- /dev/null
+++ b/helm-chart/6.1.0/templates/oap-deployment.yaml
@@ -0,0 +1,99 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ labels:
+ app: {{ template "skywalking.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+ component: "{{ .Values.oap.name }}"
+ heritage: {{ .Release.Service }}
+ release: {{ .Release.Name }}
+ name: {{ template "skywalking.oap.fullname" . }}
+spec:
+ replicas: {{ .Values.oap.replicas }}
+ selector:
+ matchLabels:
+ app: {{ template "skywalking.name" . }}
+ component: "{{ .Values.oap.name }}"
+ release: {{ .Release.Name }}
+ template:
+ metadata:
+ labels:
+ app: {{ template "skywalking.name" . }}
+ component: "{{ .Values.oap.name }}"
+ release: {{ .Release.Name }}
+ {{- if .Values.oap.podAnnotations }}
+ annotations:
+{{ toYaml .Values.oap.podAnnotations | indent 8 }}
+ {{- end }}
+ spec:
+ serviceAccountName: {{ template "skywalking.serviceAccountName.oap" . }}
+ affinity:
+ {{- if eq .Values.oap.antiAffinity "hard" }}
+ podAntiAffinity:
+ requiredDuringSchedulingIgnoredDuringExecution:
+ - topologyKey: "kubernetes.io/hostname"
+ labelSelector:
+ matchLabels:
+ app: "{{ template "skywalking.name" . }}"
+ release: "{{ .Release.Name }}"
+ component: "{{ .Values.oap.name }}"
+ {{- else if eq .Values.oap.antiAffinity "soft" }}
+ podAntiAffinity:
+ preferredDuringSchedulingIgnoredDuringExecution:
+ - weight: 1
+ podAffinityTerm:
+ topologyKey: kubernetes.io/hostname
+ labelSelector:
+ matchLabels:
+ app: "{{ template "skywalking.name" . }}"
+ release: "{{ .Release.Name }}"
+ component: "{{ .Values.oap.name }}"
+ {{- end }}
+ {{- with .Values.oap.nodeAffinity }}
+ nodeAffinity:
+{{ toYaml . | indent 10 }}
+ {{- end }}
+{{- if .Values.oap.nodeSelector }}
+ nodeSelector:
+{{ toYaml .Values.oap.nodeSelector | indent 8 }}
+{{- end }}
+{{- if .Values.oap.tolerations }}
+ tolerations:
+{{ toYaml .Values.oap.tolerations | indent 8 }}
+{{- end }}
+ initContainers:
+ {{- include "skywalking.containers.wait-for-es" . | nindent 6 }}
+ containers:
+ - name: {{ .Values.oap.name }}
+ image: "{{ .Values.oap.image.repository }}:{{ .Values.oap.image.tag }}"
+ imagePullPolicy: {{ .Values.oap.image.pullPolicy }}
+ ports:
+ - containerPort: 11800
+ name: grpc
+ - containerPort: 12800
+ name: rest
+{{- if .Values.oap.resources }}
+ resources:
+{{ toYaml .Values.oap.resources | indent 10 }}
+{{- end }}
+ env:
+ - name: JAVA_OPTS
+ value: "{{ .Values.oap.javaOpts }} -Dmode=no-init"
+ - name: SW_CLUSTER
+ value: kubernetes
+ - name: SW_CLUSTER_K8S_NAMESPACE
+ value: "{{ .Release.Namespace }}"
+ - name: SW_CLUSTER_K8S_LABEL
+ value: "app={{ template "skywalking.name" . }},release={{ .Release.Name }},component={{ .Values.oap.name }}"
+ - name: SKYWALKING_COLLECTOR_UID
+ valueFrom:
+ fieldRef:
+ fieldPath: metadata.uid
+ - name: SW_STORAGE
+ value: elasticsearch
+ - name: SW_STORAGE_ES_CLUSTER_NODES
+ value: "{{ include "call-nested" (list . "elasticsearch" "elasticsearch.client.fullname") }}:9200"
+ {{- range $key, $value := .Values.oap.env }}
+ - name: {{ $key }}
+ value: {{ $value | quote }}
+ {{- end }}
diff --git a/helm-chart/6.1.0/templates/oap-role.yaml b/helm-chart/6.1.0/templates/oap-role.yaml
new file mode 100644
index 0000000..a867072
--- /dev/null
+++ b/helm-chart/6.1.0/templates/oap-role.yaml
@@ -0,0 +1,13 @@
+kind: Role
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+ name: {{ template "skywalking.fullname" . }}
+ labels:
+ app: {{ template "skywalking.name" . }}
+ chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+ release: "{{ .Release.Name }}"
+ heritage: "{{ .Release.Service }}"
+rules:
+- apiGroups: [""]
+ resources: ["pods"]
+ verbs: ["get", "watch", "list"]
diff --git a/helm-chart/6.1.0/templates/oap-rolebinding.yaml b/helm-chart/6.1.0/templates/oap-rolebinding.yaml
new file mode 100644
index 0000000..e3894fe
--- /dev/null
+++ b/helm-chart/6.1.0/templates/oap-rolebinding.yaml
@@ -0,0 +1,17 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+ name: {{ template "skywalking.fullname" . }}
+ labels:
+ app: {{ template "skywalking.name" . }}
+ chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+ release: "{{ .Release.Name }}"
+ heritage: "{{ .Release.Service }}"
+roleRef:
+ apiGroup: rbac.authorization.k8s.io
+ kind: Role
+ name: {{ template "skywalking.fullname" . }}
+subjects:
+- kind: ServiceAccount
+ name: {{ template "skywalking.serviceAccountName.oap" . }}
+ namespace: {{ .Release.Namespace }}
diff --git a/helm-chart/6.1.0/templates/oap-serviceaccount.yaml b/helm-chart/6.1.0/templates/oap-serviceaccount.yaml
new file mode 100644
index 0000000..702a50f
--- /dev/null
+++ b/helm-chart/6.1.0/templates/oap-serviceaccount.yaml
@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+ labels:
+ app: {{ template "skywalking.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+ component: "{{ .Values.oap.name }}"
+ heritage: {{ .Release.Service }}
+ release: {{ .Release.Name }}
+ name: {{ template "skywalking.serviceAccountName.oap" . }}
diff --git a/helm-chart/6.1.0/templates/oap-svc.yaml b/helm-chart/6.1.0/templates/oap-svc.yaml
new file mode 100644
index 0000000..f7a7d6e
--- /dev/null
+++ b/helm-chart/6.1.0/templates/oap-svc.yaml
@@ -0,0 +1,21 @@
+apiVersion: v1
+kind: Service
+metadata:
+ name: {{ template "skywalking.oap.fullname" . }}
+ labels:
+ app: {{ template "skywalking.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+ component: "{{ .Values.oap.name }}"
+ heritage: {{ .Release.Service }}
+ release: {{ .Release.Name }}
+spec:
+ type: {{ .Values.oap.service.type }}
+ ports:
+ - port: {{ .Values.oap.ports.rest }}
+ name: rest
+ - port: {{ .Values.oap.ports.grpc }}
+ name: grpc
+ selector:
+ app: {{ template "skywalking.name" . }}
+ component: "{{ .Values.oap.name }}"
+ release: {{ .Release.Name }}
diff --git a/helm-chart/6.1.0/templates/ui-deployment.yaml b/helm-chart/6.1.0/templates/ui-deployment.yaml
new file mode 100644
index 0000000..a8a6ee8
--- /dev/null
+++ b/helm-chart/6.1.0/templates/ui-deployment.yaml
@@ -0,0 +1,42 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: {{ template "skywalking.ui.fullname" . }}
+ labels:
+ app: {{ template "skywalking.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+ component: "{{ .Values.ui.name }}"
+ heritage: {{ .Release.Service }}
+ release: {{ .Release.Name }}
+spec:
+ replicas: {{ .Values.ui.replicas }}
+ selector:
+ matchLabels:
+ app: {{ template "skywalking.name" . }}
+ component: "{{ .Values.ui.name }}"
+ release: {{ .Release.Name }}
+ template:
+ metadata:
+ labels:
+ app: {{ template "skywalking.name" . }}
+ component: "{{ .Values.ui.name }}"
+ release: {{ .Release.Name }}
+ {{- if .Values.ui.podAnnotations }}
+ annotations:
+{{ toYaml .Values.ui.podAnnotations | indent 8 }}
+ {{- end }}
+ spec:
+ containers:
+ - name: {{ .Values.ui.name }}
+ image: {{ .Values.ui.image.repository }}:{{ .Values.ui.image.tag }}
+ imagePullPolicy: {{ .Values.ui.image.pullPolicy }}
+ ports:
+ - containerPort: {{ .Values.ui.service.internalPort }}
+ name: page
+{{- if .Values.ui.resources }}
+ resources:
+{{ toYaml .Values.ui.resources | indent 10 }}
+{{- end }}
+ env:
+ - name: SW_OAP_ADDRESS
+ value: {{ template "skywalking.oap.fullname" . }}:{{ .Values.oap.ports.rest }}
diff --git a/helm-chart/6.1.0/templates/ui-ingress.yaml b/helm-chart/6.1.0/templates/ui-ingress.yaml
new file mode 100644
index 0000000..406a48b
--- /dev/null
+++ b/helm-chart/6.1.0/templates/ui-ingress.yaml
@@ -0,0 +1,34 @@
+{{- if .Values.ui.ingress.enabled -}}
+{{- $serviceName := include "skywalking.ui.fullname" . -}}
+{{- $servicePort := .Values.ui.service.externalPort -}}
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+ labels:
+ app: {{ template "skywalking.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+ component: "{{ .Values.ui.name }}"
+ heritage: {{ .Release.Service }}
+ release: {{ .Release.Name }}
+ name: {{ template "skywalking.ui.fullname" . }}
+ annotations:
+ {{- range $key, $value := .Values.ui.ingress.annotations }}
+ {{ $key }}: {{ $value | quote }}
+ {{- end }}
+spec:
+ rules:
+ {{- range .Values.ui.ingress.hosts }}
+ {{- $url := splitList "/" . }}
+ - host: {{ first $url }}
+ http:
+ paths:
+ - path: /{{ rest $url | join "/" }}
+ backend:
+ serviceName: {{ $serviceName }}
+ servicePort: {{ $servicePort }}
+ {{- end -}}
+ {{- if .Values.ui.ingress.tls }}
+ tls:
+{{ toYaml .Values.ui.ingress.tls | indent 4 }}
+ {{- end -}}
+{{- end -}}
diff --git a/helm-chart/6.1.0/templates/ui-svc.yaml b/helm-chart/6.1.0/templates/ui-svc.yaml
new file mode 100644
index 0000000..fb727aa
--- /dev/null
+++ b/helm-chart/6.1.0/templates/ui-svc.yaml
@@ -0,0 +1,48 @@
+apiVersion: v1
+kind: Service
+metadata:
+ labels:
+ app: {{ template "skywalking.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+ component: "{{ .Values.ui.name }}"
+ heritage: {{ .Release.Service }}
+ release: {{ .Release.Name }}
+ name: {{ template "skywalking.ui.fullname" . }}
+ {{- with .Values.ui.service.annotations }}
+ annotations:
+ {{- range $key, $value := . }}
+ {{ $key }}: {{ $value | quote }}
+ {{- end }}
+ {{- end }}
+spec:
+ {{- if .Values.ui.service.loadBalancerSourceRanges }}
+ loadBalancerSourceRanges:
+ {{- range $cidr := .Values.ui.service.loadBalancerSourceRanges }}
+ - {{ $cidr }}
+ {{- end }}
+ {{- end }}
+ type: {{ .Values.ui.service.type }}
+ {{- if and (eq .Values.ui.service.type "ClusterIP") .Values.ui.service.clusterIP }}
+ clusterIP: {{ .Values.ui.service.clusterIP }}
+ {{- end }}
+ ports:
+ - port: {{ .Values.ui.service.externalPort }}
+ targetPort: {{ .Values.ui.service.internalPort }}
+ protocol: TCP
+{{ if (and (eq .Values.ui.service.type "NodePort") (not (empty .Values.ui.service.nodePort))) }}
+ nodePort: {{ .Values.ui.service.nodePort }}
+{{ end }}
+{{- if .Values.ui.service.portName }}
+ name: {{ .Values.ui.service.portName }}
+{{- end }}
+{{- if .Values.ui.service.externalIPs }}
+ externalIPs:
+{{ toYaml .Values.ui.service.externalIPs | indent 4 }}
+{{- end }}
+ selector:
+ app: {{ template "skywalking.name" . }}
+ component: "{{ .Values.ui.name }}"
+ release: {{ .Release.Name }}
+{{- if .Values.ui.service.loadBalancerIP }}
+ loadBalancerIP: {{ .Values.ui.service.loadBalancerIP }}
+{{- end }}
diff --git a/helm-chart/6.1.0/values.yaml b/helm-chart/6.1.0/values.yaml
new file mode 100644
index 0000000..0864e69
--- /dev/null
+++ b/helm-chart/6.1.0/values.yaml
@@ -0,0 +1,82 @@
+# 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: ""
[skywalking-kubernetes] 30/48: add README.md,
ui-ingress.yaml for charts (#13)
Posted by in...@apache.org.
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 3a69b01a4960eed4647ff7ea4473942d938d9561
Author: innerpeacez <37...@users.noreply.github.com>
AuthorDate: Wed Jun 26 08:26:54 2019 +0800
add README.md,ui-ingress.yaml for charts (#13)
* add README.md,ui-ingress.yaml for charts
* configmap name and port
* Join the TZ environment variable
* TZ to UTC-0
---
helm/charts/6/6.0.0-GA/skywalking/README.md | 133 +++++++++++++++++++++
.../skywalking/templates/oap/oap-deployment.yaml | 2 +
.../skywalking/templates/ui/ui-deployment.yaml | 2 +
.../skywalking/templates/ui/ui-ingress.yaml | 35 ++++++
helm/charts/6/6.0.0-GA/skywalking/values.yaml | 10 +-
5 files changed, 176 insertions(+), 6 deletions(-)
diff --git a/helm/charts/6/6.0.0-GA/skywalking/README.md b/helm/charts/6/6.0.0-GA/skywalking/README.md
new file mode 100644
index 0000000..fb8d213
--- /dev/null
+++ b/helm/charts/6/6.0.0-GA/skywalking/README.md
@@ -0,0 +1,133 @@
+# Skywalking Helm Charts
+
+[Apache SkyWalking](https://skywalking.apache.org/) is application performance monitor tool for distributed systems, especially designed for microservices, cloud native and container-based (Docker, K8s, Mesos) architectures.
+
+## Introduction
+
+This chart bootstraps a [Apache SkyWalking](https://skywalking.apache.org/) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager.
+
+## Prerequisites
+
+- Kubernetes 1.9.6+
+
+## Installing the Chart
+
+To install the chart with the release name `my-release`:
+
+```console
+$ helm install --name my-release skywalking
+```
+
+The command deploys Skywalking on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation.
+
+> **Tip**: List all releases using `helm list`
+
+## Uninstalling the Chart
+
+To uninstall/delete the `my-release` deployment:
+
+```console
+$ helm delete my-release
+```
+
+The command removes all the Kubernetes components associated with the chart and deletes the release.
+
+## Configuration
+
+The following table lists the configurable parameters of the Skywalking chart and their default values.
+
+Parameter | Description | Default
+--------- | ----------- | -------
+`elasticsearch.name` | ES statefulset name | `skywalking-elasticsearch`
+ `elasticsearch.replicas` | ES k8s statefulset replicas | `3`
+`elasticsearch.image.repository` | ES container image name | `docker.elastic.co/elasticsearch/elasticsearch-oss`
+`elasticsearch.image.tag` | ES container image tag | `6.3.2`
+`elasticsearch.image.pullPolicy` | ES container image pull policy | `IfNotPresent`
+`elasticsearch.ports.http` | Expose http port 9200 on es Pods for skywalking-oap | `9200`
+`elasticsearch.ports.tcp` | Expose tcp port 9300 on es Pods | `9300`
+`elasticsearch.env.esJavaOpts` | Parameters to be added to `ES_JAVA_OPTS`environment variable for ES | `"-Xms4g -Xmx4g"`
+`elasticsearch.resources` | ES node resources requests & limits | `requests.memory=8Gi，limits.memory=16Gi - cpu limit must be an integer`
+`elasticsearch.persistence.enabled` | ES persistent enabled/disabled | `true`
+`elasticsearch.persistence.storageClass` | ES persistent volume Class | `fast`
+`elasticsearch.persistence.accessMode` | Master persistent Access Mode | `ReadWriteOnce`
+ `elasticsearch.persistence.size` | Master persistent Access size | `30Gi`
+`elasticsearch.terminationGracePeriodSeconds` | ES termination grace period (seconds) | `300`
+`oap.name` | OAP deployment name | `skywalking-oap`
+`oap.image.repository` | OAP container image name | `apache/skywalking-oap-server`
+`oap.image.tag` | OAP container image tag | `6.0.0-GA`
+`oap.image.pullPolicy` | OAP container image pull policy | `IfNotPresent`
+`oap.ports.grpc` | OAP grpc port for tracing or metric | `11800`
+`oap.ports.rest` | OAP http port for Web UI | `12800`
+`oap.replicas` | OAP k8s deployment replicas | `3`
+`oap.service.type` | OAP svc type | `ClusterIP`
+`oap.env.javaOpts` | Parameters to be added to `JAVA_OPTS`environment variable for OAP | `-Xms256M -Xmx512M`
+`oap.resources` | OAP node resources requests & limits | `requests.memory=1Gi，limits.memory=2Gi - cpu limit must be an integer`
+`ui.name` | Web UI deployment name | `skywalking-ui`
+`ui.replicas` | Web UI k8s deployment replicas | `1`
+`ui.image.repository` | Web UI container image name | `apache/skywalking-ui`
+`ui.image.tag` | Web UI container image tag | `6.0.0-GA`
+ `ui.image.pullPolicy` | Web UI container image pull policy | `IfNotPresent`
+`ui.ports.page` | Web UI http port | `8080`
+`ui.ingress.enabled` | Create Ingress for Skywalking Web UI | `false`
+`ui.ingress.annotations` | Associate annotations to the Ingress | `{}`
+`ui.ingress.path` | Associate hosts with the Ingress | `/`
+`ui.ingress.hosts` | Associate hosts with the Ingress | `[]`
+`ui.ingress.tls` | Associate TLS with the Ingress | `[]`
+ `ui.service.type` | Web UI svc type | `NodePort`
+ `ui.resources` | Web UI node resources requests & limits | `requests.memory=8Gi，limits.memory=16Gi - cpu limit must be an integer`
+ `TZ` | Time zone configuration to OAP and Web UI | `UTC+0`
+
+Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
+
+```console
+$ helm install skywalking --name=myrelease --set elasticsearch.terminationGracePeriodSeconds=360
+```
+
+Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example,
+
+```console
+$ helm install skywalking --name my-release -f values.yaml
+```
+
+> **Tip**: You can use the default [values.yaml](values.yaml)
+
+### RBAC Configuration
+Roles and RoleBindings resources will be created automatically for `OAP` .
+
+> **Tip**: You can refer to the default `oap-role.yaml` file in [templates](templates/) to customize your own.
+
+### ConfigMap Files
+Skywalking is configured through [oap-config.yaml](oap-config.yaml). This file (and any others listed in `Files`) will be mounted into the `skywalking-oap` pod.
+
+### Ingress TLS
+If your cluster allows automatic create/retrieve of TLS certificates (e.g. [kube-lego](https://github.com/jetstack/kube-lego)), please refer to the documentation for that mechanism.
+
+To manually configure TLS, first create/retrieve a key & certificate pair for the address(skywalking ui) you wish to protect. Then create a TLS secret in the namespace:
+
+```console
+kubectl create secret tls skywalking-ui-server-tls --cert=path/to/tls.cert --key=path/to/tls.key
+```
+
+Include the secret's name, along with the desired hostnames, in the skywalking-ui Ingress TLS section of your custom `values.yaml` file:
+
+```yaml
+ui:
+ ingress:
+ ## If true, Skywalking ui server Ingress will be created
+ ##
+ enabled: true
+
+ ## Skywalking ui server Ingress hostnames
+ ## Must be provided if Ingress is enabled
+ ##
+ hosts:
+ - skywalking.domain.com
+
+ ## Skywalking ui server Ingress TLS configuration
+ ## Secrets must be manually created in the namespace
+ ##
+ tls:
+ - secretName: skywalking-ui-server-tls
+ hosts:
+ - skywalking.domain.com
+```
diff --git a/helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-deployment.yaml b/helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-deployment.yaml
index 611379f..131f5b1 100644
--- a/helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-deployment.yaml
+++ b/helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-deployment.yaml
@@ -51,6 +51,8 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.uid
+ - name: TZ
+ value: {{ .Values.TZ }}
volumeMounts:
- name: config
mountPath: /skywalking/config
diff --git a/helm/charts/6/6.0.0-GA/skywalking/templates/ui/ui-deployment.yaml b/helm/charts/6/6.0.0-GA/skywalking/templates/ui/ui-deployment.yaml
index 2c0b637..74ccd8b 100644
--- a/helm/charts/6/6.0.0-GA/skywalking/templates/ui/ui-deployment.yaml
+++ b/helm/charts/6/6.0.0-GA/skywalking/templates/ui/ui-deployment.yaml
@@ -44,3 +44,5 @@ spec:
env:
- name: collector.ribbon.listOfServers
value: {{ .Values.oap.name }}:{{ .Values.oap.ports.rest }}
+ - name: TZ
+ value: {{ .Values.TZ }}
diff --git a/helm/charts/6/6.0.0-GA/skywalking/templates/ui/ui-ingress.yaml b/helm/charts/6/6.0.0-GA/skywalking/templates/ui/ui-ingress.yaml
new file mode 100644
index 0000000..3b85702
--- /dev/null
+++ b/helm/charts/6/6.0.0-GA/skywalking/templates/ui/ui-ingress.yaml
@@ -0,0 +1,35 @@
+{{- if .Values.ui.ingress.enabled -}}
+{{- $fullName := include "skywalking.fullname" . -}}
+{{- $ingressPath := .Values.ui.ingress.path -}}
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+ name: {{ $fullName }}-ui
+ labels:
+ app: {{ include "skywalking.name" . }}-ui
+{{- with .Values.ui.ingress.annotations }}
+ annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
+spec:
+{{- if .Values.ui.ingress.tls }}
+ tls:
+ {{- range .Values.ui.ingress.tls }}
+ - hosts:
+ {{- range .hosts }}
+ - {{ . | quote }}
+ {{- end }}
+ secretName: {{ .secretName }}
+ {{- end }}
+{{- end }}
+ rules:
+ {{- range .Values.ui.ingress.hosts }}
+ - host: {{ . | quote }}
+ http:
+ paths:
+ - path: {{ $ingressPath }}
+ backend:
+ serviceName: {{ $fullName }}-ui
+ servicePort: {{ .Values.ui.ports.page }}
+ {{- end }}
+{{- end }}
diff --git a/helm/charts/6/6.0.0-GA/skywalking/values.yaml b/helm/charts/6/6.0.0-GA/skywalking/values.yaml
index 27604d9..c860f42 100644
--- a/helm/charts/6/6.0.0-GA/skywalking/values.yaml
+++ b/helm/charts/6/6.0.0-GA/skywalking/values.yaml
@@ -85,12 +85,12 @@ ui:
# kubernetes.io/ingress.class: nginx
# kubernetes.io/tls-acme: "true"
path: /
- hosts:
- - chart-example.local
+ hosts: []
+ # - skywalking.domain.com
tls: []
# - secretName: chart-example-tls
# hosts:
- # - chart-example.local
+ # - skywalking.domain.com
service:
type: NodePort
port: 80
@@ -106,6 +106,4 @@ ui:
# cpu: 100m
memory: 1Gi
-
-nameOverride: ""
-fullnameOverride: ""
+TZ: UTC-0
\ No newline at end of file
[skywalking-kubernetes] 19/48: Merge pull request #6 from
wayilau/master
Posted by in...@apache.org.
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 d620ceae3fc47ca680d6391655c3f331a84943a2
Merge: 59b5ed5 9ee4dcf
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Tue Mar 19 14:31:45 2019 +0800
Merge pull request #6 from wayilau/master
Modify metrictemplete to metrictemplate
.../istio/01-metrictemplete.yml => 6.0.0-GA/istio/01-metrictemplate.yml} | 0
6/6.0.0-alpha/istio/{01-metrictemplete.yml => 01-metrictemplate.yml} | 0
.../01-metrictemplete.yml => 6.0.0-beta/istio/01-metrictemplate.yml} | 0
3 files changed, 0 insertions(+), 0 deletions(-)
[skywalking-kubernetes] 03/48: Update 01-storageclass.yml
Posted by in...@apache.org.
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 b0e91a6cf790be7d7cb7d9c06c4c53ded1aa58ef
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Mon Nov 5 14:51:16 2018 +0800
Update 01-storageclass.yml
Make configuration more general by deleting zone parameter
---
scripts/elasticsearch/01-storageclass.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/elasticsearch/01-storageclass.yml b/scripts/elasticsearch/01-storageclass.yml
index b34e294..8082b44 100644
--- a/scripts/elasticsearch/01-storageclass.yml
+++ b/scripts/elasticsearch/01-storageclass.yml
@@ -22,4 +22,4 @@ metadata:
provisioner: kubernetes.io/gce-pd
parameters:
type: pd-ssd
- zone: us-west1-a
\ No newline at end of file
+
[skywalking-kubernetes] 40/48: logo for chart
Posted by in...@apache.org.
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 81c5699157f4174395922113459d2b1b61d1d9e6
Author: innerpeacez <in...@gmail.com>
AuthorDate: Tue Oct 8 16:22:20 2019 +0800
logo for chart
---
logo/sw-logo-for-chart.jpg | Bin 0 -> 7080 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/logo/sw-logo-for-chart.jpg b/logo/sw-logo-for-chart.jpg
new file mode 100644
index 0000000..1455612
Binary files /dev/null and b/logo/sw-logo-for-chart.jpg differ
[skywalking-kubernetes] 32/48: Update README.md
Posted by in...@apache.org.
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 cfb6bf72b033e4297e3ce0e8f317226c7d79506f
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Wed Jun 26 09:05:38 2019 +0800
Update README.md
---
README.md | 36 ++++++----------------
.../6/6.0.0-GA}/elasticsearch/01-storageclass.yml | 0
.../6/6.0.0-GA}/elasticsearch/02-service.yml | 0
.../6/6.0.0-GA}/elasticsearch/03-statefulset.yml | 0
.../6/6.0.0-GA}/istio/01-metrictemplate.yml | 0
.../6/6.0.0-GA}/istio/02-skywalingadapter.yml | 0
.../6/6.0.0-GA}/istio/03-operator_cfg.yml | 0
{6 => archive/6}/6.0.0-GA/istio/README.md | 0
{6 => archive/6}/6.0.0-GA/namespace.yml | 0
.../6/6.0.0-GA}/oap/00-rbac.yml | 0
{6 => archive/6}/6.0.0-GA/oap/01-config.yml | 0
.../6/6.0.0-GA}/oap/02-service.yml | 0
{6 => archive/6}/6.0.0-GA/oap/03-deployment.yml | 0
.../6/6.0.0-GA}/ui/01-service.yml | 0
{6 => archive/6}/6.0.0-GA/ui/02-deployment.yml | 0
.../6.0.0-alpha/elasticsearch/01-storageclass.yml | 0
.../6}/6.0.0-alpha/elasticsearch/02-service.yml | 0
.../6.0.0-alpha/elasticsearch/03-statefulset.yml | 0
.../6}/6.0.0-alpha/istio/01-metrictemplate.yml | 0
.../6}/6.0.0-alpha/istio/02-skywalingadapter.yml | 0
.../6}/6.0.0-alpha/istio/03-operator_cfg.yml | 0
.../6/6.0.0-alpha}/namespace.yml | 0
{6 => archive/6}/6.0.0-alpha/oap/00-rbac.yml | 0
.../6/6.0.0-alpha}/oap/01-config.yml | 0
{6 => archive/6}/6.0.0-alpha/oap/02-service.yml | 0
{6 => archive/6}/6.0.0-alpha/oap/03-deployment.yml | 0
{6 => archive/6}/6.0.0-alpha/ui/01-service.yml | 0
{6 => archive/6}/6.0.0-alpha/ui/02-deployment.yml | 0
.../6.0.0-beta}/elasticsearch/01-storageclass.yml | 0
.../6/6.0.0-beta}/elasticsearch/02-service.yml | 0
.../6/6.0.0-beta}/elasticsearch/03-statefulset.yml | 0
.../6/6.0.0-beta}/istio/01-metrictemplate.yml | 0
.../6/6.0.0-beta}/istio/02-skywalingadapter.yml | 0
.../6/6.0.0-beta}/istio/03-operator_cfg.yml | 0
.../6/6.0.0-beta}/namespace.yml | 0
.../6/6.0.0-beta}/oap/00-rbac.yml | 0
.../6/6.0.0-beta}/oap/01-config.yml | 0
.../6/6.0.0-beta}/oap/02-service.yml | 0
{6 => archive/6}/6.0.0-beta/oap/03-deployment.yml | 0
.../6/6.0.0-beta}/ui/01-service.yml | 0
{6 => archive/6}/6.0.0-beta/ui/02-deployment.yml | 0
README.md => archive/README.md | 0
42 files changed, 9 insertions(+), 27 deletions(-)
diff --git a/README.md b/README.md
index 3de54c8..d3bcc17 100644
--- a/README.md
+++ b/README.md
@@ -5,36 +5,18 @@ Apache SkyWalking Kubernetes
To install and configure skywalking in a Kubernetes cluster, follow these instructions.
-## Prerequisites
+## Structure of repository
-Please promise the `skywalking` namespace existed in the cluster, otherwise, create a new one.
+### archive
-`kubectl apply -f namespace.yml`
+Prior to 6.0.0-GA, only kubernetes YAMLs as examples for users and should be modified to fix real kuberentes enviroment,
+for instance, resources, volume claims.
-## Deploy Elasticsearch
+Now, these YAMLs are archived in the repository, that means we never maintain them, but users still could use them.
-Use `kubectl apply -f ` with the scripts in `elasticsearch` to deploy elasticsearch servers
-in the cluster.
+We recommend using __helm-chart__ as your first choice.
-> `01-storageclass.yml` assume to use GKE as the kubernetes provisioner. You could fix it according
-to your kubernetes environment.
+### helm-chart
-## Deploy OAP server
-
-Use `kubectl apply -f ` with the scripts in `oap` to deploy oap server
-in the cluster.
-
-## Deploy UI server
-
-Use `kubectl apply -f ` with the scripts in `ui` to deploy oap server
-in the cluster.
-
-# Setup Istio to send metric to oap
-
-## Prerequisites
-
-Istio should be installed in kubernetes cluster.
-
-## Setup Istio to send metric to oap
-
-Use `kubectl apply -f ` with the scripts in `istio` to setup.
+This is recommended as the best practice to deploy SkyWalking backend stack into kubernetes cluster. You can pick a
+ sub folder base on version your desired version.
diff --git a/6/6.0.0-beta/elasticsearch/01-storageclass.yml b/archive/6/6.0.0-GA/elasticsearch/01-storageclass.yml
similarity index 100%
rename from 6/6.0.0-beta/elasticsearch/01-storageclass.yml
rename to archive/6/6.0.0-GA/elasticsearch/01-storageclass.yml
diff --git a/6/6.0.0-beta/elasticsearch/02-service.yml b/archive/6/6.0.0-GA/elasticsearch/02-service.yml
similarity index 100%
rename from 6/6.0.0-beta/elasticsearch/02-service.yml
rename to archive/6/6.0.0-GA/elasticsearch/02-service.yml
diff --git a/6/6.0.0-beta/elasticsearch/03-statefulset.yml b/archive/6/6.0.0-GA/elasticsearch/03-statefulset.yml
similarity index 100%
rename from 6/6.0.0-beta/elasticsearch/03-statefulset.yml
rename to archive/6/6.0.0-GA/elasticsearch/03-statefulset.yml
diff --git a/6/6.0.0-beta/istio/01-metrictemplate.yml b/archive/6/6.0.0-GA/istio/01-metrictemplate.yml
similarity index 100%
rename from 6/6.0.0-beta/istio/01-metrictemplate.yml
rename to archive/6/6.0.0-GA/istio/01-metrictemplate.yml
diff --git a/6/6.0.0-beta/istio/02-skywalingadapter.yml b/archive/6/6.0.0-GA/istio/02-skywalingadapter.yml
similarity index 100%
rename from 6/6.0.0-beta/istio/02-skywalingadapter.yml
rename to archive/6/6.0.0-GA/istio/02-skywalingadapter.yml
diff --git a/6/6.0.0-beta/istio/03-operator_cfg.yml b/archive/6/6.0.0-GA/istio/03-operator_cfg.yml
similarity index 100%
rename from 6/6.0.0-beta/istio/03-operator_cfg.yml
rename to archive/6/6.0.0-GA/istio/03-operator_cfg.yml
diff --git a/6/6.0.0-GA/istio/README.md b/archive/6/6.0.0-GA/istio/README.md
similarity index 100%
rename from 6/6.0.0-GA/istio/README.md
rename to archive/6/6.0.0-GA/istio/README.md
diff --git a/6/6.0.0-GA/namespace.yml b/archive/6/6.0.0-GA/namespace.yml
similarity index 100%
rename from 6/6.0.0-GA/namespace.yml
rename to archive/6/6.0.0-GA/namespace.yml
diff --git a/6/6.0.0-beta/oap/00-rbac.yml b/archive/6/6.0.0-GA/oap/00-rbac.yml
similarity index 100%
rename from 6/6.0.0-beta/oap/00-rbac.yml
rename to archive/6/6.0.0-GA/oap/00-rbac.yml
diff --git a/6/6.0.0-GA/oap/01-config.yml b/archive/6/6.0.0-GA/oap/01-config.yml
similarity index 100%
rename from 6/6.0.0-GA/oap/01-config.yml
rename to archive/6/6.0.0-GA/oap/01-config.yml
diff --git a/6/6.0.0-beta/oap/02-service.yml b/archive/6/6.0.0-GA/oap/02-service.yml
similarity index 100%
rename from 6/6.0.0-beta/oap/02-service.yml
rename to archive/6/6.0.0-GA/oap/02-service.yml
diff --git a/6/6.0.0-GA/oap/03-deployment.yml b/archive/6/6.0.0-GA/oap/03-deployment.yml
similarity index 100%
rename from 6/6.0.0-GA/oap/03-deployment.yml
rename to archive/6/6.0.0-GA/oap/03-deployment.yml
diff --git a/6/6.0.0-beta/ui/01-service.yml b/archive/6/6.0.0-GA/ui/01-service.yml
similarity index 100%
rename from 6/6.0.0-beta/ui/01-service.yml
rename to archive/6/6.0.0-GA/ui/01-service.yml
diff --git a/6/6.0.0-GA/ui/02-deployment.yml b/archive/6/6.0.0-GA/ui/02-deployment.yml
similarity index 100%
rename from 6/6.0.0-GA/ui/02-deployment.yml
rename to archive/6/6.0.0-GA/ui/02-deployment.yml
diff --git a/6/6.0.0-alpha/elasticsearch/01-storageclass.yml b/archive/6/6.0.0-alpha/elasticsearch/01-storageclass.yml
similarity index 100%
rename from 6/6.0.0-alpha/elasticsearch/01-storageclass.yml
rename to archive/6/6.0.0-alpha/elasticsearch/01-storageclass.yml
diff --git a/6/6.0.0-alpha/elasticsearch/02-service.yml b/archive/6/6.0.0-alpha/elasticsearch/02-service.yml
similarity index 100%
rename from 6/6.0.0-alpha/elasticsearch/02-service.yml
rename to archive/6/6.0.0-alpha/elasticsearch/02-service.yml
diff --git a/6/6.0.0-alpha/elasticsearch/03-statefulset.yml b/archive/6/6.0.0-alpha/elasticsearch/03-statefulset.yml
similarity index 100%
rename from 6/6.0.0-alpha/elasticsearch/03-statefulset.yml
rename to archive/6/6.0.0-alpha/elasticsearch/03-statefulset.yml
diff --git a/6/6.0.0-alpha/istio/01-metrictemplate.yml b/archive/6/6.0.0-alpha/istio/01-metrictemplate.yml
similarity index 100%
rename from 6/6.0.0-alpha/istio/01-metrictemplate.yml
rename to archive/6/6.0.0-alpha/istio/01-metrictemplate.yml
diff --git a/6/6.0.0-alpha/istio/02-skywalingadapter.yml b/archive/6/6.0.0-alpha/istio/02-skywalingadapter.yml
similarity index 100%
rename from 6/6.0.0-alpha/istio/02-skywalingadapter.yml
rename to archive/6/6.0.0-alpha/istio/02-skywalingadapter.yml
diff --git a/6/6.0.0-alpha/istio/03-operator_cfg.yml b/archive/6/6.0.0-alpha/istio/03-operator_cfg.yml
similarity index 100%
rename from 6/6.0.0-alpha/istio/03-operator_cfg.yml
rename to archive/6/6.0.0-alpha/istio/03-operator_cfg.yml
diff --git a/6/6.0.0-beta/namespace.yml b/archive/6/6.0.0-alpha/namespace.yml
similarity index 100%
rename from 6/6.0.0-beta/namespace.yml
rename to archive/6/6.0.0-alpha/namespace.yml
diff --git a/6/6.0.0-alpha/oap/00-rbac.yml b/archive/6/6.0.0-alpha/oap/00-rbac.yml
similarity index 100%
rename from 6/6.0.0-alpha/oap/00-rbac.yml
rename to archive/6/6.0.0-alpha/oap/00-rbac.yml
diff --git a/6/6.0.0-beta/oap/01-config.yml b/archive/6/6.0.0-alpha/oap/01-config.yml
similarity index 100%
rename from 6/6.0.0-beta/oap/01-config.yml
rename to archive/6/6.0.0-alpha/oap/01-config.yml
diff --git a/6/6.0.0-alpha/oap/02-service.yml b/archive/6/6.0.0-alpha/oap/02-service.yml
similarity index 100%
rename from 6/6.0.0-alpha/oap/02-service.yml
rename to archive/6/6.0.0-alpha/oap/02-service.yml
diff --git a/6/6.0.0-alpha/oap/03-deployment.yml b/archive/6/6.0.0-alpha/oap/03-deployment.yml
similarity index 100%
rename from 6/6.0.0-alpha/oap/03-deployment.yml
rename to archive/6/6.0.0-alpha/oap/03-deployment.yml
diff --git a/6/6.0.0-alpha/ui/01-service.yml b/archive/6/6.0.0-alpha/ui/01-service.yml
similarity index 100%
rename from 6/6.0.0-alpha/ui/01-service.yml
rename to archive/6/6.0.0-alpha/ui/01-service.yml
diff --git a/6/6.0.0-alpha/ui/02-deployment.yml b/archive/6/6.0.0-alpha/ui/02-deployment.yml
similarity index 100%
rename from 6/6.0.0-alpha/ui/02-deployment.yml
rename to archive/6/6.0.0-alpha/ui/02-deployment.yml
diff --git a/6/6.0.0-GA/elasticsearch/01-storageclass.yml b/archive/6/6.0.0-beta/elasticsearch/01-storageclass.yml
similarity index 100%
rename from 6/6.0.0-GA/elasticsearch/01-storageclass.yml
rename to archive/6/6.0.0-beta/elasticsearch/01-storageclass.yml
diff --git a/6/6.0.0-GA/elasticsearch/02-service.yml b/archive/6/6.0.0-beta/elasticsearch/02-service.yml
similarity index 100%
rename from 6/6.0.0-GA/elasticsearch/02-service.yml
rename to archive/6/6.0.0-beta/elasticsearch/02-service.yml
diff --git a/6/6.0.0-GA/elasticsearch/03-statefulset.yml b/archive/6/6.0.0-beta/elasticsearch/03-statefulset.yml
similarity index 100%
rename from 6/6.0.0-GA/elasticsearch/03-statefulset.yml
rename to archive/6/6.0.0-beta/elasticsearch/03-statefulset.yml
diff --git a/6/6.0.0-GA/istio/01-metrictemplate.yml b/archive/6/6.0.0-beta/istio/01-metrictemplate.yml
similarity index 100%
rename from 6/6.0.0-GA/istio/01-metrictemplate.yml
rename to archive/6/6.0.0-beta/istio/01-metrictemplate.yml
diff --git a/6/6.0.0-GA/istio/02-skywalingadapter.yml b/archive/6/6.0.0-beta/istio/02-skywalingadapter.yml
similarity index 100%
rename from 6/6.0.0-GA/istio/02-skywalingadapter.yml
rename to archive/6/6.0.0-beta/istio/02-skywalingadapter.yml
diff --git a/6/6.0.0-GA/istio/03-operator_cfg.yml b/archive/6/6.0.0-beta/istio/03-operator_cfg.yml
similarity index 100%
rename from 6/6.0.0-GA/istio/03-operator_cfg.yml
rename to archive/6/6.0.0-beta/istio/03-operator_cfg.yml
diff --git a/6/6.0.0-alpha/namespace.yml b/archive/6/6.0.0-beta/namespace.yml
similarity index 100%
rename from 6/6.0.0-alpha/namespace.yml
rename to archive/6/6.0.0-beta/namespace.yml
diff --git a/6/6.0.0-GA/oap/00-rbac.yml b/archive/6/6.0.0-beta/oap/00-rbac.yml
similarity index 100%
rename from 6/6.0.0-GA/oap/00-rbac.yml
rename to archive/6/6.0.0-beta/oap/00-rbac.yml
diff --git a/6/6.0.0-alpha/oap/01-config.yml b/archive/6/6.0.0-beta/oap/01-config.yml
similarity index 100%
rename from 6/6.0.0-alpha/oap/01-config.yml
rename to archive/6/6.0.0-beta/oap/01-config.yml
diff --git a/6/6.0.0-GA/oap/02-service.yml b/archive/6/6.0.0-beta/oap/02-service.yml
similarity index 100%
rename from 6/6.0.0-GA/oap/02-service.yml
rename to archive/6/6.0.0-beta/oap/02-service.yml
diff --git a/6/6.0.0-beta/oap/03-deployment.yml b/archive/6/6.0.0-beta/oap/03-deployment.yml
similarity index 100%
rename from 6/6.0.0-beta/oap/03-deployment.yml
rename to archive/6/6.0.0-beta/oap/03-deployment.yml
diff --git a/6/6.0.0-GA/ui/01-service.yml b/archive/6/6.0.0-beta/ui/01-service.yml
similarity index 100%
rename from 6/6.0.0-GA/ui/01-service.yml
rename to archive/6/6.0.0-beta/ui/01-service.yml
diff --git a/6/6.0.0-beta/ui/02-deployment.yml b/archive/6/6.0.0-beta/ui/02-deployment.yml
similarity index 100%
rename from 6/6.0.0-beta/ui/02-deployment.yml
rename to archive/6/6.0.0-beta/ui/02-deployment.yml
diff --git a/README.md b/archive/README.md
similarity index 100%
copy from README.md
copy to archive/README.md
[skywalking-kubernetes] 21/48: Create README.md
Posted by in...@apache.org.
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 4337a183e6805b1331d964334cc143a508173bf6
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Wed Apr 10 05:59:06 2019 +0800
Create README.md
---
6/6.0.0-GA/istio/README.md | 2 ++
1 file changed, 2 insertions(+)
diff --git a/6/6.0.0-GA/istio/README.md b/6/6.0.0-GA/istio/README.md
new file mode 100644
index 0000000..a27a5bb
--- /dev/null
+++ b/6/6.0.0-GA/istio/README.md
@@ -0,0 +1,2 @@
+# SkyWalking Istio adaptor
+The SkyWalking uses Istio bypass adapter collects metrics. Use `kubectl apply -f` with the `yaml`(s) in this folder to setup.
[skywalking-kubernetes] 47/48: fixed some typo
Posted by in...@apache.org.
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 f112302a007d54ff367776b3187976e41abb9cf2
Author: innerpeacez <in...@gmail.com>
AuthorDate: Tue Oct 22 13:56:01 2019 +0800
fixed some typo
---
helm-chart/helm3/6.4.0/skywalking/README.md | 10 +++++-----
helm-chart/helm3/6.4.0/skywalking/values.yaml | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/helm-chart/helm3/6.4.0/skywalking/README.md b/helm-chart/helm3/6.4.0/skywalking/README.md
index 0fb8061..d37afd0 100644
--- a/helm-chart/helm3/6.4.0/skywalking/README.md
+++ b/helm-chart/helm3/6.4.0/skywalking/README.md
@@ -56,7 +56,7 @@ The following table lists the configurable parameters of the Skywalking chart an
| `oap.nodeSelector` | OAP labels for master pod assignment | `{}` |
| `oap.tolerations` | OAP tolerations | `[]` |
| `oap.resources` | OAP node resources requests & limits | `{} - cpu limit must be an integer` |
-| `oap.envoy.sla.enabled` | Open envoy sla | `false` |
+| `oap.envoy.als.enabled` | Open envoy als | `false` |
| `oap.env` | OAP environment variables | `[]` |
| `ui.name` | Web UI deployment name | `ui` |
| `ui.replicas` | Web UI k8s deployment replicas | `1` |
@@ -201,14 +201,14 @@ ui:
Envoy ALS(access log service) provides fully logs about RPC routed, including HTTP and TCP.
-If you want to open envoy sla, you can do this by modifying values.yaml.
+If you want to open envoy ALS, you can do this by modifying values.yaml.
```yaml
oap:
envoy:
- sla:
+ als:
enabled: true
```
-When envoy sla , will give ServerAccount clusterrole permission.
-More envoy sla ,please refer to https://github.com/apache/skywalking/blob/master/docs/en/setup/envoy/als_setting.md#observe-service-mesh-through-als
\ No newline at end of file
+When envoy als ,will give ServiceAccount clusterrole permission.
+More envoy als ,please refer to https://github.com/apache/skywalking/blob/master/docs/en/setup/envoy/als_setting.md#observe-service-mesh-through-als
\ No newline at end of file
diff --git a/helm-chart/helm3/6.4.0/skywalking/values.yaml b/helm-chart/helm3/6.4.0/skywalking/values.yaml
index 397d314..1eed9b8 100644
--- a/helm-chart/helm3/6.4.0/skywalking/values.yaml
+++ b/helm-chart/helm3/6.4.0/skywalking/values.yaml
@@ -34,7 +34,7 @@ oap:
envoy:
als:
enabled: false
- # more envoy sla ,please refer to https://github.com/apache/skywalking/blob/master/docs/en/setup/envoy/als_setting.md#observe-service-mesh-through-als
+ # more envoy ALS ,please refer to https://github.com/apache/skywalking/blob/master/docs/en/setup/envoy/als_setting.md#observe-service-mesh-through-als
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
[skywalking-kubernetes] 14/48: Add namespace label
Posted by in...@apache.org.
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 5ad94d817f697b0a9044b3d1adfed36d93414f8d
Merge: aaad9f6 c37f77c
Author: gaohongtao <ha...@gmail.com>
AuthorDate: Wed Jan 30 15:55:03 2019 +0800
Add namespace label
6/6.0.0-GA/namespace.yml | 4 +++-
6/6.0.0-alpha/namespace.yml | 4 +++-
6/6.0.0-beta/namespace.yml | 4 +++-
README.md | 2 +-
4 files changed, 10 insertions(+), 4 deletions(-)
diff --cc 6/6.0.0-alpha/namespace.yml
index 85bd8cb,73a3d63..16fd108
--- a/6/6.0.0-alpha/namespace.yml
+++ b/6/6.0.0-alpha/namespace.yml
@@@ -1,4 -1,6 +1,6 @@@
apiVersion: v1
kind: Namespace
metadata:
- name: skywalking
+ name: skywalking
+ labels:
- name: skywalking
++ name: skywalking
diff --cc 6/6.0.0-beta/namespace.yml
index 85bd8cb,73a3d63..16fd108
--- a/6/6.0.0-beta/namespace.yml
+++ b/6/6.0.0-beta/namespace.yml
@@@ -1,4 -1,6 +1,6 @@@
apiVersion: v1
kind: Namespace
metadata:
- name: skywalking
+ name: skywalking
+ labels:
- name: skywalking
++ name: skywalking
[skywalking-kubernetes] 10/48: Merge pull request #1 from
apache/6.0.0-alpha
Posted by in...@apache.org.
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 12f7ff6b0453ede85fe416fae0012463113b92cd
Merge: 7862484 246fb1d
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Mon Dec 3 11:48:21 2018 +0800
Merge pull request #1 from apache/6.0.0-alpha
6.0.0 alpha
.../6.0.0-alpha}/elasticsearch/01-storageclass.yml | 0
.../6.0.0-alpha}/elasticsearch/02-service.yml | 0
.../6.0.0-alpha}/elasticsearch/03-statefulset.yml | 0
.../6.0.0-alpha}/istio/01-metrictemplete.yml | 0
.../6.0.0-alpha}/istio/02-skywalingadapter.yml | 0
.../6.0.0-alpha}/istio/03-operator_cfg.yml | 2 ++
6/6.0.0-alpha/namespace.yml | 0
{scripts => 6/6.0.0-alpha}/oap/00-rbac.yml | 0
{scripts => 6/6.0.0-alpha}/oap/01-config.yml | 2 +-
.../6.0.0-alpha/oap/02-service.yml | 0
.../6.0.0-alpha/oap/03-deployment.yml | 4 ++--
{scripts => 6/6.0.0-alpha}/ui/01-service.yml | 0
{scripts => 6/6.0.0-alpha}/ui/02-deployment.yml | 2 +-
README.md | 10 +++++-----
scripts/namespace.yml | 22 ----------------------
15 files changed, 11 insertions(+), 31 deletions(-)
[skywalking-kubernetes] 17/48: Merge pull request #4 from
ica10888/master
Posted by in...@apache.org.
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 59b5ed5c42d33ac5e96554e1578941390aca5047
Merge: 0dcefa7 98e7960
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Fri Feb 1 12:47:32 2019 +0800
Merge pull request #4 from ica10888/master
indent problem
6/6.0.0-GA/oap/01-config.yml | 512 +++++++++++++++++++++----------------------
1 file changed, 256 insertions(+), 256 deletions(-)
[skywalking-kubernetes] 12/48: Update README.md
Posted by in...@apache.org.
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 c37f77cb733d48f312a2ed015717b0b26f8b7374
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Mon Jan 14 21:38:45 2019 +0800
Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index e67900d..cee038c 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ to your kubernetes environment.
## Deploy OAP server
-Use `kubectl apply -f ` with the scripts in `opa` to deploy oap server
+Use `kubectl apply -f ` with the scripts in `oap` to deploy oap server
in the cluster.
## Deploy UI server
[skywalking-kubernetes] 42/48: Merge pull request #19 from
innerpeacez/chart-6.4.0
Posted by in...@apache.org.
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 40430dbbe0740fbf8f33aef7dcf97f80195b55ec
Merge: b6e2d35 be3164b
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Tue Oct 8 17:48:26 2019 +0800
Merge pull request #19 from innerpeacez/chart-6.4.0
add sw chart 6.4.0
helm-chart/helm3/6.4.0/skywalking/.helmignore | 22 ++
helm-chart/helm3/6.4.0/skywalking/Chart.yaml | 20 ++
helm-chart/helm3/6.4.0/skywalking/OWNERS | 6 +
helm-chart/helm3/6.4.0/skywalking/README.md | 198 +++++++++++++++++
.../helm3/6.4.0/skywalking/templates/NOTES.txt | 19 ++
.../helm3/6.4.0/skywalking/templates/_helpers.tpl | 61 +++++
.../6.4.0/skywalking/templates/es-init.job.yaml | 38 ++++
.../6.4.0/skywalking/templates/oap-deployment.yaml | 99 +++++++++
.../helm3/6.4.0/skywalking/templates/oap-role.yaml | 13 ++
.../skywalking/templates/oap-rolebinding.yaml | 17 ++
.../skywalking/templates/oap-serviceaccount.yaml | 10 +
.../helm3/6.4.0/skywalking/templates/oap-svc.yaml | 21 ++
.../6.4.0/skywalking/templates/ui-deployment.yaml | 42 ++++
.../6.4.0/skywalking/templates/ui-ingress.yaml | 34 +++
.../helm3/6.4.0/skywalking/templates/ui-svc.yaml | 48 ++++
helm-chart/helm3/6.4.0/skywalking/values.yaml | 247 +++++++++++++++++++++
16 files changed, 895 insertions(+)
[skywalking-kubernetes] 09/48: Update 03-operator_cfg.yml
Posted by in...@apache.org.
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 246fb1dbb7edccb003a1aac10c8aef48d8f25c18
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Mon Dec 3 11:47:21 2018 +0800
Update 03-operator_cfg.yml
Add namespace
---
6/6.0.0-alpha/istio/03-operator_cfg.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/6/6.0.0-alpha/istio/03-operator_cfg.yml b/6/6.0.0-alpha/istio/03-operator_cfg.yml
index cd292c4..bb73968 100644
--- a/6/6.0.0-alpha/istio/03-operator_cfg.yml
+++ b/6/6.0.0-alpha/istio/03-operator_cfg.yml
@@ -37,8 +37,10 @@ spec:
value: request.size | 0
dimensions:
sourceService: source.workload.name | ""
+ sourceNamespace: source.workload.namespace | ""
sourceUID: source.uid | ""
destinationService: destination.workload.name | ""
+ destinationNamespace: destination.workload.namespace | ""
destinationUID: destination.uid | ""
requestMethod: request.method | ""
requestPath: request.path | ""
[skywalking-kubernetes] 18/48: mv metrictemplete to metrictemplate
Posted by in...@apache.org.
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 9ee4dcfa1f1acc3b6b683ebbe2d61c9128405365
Author: wayilau <li...@cmss.chinamobile.com>
AuthorDate: Tue Mar 19 09:52:59 2019 +0800
mv metrictemplete to metrictemplate
---
.../istio/01-metrictemplete.yml => 6.0.0-GA/istio/01-metrictemplate.yml} | 0
6/6.0.0-alpha/istio/{01-metrictemplete.yml => 01-metrictemplate.yml} | 0
.../01-metrictemplete.yml => 6.0.0-beta/istio/01-metrictemplate.yml} | 0
3 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/6/6.0.0-beta/istio/01-metrictemplete.yml b/6/6.0.0-GA/istio/01-metrictemplate.yml
similarity index 100%
rename from 6/6.0.0-beta/istio/01-metrictemplete.yml
rename to 6/6.0.0-GA/istio/01-metrictemplate.yml
diff --git a/6/6.0.0-alpha/istio/01-metrictemplete.yml b/6/6.0.0-alpha/istio/01-metrictemplate.yml
similarity index 100%
rename from 6/6.0.0-alpha/istio/01-metrictemplete.yml
rename to 6/6.0.0-alpha/istio/01-metrictemplate.yml
diff --git a/6/6.0.0-GA/istio/01-metrictemplete.yml b/6/6.0.0-beta/istio/01-metrictemplate.yml
similarity index 100%
rename from 6/6.0.0-GA/istio/01-metrictemplete.yml
rename to 6/6.0.0-beta/istio/01-metrictemplate.yml
[skywalking-kubernetes] 27/48: fix ui 6.0-GA cann't connect oap 6.0
Posted by in...@apache.org.
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 1be0be55c8bd5675d9f2f4ef51e9aa8c956730c2
Author: tristan-tsl <46...@users.noreply.github.com>
AuthorDate: Wed Jun 19 20:42:37 2019 +0800
fix ui 6.0-GA cann't connect oap 6.0
althought the ui has default timeout value,but i fount it not work,i try to explicit to set timeout value,well,it work
---
6/6.0.0-GA/ui/02-deployment.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/6/6.0.0-GA/ui/02-deployment.yml b/6/6.0.0-GA/ui/02-deployment.yml
index ff9feb3..a51809b 100644
--- a/6/6.0.0-GA/ui/02-deployment.yml
+++ b/6/6.0.0-GA/ui/02-deployment.yml
@@ -45,3 +45,5 @@ spec:
env:
- name: collector.ribbon.listOfServers
value: oap:12800
+ - name: collector.ribbon.ReadTimeout
+ value: "20000"
[skywalking-kubernetes] 26/48: Modify the image pull policy and
modify the filename extension to .yaml (#12)
Posted by in...@apache.org.
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 7cac688d7d70a82b40ff452bdeb3d699cd56a957
Author: innerpeacez <37...@users.noreply.github.com>
AuthorDate: Mon May 27 13:47:52 2019 +0800
Modify the image pull policy and modify the filename extension to .yaml (#12)
---
.../{elasticsearch-service.yml => elasticsearch-service.yaml} | 0
.../{elasticsearch-statefulset.yml => elasticsearch-statefulset.yaml} | 1 +
.../skywalking/templates/oap/{oap-config.yml => oap-config.yaml} | 0
.../skywalking/templates/oap/{oap-deployment.yml => oap-deployment.yaml} | 1 +
.../skywalking/templates/oap/{oap-service.yml => oap-service.yaml} | 0
.../templates/oap/{oap-serviceaccount.yml => oap-serviceaccount.yaml} | 0
.../skywalking/templates/ui/{ui-deployment.yml => ui-deployment.yaml} | 1 +
.../6.0.0-GA/skywalking/templates/ui/{ui-service.yml => ui-service.yaml} | 0
8 files changed, 3 insertions(+)
diff --git a/helm/charts/6/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-service.yml b/helm/charts/6/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-service.yaml
similarity index 100%
rename from helm/charts/6/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-service.yml
rename to helm/charts/6/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-service.yaml
diff --git a/helm/charts/6/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-statefulset.yml b/helm/charts/6/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-statefulset.yaml
similarity index 98%
rename from helm/charts/6/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-statefulset.yml
rename to helm/charts/6/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-statefulset.yaml
index e2919d4..ea776ed 100644
--- a/helm/charts/6/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-statefulset.yml
+++ b/helm/charts/6/6.0.0-GA/skywalking/templates/elasticsearch/elasticsearch-statefulset.yaml
@@ -75,6 +75,7 @@ spec:
containers:
- name: elasticsearch
image: {{ .Values.elasticsearch.image.repository }}:{{ .Values.elasticsearch.image.tag }}
+ imagePullPolicy: {{ .Values.elasticsearch.image.pullPolicy }}
ports:
- containerPort: {{ .Values.elasticsearch.ports.http }}
name: http
diff --git a/helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-config.yml b/helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-config.yaml
similarity index 100%
rename from helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-config.yml
rename to helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-config.yaml
diff --git a/helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-deployment.yml b/helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-deployment.yaml
similarity index 97%
rename from helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-deployment.yml
rename to helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-deployment.yaml
index 2bfd271..611379f 100644
--- a/helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-deployment.yml
+++ b/helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-deployment.yaml
@@ -34,6 +34,7 @@ spec:
containers:
- name: {{ .Values.oap.name }}
image: {{ .Values.oap.image.repository }}:{{ .Values.oap.image.tag }}
+ imagePullPolicy: {{ .Values.oap.image.pullPolicy }}
ports:
- containerPort: {{ .Values.oap.ports.grpc }}
name: grpc
diff --git a/helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-service.yml b/helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-service.yaml
similarity index 100%
rename from helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-service.yml
rename to helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-service.yaml
diff --git a/helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-serviceaccount.yml b/helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-serviceaccount.yaml
similarity index 100%
rename from helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-serviceaccount.yml
rename to helm/charts/6/6.0.0-GA/skywalking/templates/oap/oap-serviceaccount.yaml
diff --git a/helm/charts/6/6.0.0-GA/skywalking/templates/ui/ui-deployment.yml b/helm/charts/6/6.0.0-GA/skywalking/templates/ui/ui-deployment.yaml
similarity index 96%
rename from helm/charts/6/6.0.0-GA/skywalking/templates/ui/ui-deployment.yml
rename to helm/charts/6/6.0.0-GA/skywalking/templates/ui/ui-deployment.yaml
index b11f9fc..2c0b637 100644
--- a/helm/charts/6/6.0.0-GA/skywalking/templates/ui/ui-deployment.yml
+++ b/helm/charts/6/6.0.0-GA/skywalking/templates/ui/ui-deployment.yaml
@@ -33,6 +33,7 @@ spec:
containers:
- name: {{ .Values.ui.name }}
image: {{ .Values.ui.image.repository }}:{{ .Values.ui.image.tag }}
+ imagePullPolicy: {{ .Values.ui.image.pullPolicy }}
ports:
- containerPort: {{ .Values.ui.ports.page }}
name: page
diff --git a/helm/charts/6/6.0.0-GA/skywalking/templates/ui/ui-service.yml b/helm/charts/6/6.0.0-GA/skywalking/templates/ui/ui-service.yaml
similarity index 100%
rename from helm/charts/6/6.0.0-GA/skywalking/templates/ui/ui-service.yml
rename to helm/charts/6/6.0.0-GA/skywalking/templates/ui/ui-service.yaml
[skywalking-kubernetes] 20/48: Update README.md (#7)
Posted by in...@apache.org.
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 6cac0bdbbc90d7d76fe8d2f167cf9428495ffa85
Author: ryan <ch...@gmail.com>
AuthorDate: Tue Mar 19 16:32:28 2019 +0800
Update README.md (#7)
spelling mistake。kubctl -> kubectl
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index cee038c..3de54c8 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ To install and configure skywalking in a Kubernetes cluster, follow these instru
Please promise the `skywalking` namespace existed in the cluster, otherwise, create a new one.
-`kubctl apply -f namespace.yml`
+`kubectl apply -f namespace.yml`
## Deploy Elasticsearch
[skywalking-kubernetes] 16/48: fix indent problem
Posted by in...@apache.org.
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 98e796034ecc7135f84508f39feff7aee62eb569
Author: wangweihan <wa...@foxmail.com>
AuthorDate: Fri Feb 1 11:29:54 2019 +0800
fix indent problem
---
6/6.0.0-GA/oap/01-config.yml | 512 +++++++++++++++++++++----------------------
1 file changed, 256 insertions(+), 256 deletions(-)
diff --git a/6/6.0.0-GA/oap/01-config.yml b/6/6.0.0-GA/oap/01-config.yml
index 2652bb8..23b22b1 100644
--- a/6/6.0.0-GA/oap/01-config.yml
+++ b/6/6.0.0-GA/oap/01-config.yml
@@ -112,263 +112,263 @@ data:
component-libraries.yml: |-
Tomcat:
- id: 1
- languages: Java
-HttpClient:
- id: 2
- languages: Java,C#,Node.js
-Dubbo:
- id: 3
- languages: Java
-H2:
- id: 4
- languages: Java
-Mysql:
- id: 5
- languages: Java,C#,Node.js
-ORACLE:
- id: 6
- languages: Java
-Redis:
- id: 7
- languages: Java,C#,Node.js
-Motan:
- id: 8
- languages: Java
-MongoDB:
- id: 9
- languages: Java,C#,Node.js
-Resin:
- id: 10
- languages: Java
-Feign:
- id: 11
- languages: Java
-OKHttp:
- id: 12
- languages: Java
-SpringRestTemplate:
- id: 13
- languages: Java
-SpringMVC:
- id: 14
- languages: Java
-Struts2:
- id: 15
- languages: Java
-NutzMVC:
- id: 16
- languages: Java
-NutzHttp:
- id: 17
- languages: Java
-JettyClient:
- id: 18
- languages: Java
-JettyServer:
- id: 19
- languages: Java
-Memcached:
- id: 20
- languages: Java
-ShardingJDBC:
- id: 21
- languages: Java
-PostgreSQL:
- id: 22
- languages: Java,C#,Node.js
-GRPC:
- id: 23
- languages: Java
-ElasticJob:
- id: 24
- languages: Java
-RocketMQ:
- id: 25
- languages: Java
-httpasyncclient:
- id: 26
- languages: Java
-Kafka:
- id: 27
- languages: Java
-ServiceComb:
- id: 28
- languages: Java
-Hystrix:
- id: 29
- languages: Java
-Jedis:
- id: 30
- languages: Java
-SQLite:
- id: 31
- languages: Java,C#
-h2-jdbc-driver:
- id: 32
- languages: Java
-mysql-connector-java:
- id: 33
- languages: Java
-ojdbc:
- id: 34
- languages: Java
-Spymemcached:
- id: 35
- languages: Java
-Xmemcached:
- id: 36
- languages: Java
-postgresql-jdbc-driver:
- id: 37
- languages: Java
-rocketMQ-producer:
- id: 38
- languages: Java
-rocketMQ-consumer:
- id: 39
- languages: Java
-kafka-producer:
- id: 40
- languages: Java
-kafka-consumer:
- id: 41
- languages: Java
-mongodb-driver:
- id: 42
- languages: Java
-SOFARPC:
- id: 43
- languages: Java
-ActiveMQ:
- id: 44
- languages: Java
-activemq-producer:
- id: 45
- languages: Java
-activemq-consumer:
- id: 46
- languages: Java
-Elasticsearch:
- id: 47
- languages: Java
-transport-client:
- id: 48
- languages: Java
-http:
- id: 49
- languages: Java,C#,Node.js
-rpc:
- id: 50
- languages: Java,C#,Node.js
-RabbitMQ:
- id: 51
- languages: Java
-rabbitmq-producer:
- id: 52
- languages: Java
-rabbitmq-consumer:
- id: 53
- languages: Java
-Canal:
- id: 54
- languages: Java
-Gson:
- id: 55
- languages: Java
-Redisson:
- id: 56
- languages: Java
-AspNetCore:
- id: 3001
- languages: C#
-EntityFrameworkCore:
- id: 3002
- languages: C#
-SqlClient:
- id: 3003
- languages: C#
-CAP:
- id: 3004
- languages: C#
-StackExchange.Redis:
- id: 3005
- languages: C#
-SqlServer:
- id: 3006
- languages: C#
-Npgsql:
- id: 3007
- languages: C#
-MySqlConnector:
- id: 3008
- languages: C#
-EntityFrameworkCore.InMemory:
- id: 3009
- languages: C#
-EntityFrameworkCore.SqlServer:
- id: 3010
- languages: C#
-EntityFrameworkCore.Sqlite:
- id: 3011
- languages: C#
-Pomelo.EntityFrameworkCore.MySql:
- id: 3012
- languages: C#
-Npgsql.EntityFrameworkCore.PostgreSQL:
- id: 3013
- languages: C#
-InMemoryDatabase:
- id: 3014
- languages: C#
-AspNet:
- id: 3015
- languages: C#
+ id: 1
+ languages: Java
+ HttpClient:
+ id: 2
+ languages: Java,C#,Node.js
+ Dubbo:
+ id: 3
+ languages: Java
+ H2:
+ id: 4
+ languages: Java
+ Mysql:
+ id: 5
+ languages: Java,C#,Node.js
+ ORACLE:
+ id: 6
+ languages: Java
+ Redis:
+ id: 7
+ languages: Java,C#,Node.js
+ Motan:
+ id: 8
+ languages: Java
+ MongoDB:
+ id: 9
+ languages: Java,C#,Node.js
+ Resin:
+ id: 10
+ languages: Java
+ Feign:
+ id: 11
+ languages: Java
+ OKHttp:
+ id: 12
+ languages: Java
+ SpringRestTemplate:
+ id: 13
+ languages: Java
+ SpringMVC:
+ id: 14
+ languages: Java
+ Struts2:
+ id: 15
+ languages: Java
+ NutzMVC:
+ id: 16
+ languages: Java
+ NutzHttp:
+ id: 17
+ languages: Java
+ JettyClient:
+ id: 18
+ languages: Java
+ JettyServer:
+ id: 19
+ languages: Java
+ Memcached:
+ id: 20
+ languages: Java
+ ShardingJDBC:
+ id: 21
+ languages: Java
+ PostgreSQL:
+ id: 22
+ languages: Java,C#,Node.js
+ GRPC:
+ id: 23
+ languages: Java
+ ElasticJob:
+ id: 24
+ languages: Java
+ RocketMQ:
+ id: 25
+ languages: Java
+ httpasyncclient:
+ id: 26
+ languages: Java
+ Kafka:
+ id: 27
+ languages: Java
+ ServiceComb:
+ id: 28
+ languages: Java
+ Hystrix:
+ id: 29
+ languages: Java
+ Jedis:
+ id: 30
+ languages: Java
+ SQLite:
+ id: 31
+ languages: Java,C#
+ h2-jdbc-driver:
+ id: 32
+ languages: Java
+ mysql-connector-java:
+ id: 33
+ languages: Java
+ ojdbc:
+ id: 34
+ languages: Java
+ Spymemcached:
+ id: 35
+ languages: Java
+ Xmemcached:
+ id: 36
+ languages: Java
+ postgresql-jdbc-driver:
+ id: 37
+ languages: Java
+ rocketMQ-producer:
+ id: 38
+ languages: Java
+ rocketMQ-consumer:
+ id: 39
+ languages: Java
+ kafka-producer:
+ id: 40
+ languages: Java
+ kafka-consumer:
+ id: 41
+ languages: Java
+ mongodb-driver:
+ id: 42
+ languages: Java
+ SOFARPC:
+ id: 43
+ languages: Java
+ ActiveMQ:
+ id: 44
+ languages: Java
+ activemq-producer:
+ id: 45
+ languages: Java
+ activemq-consumer:
+ id: 46
+ languages: Java
+ Elasticsearch:
+ id: 47
+ languages: Java
+ transport-client:
+ id: 48
+ languages: Java
+ http:
+ id: 49
+ languages: Java,C#,Node.js
+ rpc:
+ id: 50
+ languages: Java,C#,Node.js
+ RabbitMQ:
+ id: 51
+ languages: Java
+ rabbitmq-producer:
+ id: 52
+ languages: Java
+ rabbitmq-consumer:
+ id: 53
+ languages: Java
+ Canal:
+ id: 54
+ languages: Java
+ Gson:
+ id: 55
+ languages: Java
+ Redisson:
+ id: 56
+ languages: Java
+ AspNetCore:
+ id: 3001
+ languages: C#
+ EntityFrameworkCore:
+ id: 3002
+ languages: C#
+ SqlClient:
+ id: 3003
+ languages: C#
+ CAP:
+ id: 3004
+ languages: C#
+ StackExchange.Redis:
+ id: 3005
+ languages: C#
+ SqlServer:
+ id: 3006
+ languages: C#
+ Npgsql:
+ id: 3007
+ languages: C#
+ MySqlConnector:
+ id: 3008
+ languages: C#
+ EntityFrameworkCore.InMemory:
+ id: 3009
+ languages: C#
+ EntityFrameworkCore.SqlServer:
+ id: 3010
+ languages: C#
+ EntityFrameworkCore.Sqlite:
+ id: 3011
+ languages: C#
+ Pomelo.EntityFrameworkCore.MySql:
+ id: 3012
+ languages: C#
+ Npgsql.EntityFrameworkCore.PostgreSQL:
+ id: 3013
+ languages: C#
+ InMemoryDatabase:
+ id: 3014
+ languages: C#
+ AspNet:
+ id: 3015
+ languages: C#
-# NoeJS components
-# [4000, 5000) for Node.js agent
-HttpServer:
- id: 4001
- languages: Node.js
-express:
- id: 4002
- languages: Node.js
-Egg:
- id: 4003
- languages: Node.js
-Koa:
- id: 4004
- languages: Node.js
+ # NoeJS components
+ # [4000, 5000) for Node.js agent
+ HttpServer:
+ id: 4001
+ languages: Node.js
+ express:
+ id: 4002
+ languages: Node.js
+ Egg:
+ id: 4003
+ languages: Node.js
+ Koa:
+ id: 4004
+ languages: Node.js
-# Component Server mapping defines the server display names of some components
-# e.g.
-# Jedis is a client library in Java for Redis server
-Component-Server-Mappings:
- mongodb-driver: MongoDB
- rocketMQ-producer: RocketMQ
- rocketMQ-consumer: RocketMQ
- kafka-producer: Kafka
- kafka-consumer: Kafka
- activemq-producer: ActiveMQ
- activemq-consumer: ActiveMQ
- rabbitmq-producer: RabbitMQ
- rabbitmq-consumer: RabbitMQ
- postgresql-jdbc-driver: PostgreSQL
- Xmemcached: Memcached
- Spymemcached: Memcached
- h2-jdbc-driver: H2
- mysql-connector-java: Mysql
- Jedis: Redis
- StackExchange.Redis: Redis
- Redisson: Redis
- SqlClient: SqlServer
- Npgsql: PostgreSQL
- MySqlConnector: Mysql
- EntityFrameworkCore.InMemory: InMemoryDatabase
- EntityFrameworkCore.SqlServer: SqlServer
- EntityFrameworkCore.Sqlite: SQLite
- Pomelo.EntityFrameworkCore.MySql: Mysql
- Npgsql.EntityFrameworkCore.PostgreSQL: PostgreSQL
- transport-client: Elasticsearch
+ # Component Server mapping defines the server display names of some components
+ # e.g.
+ # Jedis is a client library in Java for Redis server
+ Component-Server-Mappings:
+ mongodb-driver: MongoDB
+ rocketMQ-producer: RocketMQ
+ rocketMQ-consumer: RocketMQ
+ kafka-producer: Kafka
+ kafka-consumer: Kafka
+ activemq-producer: ActiveMQ
+ activemq-consumer: ActiveMQ
+ rabbitmq-producer: RabbitMQ
+ rabbitmq-consumer: RabbitMQ
+ postgresql-jdbc-driver: PostgreSQL
+ Xmemcached: Memcached
+ Spymemcached: Memcached
+ h2-jdbc-driver: H2
+ mysql-connector-java: Mysql
+ Jedis: Redis
+ StackExchange.Redis: Redis
+ Redisson: Redis
+ SqlClient: SqlServer
+ Npgsql: PostgreSQL
+ MySqlConnector: Mysql
+ EntityFrameworkCore.InMemory: InMemoryDatabase
+ EntityFrameworkCore.SqlServer: SqlServer
+ EntityFrameworkCore.Sqlite: SQLite
+ Pomelo.EntityFrameworkCore.MySql: Mysql
+ Npgsql.EntityFrameworkCore.PostgreSQL: PostgreSQL
+ transport-client: Elasticsearch
[skywalking-kubernetes] 23/48: skywalking logo (#10)
Posted by in...@apache.org.
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 99a31f17b52be585998fe3814ed1171a626fe1f1
Author: innerpeacez <37...@users.noreply.github.com>
AuthorDate: Thu May 23 16:55:59 2019 +0800
skywalking logo (#10)
---
logo/skywalking-logo.png | Bin 0 -> 117332 bytes
logo/skywalking-logo2.png | Bin 0 -> 101365 bytes
2 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/logo/skywalking-logo.png b/logo/skywalking-logo.png
new file mode 100644
index 0000000..e388801
Binary files /dev/null and b/logo/skywalking-logo.png differ
diff --git a/logo/skywalking-logo2.png b/logo/skywalking-logo2.png
new file mode 100644
index 0000000..99f087c
Binary files /dev/null and b/logo/skywalking-logo2.png differ
[skywalking-kubernetes] 25/48: Merge pull request #11 from
innerpeacez/charts
Posted by in...@apache.org.
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 68ffef3c94c0d5ac389767208869850e006bbcc0
Merge: 99a31f1 1aa4166
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Thu May 23 20:29:55 2019 +0800
Merge pull request #11 from innerpeacez/charts
add icon in Chart.yaml
helm/charts/6/6.0.0-GA/skywalking/Chart.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[skywalking-kubernetes] 37/48: home fix
Posted by in...@apache.org.
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 fa754a01004c124cec9cba0a5b77393f9db633d5
Author: innerpeacez <zh...@163.com>
AuthorDate: Thu Aug 15 09:52:43 2019 +0800
home fix
---
helm-chart/helm3/6.3.0/skywalking/Chart.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/helm-chart/helm3/6.3.0/skywalking/Chart.yaml b/helm-chart/helm3/6.3.0/skywalking/Chart.yaml
index b12bc7d..8657909 100644
--- a/helm-chart/helm3/6.3.0/skywalking/Chart.yaml
+++ b/helm-chart/helm3/6.3.0/skywalking/Chart.yaml
@@ -1,6 +1,6 @@
apiVersion: v1
name: skywalking
-home: https://www.elastic.co/products/elasticsearch
+home: https://skywalking.apache.org
version: 0.1.0
appVersion: 6.3.0
description: Apache SkyWalking APM System
[skywalking-kubernetes] 33/48: Fix some issues about installing
chart with a name
Posted by in...@apache.org.
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 <ha...@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:
[skywalking-kubernetes] 28/48: Merge pull request #16 from
tristan-tsl/patch-3
Posted by in...@apache.org.
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 f75126a1c428bd3ae1cd011f350498e3ec97d703
Merge: 7cac688 1be0be5
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Wed Jun 19 20:56:39 2019 +0800
Merge pull request #16 from tristan-tsl/patch-3
fix ui 6.0-GA cann't connect oap 6.0
6/6.0.0-GA/ui/02-deployment.yml | 2 ++
1 file changed, 2 insertions(+)
[skywalking-kubernetes] 29/48: Update 03-deployment.yml
Posted by in...@apache.org.
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 d310a7d176fdacb4470e47b4e3699470f1cc56d3
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Thu Jun 20 14:32:35 2019 +0800
Update 03-deployment.yml
Update a new docker repo.
---
6/6.0.0-GA/oap/03-deployment.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/6/6.0.0-GA/oap/03-deployment.yml b/6/6.0.0-GA/oap/03-deployment.yml
index efcb261..5f25e86 100644
--- a/6/6.0.0-GA/oap/03-deployment.yml
+++ b/6/6.0.0-GA/oap/03-deployment.yml
@@ -34,7 +34,7 @@ spec:
serviceAccountName: skywalking-oap
containers:
- name: oap
- image: skywalking/oap:6.0.0-GA
+ image: apache/skywalking-oap-server:6.0.0-GA
ports:
- containerPort: 11800
name: grpc
@@ -58,4 +58,4 @@ spec:
volumes:
- name: config
configMap:
- name: oap-config
\ No newline at end of file
+ name: oap-config
[skywalking-kubernetes] 04/48: Update 01-storageclass.yml
Posted by in...@apache.org.
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 c49408e90268429f49d975f5ea96fc5d296aa6dc
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Mon Nov 5 14:54:34 2018 +0800
Update 01-storageclass.yml
Remove invalid namespace metadata
---
scripts/elasticsearch/01-storageclass.yml | 1 -
1 file changed, 1 deletion(-)
diff --git a/scripts/elasticsearch/01-storageclass.yml b/scripts/elasticsearch/01-storageclass.yml
index 8082b44..ecdd70e 100644
--- a/scripts/elasticsearch/01-storageclass.yml
+++ b/scripts/elasticsearch/01-storageclass.yml
@@ -18,7 +18,6 @@ kind: StorageClass
apiVersion: storage.k8s.io/v1
metadata:
name: ssd
- namespace: skywalking
provisioner: kubernetes.io/gce-pd
parameters:
type: pd-ssd