[skywalking-kubernetes] branch legacy-helm-chart created (now 32db90d)
This is an automated email from the ASF dual-hosted git repository. innerpeacez pushed a change to branch legacy-helm-chart in repository https://gitbox.apache.org/repos/asf/skywalking-kubernetes.git. at 32db90d legacy-helm-chart branch This branch includes the following new commits: new 32db90d legacy-helm-chart branch The 1 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.
[skywalking-kubernetes] 01/01: legacy-helm-chart branch
This is an automated email from the ASF dual-hosted git repository. innerpeacez pushed a commit to branch legacy-helm-chart in repository https://gitbox.apache.org/repos/asf/skywalking-kubernetes.git commit 32db90dfa3aa7e44e2dcc5aa042a68bf1cddcddb Author: innerpeacez AuthorDate: Mon Nov 18 16:49:45 2019 +0800 legacy-helm-chart branch --- helm-chart/helm3/6.5.0/skywalking/.helmignore | 22 -- helm-chart/helm3/6.5.0/skywalking/Chart.yaml | 20 -- helm-chart/helm3/6.5.0/skywalking/OWNERS | 8 - helm-chart/helm3/6.5.0/skywalking/README.md| 214 -- .../helm3/6.5.0/skywalking/templates/NOTES.txt | 25 -- .../helm3/6.5.0/skywalking/templates/_helpers.tpl | 61 - .../6.5.0/skywalking/templates/es-init.job.yaml| 38 .../skywalking/templates/oap-clusterrole.yaml | 18 -- .../templates/oap-clusterrolebinding.yaml | 19 -- .../6.5.0/skywalking/templates/oap-deployment.yaml | 103 - .../helm3/6.5.0/skywalking/templates/oap-role.yaml | 15 -- .../skywalking/templates/oap-rolebinding.yaml | 19 -- .../skywalking/templates/oap-serviceaccount.yaml | 10 - .../helm3/6.5.0/skywalking/templates/oap-svc.yaml | 21 -- .../6.5.0/skywalking/templates/ui-deployment.yaml | 42 .../6.5.0/skywalking/templates/ui-ingress.yaml | 34 --- .../helm3/6.5.0/skywalking/templates/ui-svc.yaml | 48 helm-chart/helm3/6.5.0/skywalking/values.yaml | 251 - 18 files changed, 968 deletions(-) diff --git a/helm-chart/helm3/6.5.0/skywalking/.helmignore b/helm-chart/helm3/6.5.0/skywalking/.helmignore deleted file mode 100644 index 7c04072..000 --- a/helm-chart/helm3/6.5.0/skywalking/.helmignore +++ /dev/null @@ -1,22 +0,0 @@ -# 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.5.0/skywalking/Chart.yaml b/helm-chart/helm3/6.5.0/skywalking/Chart.yaml deleted file mode 100644 index 68adea0..000 --- a/helm-chart/helm3/6.5.0/skywalking/Chart.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: v2 -name: skywalking -home: https://skywalking.apache.org -version: 1.0.0 -appVersion: 6.5.0 -description: Apache SkyWalking APM System -icon: https://raw.githubusercontent.com/apache/skywalking-kubernetes/master/logo/sw-logo-for-chart.jpg -sources: -- https://github.com/apache/skywalking-kubernetes -maintainers: -- name: hanahmily - email: hanahm...@gmail.com -- name: innerpeacez - email: innerpeace.z...@gmail.com - -dependencies: - - name: elasticsearch -version: ~1.32.0 -repository: https://kubernetes-charts.storage.googleapis.com/ -condition: elasticsearch.enabled \ No newline at end of file diff --git a/helm-chart/helm3/6.5.0/skywalking/OWNERS b/helm-chart/helm3/6.5.0/skywalking/OWNERS deleted file mode 100644 index 980b53a..000 --- a/helm-chart/helm3/6.5.0/skywalking/OWNERS +++ /dev/null @@ -1,8 +0,0 @@ -approvers: -- hanahmily -- wu-sheng -- innerpeacez -reviewers: -- hanahmily -- wu-sheng -- innerpeacez \ No newline at end of file diff --git a/helm-chart/helm3/6.5.0/skywalking/README.md b/helm-chart/helm3/6.5.0/skywalking/README.md deleted file mode 100644 index d37afd0..000 --- a/helm-chart/helm3/6.5.0/skywalking/README.md +++ /dev/null @@ -1,214 +0,0 @@ -# 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 -``` - -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 uninstall my-release -n -``` - -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. - -| Parame
[skywalking-kubernetes] 01/01: Merge pull request #31 from apache/typo
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 1c41a0a7ab82dd7673d77358ed96bab119a829cf Merge: e9d4013 3d2470f Author: innerpeacez AuthorDate: Sat Dec 14 16:02:24 2019 +0800 Merge pull request #31 from apache/typo helm dep up skywalking README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[skywalking-kubernetes] branch master updated (e9d4013 -> 1c41a0a)
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 e9d4013 Update README.md add 3d2470f helm dep up skywalking new 1c41a0a Merge pull request #31 from apache/typo The 1 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: README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[skywalking-kubernetes] tag v1.0.0 created (now cbb2600)
This is an automated email from the ASF dual-hosted git repository. innerpeacez pushed a change to tag v1.0.0 in repository https://gitbox.apache.org/repos/asf/skywalking-kubernetes.git. at cbb2600 (commit) No new revisions were added by this update.
[skywalking-kubernetes] 30/48: add README.md, ui-ingress.yaml for charts (#13)
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 <37059529+innerpea...@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 000..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.ingres
[skywalking-kubernetes] 20/48: Update README.md (#7)
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 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] 45/48: modify role to clusterrole
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
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] 15/48: Merge pull request #3 from apache/6.0.0-alpha
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
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] 32/48: Update README.md
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
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/e
[skywalking-kubernetes] 21/48: Create README.md
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 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 000..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] 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] 14/48: Add namespace label
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 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] 31/48: Add 6.1.0 chart
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 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
[skywalking-kubernetes] 34/48: email
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 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: 10146...@qq.com \ No newline at end of file + email: innerpeace.z...@gmail.com \ No newline at end of file
[skywalking-kubernetes] 09/48: Update 03-operator_cfg.yml
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 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] 02/48: Add Istio script
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 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] 36/48: helm3 and 6.3.0
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
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-kubernetes] 26/48: Modify the image pull policy and modify the filename extension to .yaml (#12)
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 <37059529+innerpea...@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:
[skywalking-kubernetes] 22/48: helm charts (#8)
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 <37059529+innerpea...@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 000..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 000..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: 10146...@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 000..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 000..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&
[skywalking-kubernetes] 08/48: Update sciprts
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
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 000..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: |-
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] 19/48: Merge pull request #6 from wayilau/master
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
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] 44/48: Merge pull request #20 from innerpeacez/modify-logo-url
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 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] 28/48: Merge pull request #16 from tristan-tsl/patch-3
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 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] 04/48: Update 01-storageclass.yml
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 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
[skywalking-kubernetes] 43/48: modify logo url
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 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.z...@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] 46/48: Support for envoy sla and turn off es persistence enabled by default
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
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
+$ helm uninstall my-release -n
```
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/h
[skywalking-kubernetes] 13/48: Add 6.0.0-GA and 6.0.0-beta
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 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 000..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 000..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 000..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 licen
[skywalking-kubernetes] 12/48: Update README.md
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 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] 06/48: Update README.md
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 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] 42/48: Merge pull request #19 from innerpeacez/chart-6.4.0
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 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] 18/48: mv metrictemplete to metrictemplate
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
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] 10/48: Merge pull request #1 from apache/6.0.0-alpha
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
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] 11/48: add 6.0.0-beta
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 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 000..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 000..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 000..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, ei
[skywalking-kubernetes] 33/48: Fix some issues about installing chart with a name
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
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] 01/48: Init commit
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 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 000..538c8c5 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +.DS_Store +*~ diff --git a/README.md b/README.md new file mode 100644 index 000..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 000..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 000..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
[skywalking-kubernetes] 41/48: Merge pull request #18 from innerpeacez/logo
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 b6e2d3547a01eb74bb118d8c522ca00d4c14 Merge: 0bc427f 81c5699 Author: 吴晟 Wu Sheng 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] 48/48: Merge pull request #21 from innerpeacez/modify
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
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] 03/48: Update 01-storageclass.yml
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 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] 38/48: Merge pull request #17 from innerpeacez/change
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
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] 39/48: sw chart 6.4.0
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 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 000..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 000..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: hanahm...@gmail.com +- name: innerpeacez + email: innerpeace.z...@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 000..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 000..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 +``` + +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 +``` + +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 | Defa
[skywalking-kubernetes] 16/48: fix indent problem
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 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
[skywalking-kubernetes] 47/48: fixed some typo
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
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] 24/48: add icon in Chart.yaml
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 1aa416678480380dcd986a9573667ddd02ca Author: innerpeacez 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: 10146...@qq.com \ No newline at end of file
[skywalking-kubernetes] 29/48: Update 03-deployment.yml
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 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] 37/48: home fix
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 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] 40/48: logo for chart
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 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 000..1455612 Binary files /dev/null and b/logo/sw-logo-for-chart.jpg differ
[skywalking-kubernetes] 35/48: add elasticsearch master, data and client Values
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
AuthorDate: Tue Aug 13 14:58:17 2019 +0800
add elasticsearch master,data and client Values
---
helm-chart/6.0.0-GA/skywalking/Chart.yaml | 4 +-
helm-chart/6.1.0/{ => skywalking}/.helmignore | 0
helm-chart/6.1.0/{ => skywalking}/Chart.yaml | 2 +
helm-chart/6.1.0/{ => skywalking}/OWNERS | 0
helm-chart/6.1.0/{ => skywalking}/README.md| 0
.../6.1.0/{ => skywalking}/requirements.lock | 0
.../6.1.0/{ => skywalking}/requirements.yaml | 0
.../6.1.0/{ => skywalking}/templates/NOTES.txt | 0
.../6.1.0/{ => skywalking}/templates/_helpers.tpl | 0
.../{ => skywalking}/templates/es-init.job.yaml| 0
.../{ => skywalking}/templates/oap-deployment.yaml | 0
.../6.1.0/{ => skywalking}/templates/oap-role.yaml | 0
.../templates/oap-rolebinding.yaml | 0
.../templates/oap-serviceaccount.yaml | 0
.../6.1.0/{ => skywalking}/templates/oap-svc.yaml | 0
.../{ => skywalking}/templates/ui-deployment.yaml | 0
.../{ => skywalking}/templates/ui-ingress.yaml | 0
.../6.1.0/{ => skywalking}/templates/ui-svc.yaml | 0
helm-chart/6.1.0/skywalking/values.yaml| 247 +
helm-chart/6.1.0/values.yaml | 82 ---
20 files changed, 252 insertions(+), 83 deletions(-)
diff --git a/helm-chart/6.0.0-GA/skywalking/Chart.yaml
b/helm-chart/6.0.0-GA/skywalking/Chart.yaml
index 1490ee9..566ff3c 100644
--- a/helm-chart/6.0.0-GA/skywalking/Chart.yaml
+++ b/helm-chart/6.0.0-GA/skywalking/Chart.yaml
@@ -6,4 +6,6 @@ version: 0.1.0
icon:
https://github.com/apache/skywalking-kubernetes/blob/master/logo/skywalking-logo2.png
maintainers:
- name: innerpeacez
- email: innerpeace.z...@gmail.com
\ No newline at end of file
+ email: innerpeace.z...@gmail.com
+- name: hanahmily
+ email: hanahm...@gmail.com
\ No newline at end of file
diff --git a/helm-chart/6.1.0/.helmignore
b/helm-chart/6.1.0/skywalking/.helmignore
similarity index 100%
rename from helm-chart/6.1.0/.helmignore
rename to helm-chart/6.1.0/skywalking/.helmignore
diff --git a/helm-chart/6.1.0/Chart.yaml
b/helm-chart/6.1.0/skywalking/Chart.yaml
similarity index 87%
rename from helm-chart/6.1.0/Chart.yaml
rename to helm-chart/6.1.0/skywalking/Chart.yaml
index df60971..5c9a852 100644
--- a/helm-chart/6.1.0/Chart.yaml
+++ b/helm-chart/6.1.0/skywalking/Chart.yaml
@@ -10,3 +10,5 @@ sources:
maintainers:
- name: hanahmily
email: hanahm...@gmail.com
+- name: innerpeacez
+ email: innerpeace.z...@gmail.com
\ No newline at end of file
diff --git a/helm-chart/6.1.0/OWNERS b/helm-chart/6.1.0/skywalking/OWNERS
similarity index 100%
rename from helm-chart/6.1.0/OWNERS
rename to helm-chart/6.1.0/skywalking/OWNERS
diff --git a/helm-chart/6.1.0/README.md b/helm-chart/6.1.0/skywalking/README.md
similarity index 100%
rename from helm-chart/6.1.0/README.md
rename to helm-chart/6.1.0/skywalking/README.md
diff --git a/helm-chart/6.1.0/requirements.lock
b/helm-chart/6.1.0/skywalking/requirements.lock
similarity index 100%
rename from helm-chart/6.1.0/requirements.lock
rename to helm-chart/6.1.0/skywalking/requirements.lock
diff --git a/helm-chart/6.1.0/requirements.yaml
b/helm-chart/6.1.0/skywalking/requirements.yaml
similarity index 100%
rename from helm-chart/6.1.0/requirements.yaml
rename to helm-chart/6.1.0/skywalking/requirements.yaml
diff --git a/helm-chart/6.1.0/templates/NOTES.txt
b/helm-chart/6.1.0/skywalking/templates/NOTES.txt
similarity index 100%
rename from helm-chart/6.1.0/templates/NOTES.txt
rename to helm-chart/6.1.0/skywalking/templates/NOTES.txt
diff --git a/helm-chart/6.1.0/templates/_helpers.tpl
b/helm-chart/6.1.0/skywalking/templates/_helpers.tpl
similarity index 100%
rename from helm-chart/6.1.0/templates/_helpers.tpl
rename to helm-chart/6.1.0/skywalking/templates/_helpers.tpl
diff --git a/helm-chart/6.1.0/templates/es-init.job.yaml
b/helm-chart/6.1.0/skywalking/templates/es-init.job.yaml
similarity index 100%
rename from helm-chart/6.1.0/templates/es-init.job.yaml
rename to helm-chart/6.1.0/skywalking/templates/es-init.job.yaml
diff --git a/helm-chart/6.1.0/templates/oap-deployment.yaml
b/helm-chart/6.1.0/skywalking/templates/oap-deployment.yaml
similarity index 100%
rename from helm-chart/6.1.0/templates/oap-deployment.yaml
rename to helm-chart/6.1.0/skywalking/templates/oap-deployment.yaml
diff --git a/helm-chart/6.1.0/templates/oap-role.yaml
b/helm-chart/6.1.0/skywalking/templates/oap-role.yaml
similarity index 100%
rename from helm-chart/6.1.0/templates/oap-role.yaml
rename to helm-chart/6.1.0/skywalking/templates/oap-role.yaml
diff --git a/helm-chart/6.1.0/templates/oap-ro
[skywalking-kubernetes] 23/48: skywalking logo (#10)
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 <37059529+innerpea...@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 000..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 000..99f087c Binary files /dev/null and b/logo/skywalking-logo2.png differ
[skywalking-kubernetes] 05/48: Update 03-statefulset.yml
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 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] 25/48: Merge pull request #11 from innerpeacez/charts
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 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] 17/48: Merge pull request #4 from ica10888/master
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 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] 27/48: fix ui 6.0-GA cann't connect oap 6.0
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 <46754544+tristan-...@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: "2"
[skywalking-kubernetes] 07/48: Add 6.0.0-alpha scripts
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
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: skywalk
[skywalking-kubernetes] tag v1.0.0 created (now aa66e88)
This is an automated email from the ASF dual-hosted git repository. innerpeacez pushed a change to tag v1.0.0 in repository https://gitbox.apache.org/repos/asf/skywalking-kubernetes.git. at aa66e88 (commit) No new revisions were added by this update.
[skywalking-kubernetes] 01/01: Merge pull request #35 from apache/JaredTan95-patch-1
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 607c8af78b5271e2cd4c83ec71ca12aa80cc6b70 Merge: aa66e88 abe274d Author: innerpeacez AuthorDate: Fri Dec 27 10:31:33 2019 +0800 Merge pull request #35 from apache/JaredTan95-patch-1 Update NOTES.txt chart/skywalking/templates/NOTES.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[skywalking-kubernetes] branch master updated (aa66e88 -> 607c8af)
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 aa66e88 Merge pull request #34 from innerpeacez/makefile add abe274d Update NOTES.txt new 607c8af Merge pull request #35 from apache/JaredTan95-patch-1 The 1 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: chart/skywalking/templates/NOTES.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[skywalking-kubernetes] annotated tag v1.1.0 updated (370e651 -> 79209c4)
This is an automated email from the ASF dual-hosted git repository. innerpeacez pushed a change to annotated tag v1.1.0 in repository https://gitbox.apache.org/repos/asf/skywalking-kubernetes.git. *** WARNING: tag v1.1.0 was modified! *** from 370e651 (commit) to 79209c4 (tag) tagging 370e651b54132feef7fb7c6342c7b31a20043357 (commit) replaces 6.0.0-alpha by innerpeacez on Thu Mar 12 21:35:19 2020 +0800 - Log - v1.1.0 --- No new revisions were added by this update. Summary of changes:
[skywalking-kubernetes] annotated tag v2.0.0 updated (66690b7 -> 870466d)
This is an automated email from the ASF dual-hosted git repository. innerpeacez pushed a change to annotated tag v2.0.0 in repository https://gitbox.apache.org/repos/asf/skywalking-kubernetes.git. *** WARNING: tag v2.0.0 was modified! *** from 66690b7 (commit) to 870466d (tag) tagging 66690b7ed64dfff078c2c79df0e5d441cffb0d5f (commit) replaces v1.1.0 by innerpeacez on Thu Mar 26 17:16:56 2020 +0800 - Log - chart release 2.0.0 --- No new revisions were added by this update. Summary of changes:
[skywalking-kubernetes] 01/01: legacy-helm-chart branch
This is an automated email from the ASF dual-hosted git repository. innerpeacez pushed a commit to branch legacy-helm-chart in repository https://gitbox.apache.org/repos/asf/skywalking-kubernetes.git commit 32db90dfa3aa7e44e2dcc5aa042a68bf1cddcddb Author: innerpeacez AuthorDate: Mon Nov 18 16:49:45 2019 +0800 legacy-helm-chart branch --- helm-chart/helm3/6.5.0/skywalking/.helmignore | 22 -- helm-chart/helm3/6.5.0/skywalking/Chart.yaml | 20 -- helm-chart/helm3/6.5.0/skywalking/OWNERS | 8 - helm-chart/helm3/6.5.0/skywalking/README.md| 214 -- .../helm3/6.5.0/skywalking/templates/NOTES.txt | 25 -- .../helm3/6.5.0/skywalking/templates/_helpers.tpl | 61 - .../6.5.0/skywalking/templates/es-init.job.yaml| 38 .../skywalking/templates/oap-clusterrole.yaml | 18 -- .../templates/oap-clusterrolebinding.yaml | 19 -- .../6.5.0/skywalking/templates/oap-deployment.yaml | 103 - .../helm3/6.5.0/skywalking/templates/oap-role.yaml | 15 -- .../skywalking/templates/oap-rolebinding.yaml | 19 -- .../skywalking/templates/oap-serviceaccount.yaml | 10 - .../helm3/6.5.0/skywalking/templates/oap-svc.yaml | 21 -- .../6.5.0/skywalking/templates/ui-deployment.yaml | 42 .../6.5.0/skywalking/templates/ui-ingress.yaml | 34 --- .../helm3/6.5.0/skywalking/templates/ui-svc.yaml | 48 helm-chart/helm3/6.5.0/skywalking/values.yaml | 251 - 18 files changed, 968 deletions(-) diff --git a/helm-chart/helm3/6.5.0/skywalking/.helmignore b/helm-chart/helm3/6.5.0/skywalking/.helmignore deleted file mode 100644 index 7c04072..000 --- a/helm-chart/helm3/6.5.0/skywalking/.helmignore +++ /dev/null @@ -1,22 +0,0 @@ -# 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.5.0/skywalking/Chart.yaml b/helm-chart/helm3/6.5.0/skywalking/Chart.yaml deleted file mode 100644 index 68adea0..000 --- a/helm-chart/helm3/6.5.0/skywalking/Chart.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: v2 -name: skywalking -home: https://skywalking.apache.org -version: 1.0.0 -appVersion: 6.5.0 -description: Apache SkyWalking APM System -icon: https://raw.githubusercontent.com/apache/skywalking-kubernetes/master/logo/sw-logo-for-chart.jpg -sources: -- https://github.com/apache/skywalking-kubernetes -maintainers: -- name: hanahmily - email: hanahm...@gmail.com -- name: innerpeacez - email: innerpeace.z...@gmail.com - -dependencies: - - name: elasticsearch -version: ~1.32.0 -repository: https://kubernetes-charts.storage.googleapis.com/ -condition: elasticsearch.enabled \ No newline at end of file diff --git a/helm-chart/helm3/6.5.0/skywalking/OWNERS b/helm-chart/helm3/6.5.0/skywalking/OWNERS deleted file mode 100644 index 980b53a..000 --- a/helm-chart/helm3/6.5.0/skywalking/OWNERS +++ /dev/null @@ -1,8 +0,0 @@ -approvers: -- hanahmily -- wu-sheng -- innerpeacez -reviewers: -- hanahmily -- wu-sheng -- innerpeacez \ No newline at end of file diff --git a/helm-chart/helm3/6.5.0/skywalking/README.md b/helm-chart/helm3/6.5.0/skywalking/README.md deleted file mode 100644 index d37afd0..000 --- a/helm-chart/helm3/6.5.0/skywalking/README.md +++ /dev/null @@ -1,214 +0,0 @@ -# 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 -``` - -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 uninstall my-release -n -``` - -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. - -| Parame
[skywalking-kubernetes] branch legacy-helm-chart created (now 32db90d)
This is an automated email from the ASF dual-hosted git repository. innerpeacez pushed a change to branch legacy-helm-chart in repository https://gitbox.apache.org/repos/asf/skywalking-kubernetes.git. at 32db90d legacy-helm-chart branch This branch includes the following new commits: new 32db90d legacy-helm-chart branch The 1 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.
[skywalking-kubernetes] branch master updated: fix https://github.com/apache/skywalking/issues/4512 (#41)
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
The following commit(s) were added to refs/heads/master by this push:
new e2cf8ef fix https://github.com/apache/skywalking/issues/4512 (#41)
e2cf8ef is described below
commit e2cf8ef371707dc54a4469573f80e4cec8d7906a
Author: vision-ken
AuthorDate: Tue Mar 24 09:02:17 2020 +0800
fix https://github.com/apache/skywalking/issues/4512 (#41)
* fix https://github.com/apache/skywalking/issues/4512
* give tips in the values.yaml file.
* put es account config under the elasticsearch.config.xx
* determine whether these two keys exist
* add tips
---
chart/skywalking/templates/es-init.job.yaml| 14 +-
chart/skywalking/templates/oap-deployment.yaml | 8
chart/skywalking/values-es6.yaml | 2 ++
chart/skywalking/values.yaml | 2 ++
4 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/chart/skywalking/templates/es-init.job.yaml
b/chart/skywalking/templates/es-init.job.yaml
index c415902..7e3a01f 100644
--- a/chart/skywalking/templates/es-init.job.yaml
+++ b/chart/skywalking/templates/es-init.job.yaml
@@ -54,4 +54,16 @@ spec:
value: "{{ .Values.elasticsearch.clusterName }}-{{
.Values.elasticsearch.nodeGroup }}:{{ .Values.elasticsearch.httpPort }}"
{{- else }}
value: "{{ .Values.elasticsearch.config.host }}:{{
.Values.elasticsearch.config.port.http }}"
-{{- end }}
\ No newline at end of file
+{{- end }}
+{{- if .Values.elasticsearch.config.user }}
+- name: SW_ES_USER
+ value: "{{ .Values.elasticsearch.config.user }}"
+{{- end }}
+{{- if .Values.elasticsearch.config.password }}
+- name: SW_ES_PASSWORD
+ value: "{{ .Values.elasticsearch.config.password }}"
+{{- end }}
+{{- range $key, $value := .Values.oap.env }}
+- name: {{ $key }}
+ value: {{ $value | quote }}
+{{- end }}
diff --git a/chart/skywalking/templates/oap-deployment.yaml
b/chart/skywalking/templates/oap-deployment.yaml
index a82f3e6..5f75524 100644
--- a/chart/skywalking/templates/oap-deployment.yaml
+++ b/chart/skywalking/templates/oap-deployment.yaml
@@ -126,6 +126,14 @@ spec:
{{- else }}
value: "{{ .Values.elasticsearch.config.host }}:{{
.Values.elasticsearch.config.port.http }}"
{{- end }}
+{{- if .Values.elasticsearch.config.user }}
+- name: SW_ES_USER
+ value: "{{ .Values.elasticsearch.config.user }}"
+{{- end }}
+{{- if .Values.elasticsearch.config.password }}
+- name: SW_ES_PASSWORD
+ value: "{{ .Values.elasticsearch.config.password }}"
+{{- end }}
{{- range $key, $value := .Values.oap.env }}
- name: {{ $key }}
value: {{ $value | quote }}
diff --git a/chart/skywalking/values-es6.yaml b/chart/skywalking/values-es6.yaml
index 15467f8..e7647d6 100644
--- a/chart/skywalking/values-es6.yaml
+++ b/chart/skywalking/values-es6.yaml
@@ -104,6 +104,8 @@ elasticsearch:
#port:
# http: 9200
#host: elasticsearch # es service on kubernetes or host
+#user: "xxx"
+#password: "xxx"
clusterName: "elasticsearch"
nodeGroup: "master"
diff --git a/chart/skywalking/values.yaml b/chart/skywalking/values.yaml
index 2d3a38a..883b97e 100644
--- a/chart/skywalking/values.yaml
+++ b/chart/skywalking/values.yaml
@@ -104,6 +104,8 @@ elasticsearch:
#port:
# http: 9200
#host: elasticsearch # es service on kubernetes or host
+#user: "xxx"
+#password: "xxx"
clusterName: "elasticsearch"
nodeGroup: "master"
[skywalking-kubernetes] branch master updated: rm SW_ENVOY_ALS_ENABLED (#54)
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
The following commit(s) were added to refs/heads/master by this push:
new 419cd1a rm SW_ENVOY_ALS_ENABLED (#54)
419cd1a is described below
commit 419cd1aed8bb4ad972208e5a031527a25d2ae690
Author: innerpeacez
AuthorDate: Tue Sep 1 20:42:51 2020 +0800
rm SW_ENVOY_ALS_ENABLED (#54)
---
chart/skywalking/templates/oap-deployment.yaml | 4
1 file changed, 4 deletions(-)
diff --git a/chart/skywalking/templates/oap-deployment.yaml
b/chart/skywalking/templates/oap-deployment.yaml
index 60d0388..c70782d 100644
--- a/chart/skywalking/templates/oap-deployment.yaml
+++ b/chart/skywalking/templates/oap-deployment.yaml
@@ -122,10 +122,6 @@ spec:
fieldPath: metadata.uid
- name: SW_STORAGE
value: {{ .Values.oap.storageType }}
-{{- 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
{{- if .Values.elasticsearch.enabled }}
value: "{{ .Values.elasticsearch.clusterName }}-{{
.Values.elasticsearch.nodeGroup }}:{{ .Values.elasticsearch.httpPort }}"
[skywalking-kubernetes] branch master updated: Add Values for init container in case of using private regestry; fix a whitespace/newline trimming bug (#53)
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
The following commit(s) were added to refs/heads/master by this push:
new e7073eb Add Values for init container in case of using private
regestry;fix a whitespace/newline trimming bug (#53)
e7073eb is described below
commit e7073ebf43bedb51ab02dffa6dafcba6772f84e6
Author: glongzh
AuthorDate: Thu Aug 27 09:31:54 2020 +0800
Add Values for init container in case of using private regestry;fix a
whitespace/newline trimming bug (#53)
* Add Values for init container in case of using private regestry; Fix
ingress indent issue
* fix a whitespace/newline trimming bug
---
chart/skywalking/templates/_helpers.tpl| 2 +-
chart/skywalking/templates/ui-ingress.yaml | 4 ++--
chart/skywalking/values.yaml | 4 +++-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/chart/skywalking/templates/_helpers.tpl
b/chart/skywalking/templates/_helpers.tpl
index 0aef730..bf17d47 100644
--- a/chart/skywalking/templates/_helpers.tpl
+++ b/chart/skywalking/templates/_helpers.tpl
@@ -65,7 +65,7 @@ Create the name of the service account to use for the oap
cluster
{{- define "skywalking.containers.wait-for-es" -}}
- name: wait-for-elasticsearch
- image: busybox:1.30
+ image: {{ .Values.initContainer.image }}:{{ .Values.initContainer.tag }}
imagePullPolicy: IfNotPresent
{{- if .Values.elasticsearch.enabled }}
command: ['sh', '-c', 'for i in $(seq 1 60); do nc -z -w3 {{
.Values.elasticsearch.clusterName }}-{{ .Values.elasticsearch.nodeGroup }} {{
.Values.elasticsearch.httpPort }} && exit 0 || sleep 5; done; exit 1']
diff --git a/chart/skywalking/templates/ui-ingress.yaml
b/chart/skywalking/templates/ui-ingress.yaml
index b2ceb31..b12f3bc 100644
--- a/chart/skywalking/templates/ui-ingress.yaml
+++ b/chart/skywalking/templates/ui-ingress.yaml
@@ -14,8 +14,8 @@
# limitations under the License.
{{- if .Values.ui.ingress.enabled }}
-{{- $serviceName := include "skywalking.ui.fullname" . -}}
-{{- $servicePort := .Values.ui.service.externalPort -}}
+{{- $serviceName := include "skywalking.ui.fullname" . }}
+{{- $servicePort := .Values.ui.service.externalPort }}
apiVersion: extensions/v1beta1
kind: Ingress
metadata:
diff --git a/chart/skywalking/values.yaml b/chart/skywalking/values.yaml
index 6960591..dd4c1a0 100644
--- a/chart/skywalking/values.yaml
+++ b/chart/skywalking/values.yaml
@@ -19,7 +19,9 @@
serviceAccounts:
oap:
-
+initContainer:
+ image: busybox
+ tag: '1.30'
oap:
name: oap
# When 'dynamicConfigEnabled' set to true, enable oap dynamic configuration
through k8s configmap，
[skywalking-kubernetes] tag v3.1.0 created (now d383403)
This is an automated email from the ASF dual-hosted git repository. innerpeacez pushed a change to tag v3.1.0 in repository https://gitbox.apache.org/repos/asf/skywalking-kubernetes.git. at d383403 (commit) No new revisions were added by this update.
[skywalking-kubernetes] tag v3.0.0 created (now 25ca1ba)
This is an automated email from the ASF dual-hosted git repository. innerpeacez pushed a change to tag v3.0.0 in repository https://gitbox.apache.org/repos/asf/skywalking-kubernetes.git. at 25ca1ba (commit) No new revisions were added by this update.
[skywalking-website] branch master updated: chart 3.0.0 (#97)
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-website.git
The following commit(s) were added to refs/heads/master by this push:
new 5c14db9 chart 3.0.0 (#97)
5c14db9 is described below
commit 5c14db9c71c83a2c3330d1fae31b0fda1d47ad0d
Author: innerpeacez
AuthorDate: Sat Jun 27 19:19:22 2020 +0800
chart 3.0.0 (#97)
---
docs/.vuepress/config.js| 6 +++---
docs/README.md | 6 +++---
docs/downloads/README.md| 4 ++--
docs/events/README.md | 5 +
docs/zh/README.md | 8
docs/zh/downloads/README.md | 4 ++--
docs/zh/events/README.md| 5 +
7 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js
index aca3287..4cc7526 100755
--- a/docs/.vuepress/config.js
+++ b/docs/.vuepress/config.js
@@ -34,8 +34,8 @@ module.exports = {
{ text: '6.5.0', link:
"https://github.com/apache/skywalking/tree/v6.5.0/docs"},
{ text: 'Nginx LUA 0.1.0', link:
"https://github.com/apache/skywalking-nginx-lua/tree/v0.1.0"},
{ text: 'CLI 0.1.0', link:
"https://github.com/apache/skywalking-cli/tree/0.1.0"},
+{ text: 'Kubernetes helm 3.0.0', link:
"https://github.com/apache/skywalking-kubernetes/tree/v3.1.0"},
{ text: 'Kubernetes helm 2.0.0', link:
"https://github.com/apache/skywalking-kubernetes/tree/v2.0.0"},
-{ text: 'Kubernetes helm 1.1.0', link:
"https://github.com/apache/skywalking-kubernetes/tree/v1.1.0"},
], },
{ text: "GitHub", items: [
{ text: 'Main Repo, Javaagent and Backend', link:
"https://github.com/apache/skywalking/; },
@@ -85,8 +85,8 @@ module.exports = {
{ text: '6.5.0', link:
"https://github.com/apache/skywalking/tree/v6.5.0/docs"},
{ text: 'Nginx LUA 0.1.0', link:
"https://github.com/apache/skywalking-nginx-lua/tree/v0.1.0"},
{ text: 'CLI 0.1.0', link:
"https://github.com/apache/skywalking-cli/tree/0.1.0"},
- { text: 'Kubernetes helm 1.1.0', link:
"https://github.com/apache/skywalking-kubernetes/tree/v1.1.0"},
- { text: 'Kubernetes helm 1.0.0', link:
"https://github.com/apache/skywalking-kubernetes/tree/v1.0.0"},
+ { text: 'Kubernetes helm 3.0.0', link:
"https://github.com/apache/skywalking-kubernetes/tree/v3.1.0"},
+ { text: 'Kubernetes helm 2.0.0', link:
"https://github.com/apache/skywalking-kubernetes/tree/v2.0.0"},
],
},
{ text: "GitHub", items: [
diff --git a/docs/README.md b/docs/README.md
index 234837a..f3a7be4 100755
--- a/docs/README.md
+++ b/docs/README.md
@@ -27,6 +27,9 @@ user:
news:
title: Events & News
content:
+ - header: SkyWalking Chart 3.0.0 is released
+content: Support deploy SkyWalking 8.0.1.
+time: Jun. 27th, 2020
- header: SkyWalking Nginx LUA 0.2.0 released
content: Adapt the new v3 protocol. Implement correlation protocol and
support batch segment report.
time: Jun. 21th, 2020
@@ -36,6 +39,3 @@ news:
- header: Welcome Wei Zhang to join the PMC
content: Based on his continuous contributions, Wei Zhang (a.k.a
[arugal](https://github.com/arugal)) has been invited to join the PMC. Welcome
aboard.
time: Apr. 20th, 2020
- - header: SkyWalking Chart 2.0.0 is released
-content: Support deploy SkyWalking 7.0.0.
-time: Mar. 31th, 2020
diff --git a/docs/downloads/README.md b/docs/downloads/README.md
index 16ce369..6c472df 100755
--- a/docs/downloads/README.md
+++ b/docs/downloads/README.md
@@ -50,10 +50,10 @@ SkyWalking Nginx LUA agent requires SkyWalking APM 7.0+.
### SkyWalking Chart
| Date | Version| | Downloads |
|:---:|:--:|:--:|:--:|
+| Jun. 27th, 2020 | 3.0.0 for SkyWalking 8.0.1 | Source code|
[[src]](https://www.apache.org/dyn/closer.cgi/skywalking/kubernetes/3.0.0/skywalking-kubernetes-3.0.0-src.tgz)
[[asc]](https://downloads.apache.org/skywalking/kubernetes/3.0.0/skywalking-kubernetes-3.0.0-src.tgz.asc)
[[sha512]](https://downloads.apache.org/skywalking/kubernetes/3.0.0/skywalking-kubernetes-3.0.0-src.tgz.sha512)|
+| | | Binary Distribution (Kubernetes)|
[[tgz]](https://www.apache.org/dyn/closer.cgi/skywalking/kubernetes/3.0.0/skywalking-3.0.0.tgz)
[[asc]](https://downloads.apache.org/skywalking/kubernetes/3.0.0/skywalking-3.0.0.tgz.asc)
[[sha512]](https://downloads.apache.org/skywalking/kubernetes/3.0.0/skywalking-3.0.0.tgz.sha512)|
| Mar. 31th, 2020 | 2.0.0 for SkyWalking 7.0.0 | Source code|
[[src]](https://www.apache.org/dyn/closer.cgi/skywalking/kubernetes/2.0.0/skywalking-kubernetes-2.0.0-src.tgz)
[[asc]](https://downloads.apache.org/skywalking/kubernetes/
[skywalking-kubernetes] branch master updated: update oap-deployment with danamic add more ports. (#72)
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
The following commit(s) were added to refs/heads/master by this push:
new 0968383 update oap-deployment with danamic add more ports. (#72)
0968383 is described below
commit 09683837b6f29b6793084081a0f0a0fdc1f647ee
Author: Jared Tan
AuthorDate: Thu Jun 24 13:45:38 2021 +0800
update oap-deployment with danamic add more ports. (#72)
* update oap-deployment with danamic add more ports.
* polish
---
chart/skywalking/templates/oap-deployment.yaml | 8
chart/skywalking/values.yaml | 2 ++
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/chart/skywalking/templates/oap-deployment.yaml
b/chart/skywalking/templates/oap-deployment.yaml
index 40f1ce4..560e9db 100644
--- a/chart/skywalking/templates/oap-deployment.yaml
+++ b/chart/skywalking/templates/oap-deployment.yaml
@@ -99,10 +99,10 @@ spec:
initialDelaySeconds: 15
periodSeconds: 20
ports:
-- containerPort: 11800
- name: grpc
-- containerPort: 12800
- name: rest
+{{- range $key, $value := .Values.oap.ports }}
+- containerPort: {{ $value }}
+ name: {{ $key }}
+{{- end }}
{{- if .Values.oap.resources }}
resources:
{{ toYaml .Values.oap.resources | indent 10 }}
diff --git a/chart/skywalking/values.yaml b/chart/skywalking/values.yaml
index 4a36230..ee7f6c9 100644
--- a/chart/skywalking/values.yaml
+++ b/chart/skywalking/values.yaml
@@ -38,6 +38,8 @@ oap:
pullPolicy: IfNotPresent
storageType: null
ports:
+# add more ports here if you need, for example
+# zabbix: 10051
grpc: 11800
rest: 12800
replicas: 2
[skywalking-kubernetes] branch master updated: Improve notes.txt (#67)
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
The following commit(s) were added to refs/heads/master by this push:
new 266b011 Improve notes.txt (#67)
266b011 is described below
commit 266b0112cedf0ea278a6932195b1abc3c5cf5e78
Author: Shiwen Cheng
AuthorDate: Thu Apr 15 15:08:15 2021 +0800
Improve notes.txt (#67)
Co-authored-by: innerpeacez
---
chart/skywalking/templates/NOTES.txt | 3 +--
chart/skywalking/values.yaml | 4
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/chart/skywalking/templates/NOTES.txt
b/chart/skywalking/templates/NOTES.txt
index 38bdc2f..87304ff 100644
--- a/chart/skywalking/templates/NOTES.txt
+++ b/chart/skywalking/templates/NOTES.txt
@@ -42,9 +42,8 @@ Get the UI URL by running these commands:
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 }}
--namespace {{ .Release.Namespace }}
+ kubectl port-forward svc/{{ include "skywalking.ui.fullname" . }} 8080:{{
.Values.ui.service.externalPort }} --namespace {{ .Release.Namespace }}
{{- end }}
{{- if.Values.elasticsearch.enabled }}
diff --git a/chart/skywalking/values.yaml b/chart/skywalking/values.yaml
index 9e314f9..4a36230 100644
--- a/chart/skywalking/values.yaml
+++ b/chart/skywalking/values.yaml
@@ -97,6 +97,10 @@ ui:
# clusterIP: None
externalPort: 80
internalPort: 8080
+## nodePort is the port on each node on which this service is exposed when
type=NodePort
+## Default: auto-allocated port if not specified. 30080 is just an example
+##
+# nodePort: 30080
## External IP addresses of service
## Default: nil
##
[skywalking-kubernetes] branch master updated: fix ports not exposed (#76)
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
The following commit(s) were added to refs/heads/master by this push:
new f17232c fix ports not exposed (#76)
f17232c is described below
commit f17232c608c51a760035fb5183e47555426a5fdf
Author: Jared Tan
AuthorDate: Thu Jul 15 18:02:08 2021 +0800
fix ports not exposed (#76)
---
chart/skywalking/templates/oap-svc.yaml | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/chart/skywalking/templates/oap-svc.yaml
b/chart/skywalking/templates/oap-svc.yaml
index aefe78a..8a04ec6 100644
--- a/chart/skywalking/templates/oap-svc.yaml
+++ b/chart/skywalking/templates/oap-svc.yaml
@@ -26,10 +26,10 @@ metadata:
spec:
type: {{ .Values.oap.service.type }}
ports:
- - port: {{ .Values.oap.ports.rest }}
-name: rest
- - port: {{ .Values.oap.ports.grpc }}
-name: grpc
+ {{- range $key, $value := .Values.oap.ports }}
+ - port: {{ $value }}
+name: {{ $key }}
+ {{- end }}
selector:
app: {{ template "skywalking.name" . }}
component: "{{ .Values.oap.name }}"
[skywalking-kubernetes] branch master updated: add namespaces resources (#113)
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
The following commit(s) were added to refs/heads/master by this push:
new febbcac add namespaces resources (#113)
febbcac is described below
commit febbcac96fef0974fb94abee647dab116f7c20a5
Author: innerpeacez
AuthorDate: Wed Mar 22 14:57:58 2023 +0800
add namespaces resources (#113)
---
chart/skywalking/templates/oap-clusterrole.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chart/skywalking/templates/oap-clusterrole.yaml
b/chart/skywalking/templates/oap-clusterrole.yaml
index f38ef68..591d5ec 100644
--- a/chart/skywalking/templates/oap-clusterrole.yaml
+++ b/chart/skywalking/templates/oap-clusterrole.yaml
@@ -25,7 +25,7 @@ metadata:
heritage: "{{ .Release.Service }}"
rules:
- apiGroups: [""]
- resources: ["pods", "pods/log", "endpoints", "services", "nodes"]
+ resources: ["pods", "pods/log", "endpoints", "services", "nodes",
"namespaces"]
verbs: ["get", "watch", "list"]
- apiGroups: ["extensions"]
resources: ["deployments", "replicasets"]
[skywalking-kubernetes] branch master updated: Adding support for zipkin UI (#127)
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 The following commit(s) were added to refs/heads/master by this push: new 73f5788 Adding support for zipkin UI (#127) 73f5788 is described below commit 73f5788997b0c5d54eb87317255e3e29bf9e1058 Author: ChrisFisher <55266940+yangfish...@users.noreply.github.com> AuthorDate: Tue Jul 25 21:38:01 2023 +0800 Adding support for zipkin UI (#127) --- chart/skywalking/README.md | 2 ++ chart/skywalking/templates/oap-deployment.yaml | 12 chart/skywalking/templates/ui-deployment.yaml | 4 chart/skywalking/values.yaml | 2 ++ 4 files changed, 20 insertions(+) diff --git a/chart/skywalking/README.md b/chart/skywalking/README.md index 757ccf8..ea9675e 100644 --- a/chart/skywalking/README.md +++ b/chart/skywalking/README.md @@ -53,6 +53,8 @@ The following table lists the configurable parameters of the Skywalking chart an | `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.ports.zipkinreceiver` | OAP http port for Zipkin receiver(not exposed by default) | `9411` [...] +| `oap.ports.zipkinquery` | OAP http port for querying Zipkin traces and UI(not exposed by default) | `9412` [...] | `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
[skywalking] branch master updated: Filter out unknown_cluster metric data in `elasticsearch-monitoring` (#10801)
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.git
The following commit(s) were added to refs/heads/master by this push:
new f8567f7907 Filter out unknown_cluster metric data in
`elasticsearch-monitoring` (#10801)
f8567f7907 is described below
commit f8567f7907f91aec72630b1cd73f0088c9c9a917
Author: innerpeacez
AuthorDate: Mon May 15 11:32:05 2023 +0800
Filter out unknown_cluster metric data in `elasticsearch-monitoring`
(#10801)
* filter unknown_cluster
* add changes
---
docs/en/changes/changes.md | 1 +
.../elasticsearch/elasticsearch-cluster.yaml | 28 +++
.../elasticsearch/elasticsearch-index.yaml | 86 +--
.../elasticsearch/elasticsearch-node.yaml | 98 +++---
4 files changed, 107 insertions(+), 106 deletions(-)
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index 054997624f..f533cac61b 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -43,6 +43,7 @@
* Support `exportErrorStatusTraceOnly` for export the error status trace
segments through the Kafka channel
* Add component ID for Grizzly.
* Fix potential NPE in Zipkin receiver when the `Span` is missing some fields.
+* Filter out unknown_cluster metric data.
UI
* Revert: cpm5d function. This feature is cancelled from backend.
diff --git
a/oap-server/server-starter/src/main/resources/otel-rules/elasticsearch/elasticsearch-cluster.yaml
b/oap-server/server-starter/src/main/resources/otel-rules/elasticsearch/elasticsearch-cluster.yaml
index 2f324d7b46..50b1e8b092 100644
---
a/oap-server/server-starter/src/main/resources/otel-rules/elasticsearch/elasticsearch-cluster.yaml
+++
b/oap-server/server-starter/src/main/resources/otel-rules/elasticsearch/elasticsearch-cluster.yaml
@@ -34,39 +34,39 @@ metricPrefix: meter_elasticsearch_cluster
metricsRules:
# cluster health
- name: health_status
-exp: elasticsearch_cluster_health_status.valueEqual(1).sum(['cluster' ,
'color'])
+exp:
elasticsearch_cluster_health_status.tagNotEqual('cluster','unknown_cluster').valueEqual(1).sum(['cluster'
, 'color'])
# elasticsearch_breakers_tripped
- name: breakers_tripped
-exp: elasticsearch_breakers_tripped.sum(['cluster']).increase('PT1M')
+exp:
elasticsearch_breakers_tripped.tagNotEqual('cluster','unknown_cluster').sum(['cluster']).increase('PT1M')
# cluster nodes
- name: nodes
-exp: elasticsearch_cluster_health_number_of_nodes.sum(['cluster'])
+exp:
elasticsearch_cluster_health_number_of_nodes.tagNotEqual('cluster','unknown_cluster').sum(['cluster'])
# cluster data nodes
- name: data_nodes
-exp: elasticsearch_cluster_health_number_of_data_nodes.sum(['cluster'])
+exp:
elasticsearch_cluster_health_number_of_data_nodes.tagNotEqual('cluster','unknown_cluster').sum(['cluster'])
# pending tasks total
- name: pending_tasks_total
-exp: elasticsearch_cluster_health_number_of_pending_tasks.sum(['cluster'])
+exp:
elasticsearch_cluster_health_number_of_pending_tasks.tagNotEqual('cluster','unknown_cluster').sum(['cluster'])
# cpu usage avg
- name: cpu_usage_avg
-exp: elasticsearch_process_cpu_percent.avg(['cluster'])
+exp:
elasticsearch_process_cpu_percent.tagNotEqual('cluster','unknown_cluster').avg(['cluster'])
# jvm used memory avg
- name: jvm_memory_used_avg
-exp: elasticsearch_jvm_memory_used_bytes.sum(['cluster']) /
elasticsearch_jvm_memory_max_bytes.sum(['cluster']) * 100
+exp:
elasticsearch_jvm_memory_used_bytes.tagNotEqual('cluster','unknown_cluster').sum(['cluster'])
/
elasticsearch_jvm_memory_max_bytes.tagNotEqual('cluster','unknown_cluster').sum(['cluster'])
* 100
# open file count
- name: open_file_count
-exp: elasticsearch_process_open_files_count.sum(['cluster'])
+exp:
elasticsearch_process_open_files_count.tagNotEqual('cluster','unknown_cluster').sum(['cluster'])
# shards
- name: primary_shards_total
-exp: elasticsearch_cluster_health_active_primary_shards.sum(['cluster'])
+exp:
elasticsearch_cluster_health_active_primary_shards.tagNotEqual('cluster','unknown_cluster').sum(['cluster'])
- name: shards_total
-exp: elasticsearch_cluster_health_active_shards.sum(['cluster'])
+exp:
elasticsearch_cluster_health_active_shards.tagNotEqual('cluster','unknown_cluster').sum(['cluster'])
- name: initializing_shards_total
-exp: elasticsearch_cluster_health_initializing_shards.sum(['cluster'])
+exp:
elasticsearch_cluster_health_initializing_shards.tagNotEqual('cluster','unknown_cluster').sum(['cluster'])
- name: delayed_unassigned_shards_total
-exp:
elasticsearch_cluster_health_delayed_unassigned_shards.sum(['cluster'])
+exp:
elasticsearch_cluster_health_delayed_unassigned_shards.tagNotEqual('cluster
