Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
润土的好友猹
SkyWalking
提交
3e22ff5e
S
SkyWalking
项目概览
润土的好友猹
/
SkyWalking
与 Fork 源项目一致
Fork自
apache / SkyWalking
通知
9
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
SkyWalking
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
3e22ff5e
编写于
12月 03, 2019
作者:
I
innerpeacez
提交者:
wu-sheng
12月 03, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add OAP+Istio(mixer) to CI pipeline (#3904)
上级
d62f29cd
变更
22
隐藏空白更改
内联
并排
Showing
22 changed file
with
516 addition
and
43 deletion
+516
-43
.github/workflows/istio-mixer-ci.yaml
.github/workflows/istio-mixer-ci.yaml
+11
-2
install/deploy/demo-deploy.sh
install/deploy/demo-deploy.sh
+3
-1
install/deploy/istio-deploy.sh
install/deploy/istio-deploy.sh
+8
-3
install/deploy/skywalking-deploy.sh
install/deploy/skywalking-deploy.sh
+18
-4
install/kubernetes/helm/skywalking/Chart.yaml
install/kubernetes/helm/skywalking/Chart.yaml
+1
-2
install/kubernetes/helm/skywalking/charts/elasticsearch/.helmignore
...bernetes/helm/skywalking/charts/elasticsearch/.helmignore
+37
-0
install/kubernetes/helm/skywalking/charts/elasticsearch/Chart.yaml
...ubernetes/helm/skywalking/charts/elasticsearch/Chart.yaml
+42
-0
install/kubernetes/helm/skywalking/charts/elasticsearch/templates/NOTES.txt
.../helm/skywalking/charts/elasticsearch/templates/NOTES.txt
+38
-0
install/kubernetes/helm/skywalking/charts/elasticsearch/templates/_helpers.tpl
...lm/skywalking/charts/elasticsearch/templates/_helpers.tpl
+80
-0
install/kubernetes/helm/skywalking/charts/elasticsearch/templates/deployment.yaml
...skywalking/charts/elasticsearch/templates/deployment.yaml
+71
-0
install/kubernetes/helm/skywalking/charts/elasticsearch/templates/ingress.yaml
...lm/skywalking/charts/elasticsearch/templates/ingress.yaml
+31
-24
install/kubernetes/helm/skywalking/charts/elasticsearch/templates/service.yaml
...lm/skywalking/charts/elasticsearch/templates/service.yaml
+32
-0
install/kubernetes/helm/skywalking/charts/elasticsearch/templates/serviceaccount.yaml
...alking/charts/elasticsearch/templates/serviceaccount.yaml
+23
-0
install/kubernetes/helm/skywalking/charts/elasticsearch/values.yaml
...bernetes/helm/skywalking/charts/elasticsearch/values.yaml
+83
-0
install/kubernetes/helm/skywalking/templates/_helpers.tpl
install/kubernetes/helm/skywalking/templates/_helpers.tpl
+1
-1
install/kubernetes/helm/skywalking/templates/es-init.job.yaml
...all/kubernetes/helm/skywalking/templates/es-init.job.yaml
+1
-1
install/kubernetes/helm/skywalking/templates/oap-deployment.yaml
.../kubernetes/helm/skywalking/templates/oap-deployment.yaml
+2
-2
skywalking-ui
skywalking-ui
+1
-1
test/e2e-mesh/e2e-istio/scripts/clean.sh
test/e2e-mesh/e2e-istio/scripts/clean.sh
+0
-0
test/e2e-mesh/e2e-istio/scripts/compile_build.sh
test/e2e-mesh/e2e-istio/scripts/compile_build.sh
+30
-0
test/e2e-mesh/e2e-istio/scripts/minikube.sh
test/e2e-mesh/e2e-istio/scripts/minikube.sh
+0
-0
test/e2e-mesh/e2e-istio/scripts/pre.sh
test/e2e-mesh/e2e-istio/scripts/pre.sh
+3
-2
未找到文件。
.github/workflows/istio-mixer-ci.yaml
浏览文件 @
3e22ff5e
...
...
@@ -18,8 +18,9 @@ name: istio-mixer-ci
on
:
[
pull_request
]
env
:
SCRIPTS_DIR
:
./test/scripts
SCRIPTS_DIR
:
./test/
e2e-mesh/e2e-istio/
scripts
LOG_DIR
:
/tmp/skywalking
INSTALL_SCRIPTS_DIR
:
./install/deploy
jobs
:
build
:
runs-on
:
ubuntu-16.04
...
...
@@ -27,7 +28,7 @@ jobs:
-
uses
:
actions/checkout@v1
-
name
:
Prepare enviroment
run
:
|
bash
./test/scripts
/pre.sh
bash
${SCRIPTS_DIR}
/pre.sh
mkdir -p ${LOG_DIR}
-
name
:
Start minikube
run
:
bash ${SCRIPTS_DIR}/minikube.sh start > ${LOG_DIR}/minikube-start-log.txt 2>&1 &
...
...
@@ -35,6 +36,14 @@ jobs:
run
:
bash ${SCRIPTS_DIR}/minikube.sh wait
-
name
:
Setup tunnel
run
:
minikube tunnel --log_dir=${LOG_DIR} &
-
name
:
Compile all and Build docker image
run
:
bash ${SCRIPTS_DIR}/compile_build.sh
-
name
:
Istio install
run
:
bash ${INSTALL_SCRIPTS_DIR}/istio-deploy.sh
-
name
:
SW And ES install
run
:
bash ${INSTALL_SCRIPTS_DIR}/skywalking-deploy.sh
-
name
:
Bookinfo demo install
run
:
bash ${INSTALL_SCRIPTS_DIR}/demo-deploy.sh
-
uses
:
actions/upload-artifact@v1.0.0
with
:
name
:
logs
...
...
install/deploy/demo-deploy.sh
浏览文件 @
3e22ff5e
...
...
@@ -17,6 +17,8 @@
set
-e
#free -lh
# The script for bookinfo Application to deploy
BOOKINFO_VERSION
=
"1.3"
kubectl label namespace default istio-injection
=
enabled
...
...
@@ -25,7 +27,7 @@ kubectl apply -f https://raw.githubusercontent.com/istio/istio/release-${BOOKINF
# check status
kubectl get deploy |
grep
-E
'details|productpage|ratings|reviews'
|
awk
'{print "deployment/"$1}'
|
while
read
deploy
do
kubectl
rollout status
${
deploy
}
--timeout
3m
kubectl
wait
${
deploy
}
--for
condition
=
available
--timeout
=
600s
done
# request
...
...
install/deploy/istio-deploy.sh
浏览文件 @
3e22ff5e
...
...
@@ -70,13 +70,18 @@ create_crd() {
deploy_istio
()
{
NAMESPACE
=
$1
VERSION
=
$2
helm pull istio/istio
&&
tar
zxvf istio-
${
VERSION
}
.tgz
&&
rm
istio-
${
VERSION
}
.tgz
helm
install
istio istio
-n
${
NAMESPACE
}
CHART_DIR
=
"istio-skywalking-ci/install/kubernetes/helm"
git clone
-b
istio-skywalking-ci https://github.com/SkyAPMTest/istio-skywalking-ci.git
cd
$CHART_DIR
helm
install
istio istio
-n
${
NAMESPACE
}
-f
istio/values-istio-skywalking.yaml
check
()
{
kubectl
-n
${
NAMESPACE
}
get deploy |
grep
istio |
awk
'{print "deployment/"$1}'
|
while
read
line
;
do
kubectl rollout status
$line
-n
${
NAMESPACE
}
--timeout
3
m
kubectl rollout status
$line
-n
${
NAMESPACE
}
--timeout
10
m
done
}
check
...
...
install/deploy/skywalking-deploy.sh
浏览文件 @
3e22ff5e
...
...
@@ -17,7 +17,7 @@
set
-e
CHART_PATH
=
".
.
/kubernetes/helm"
CHART_PATH
=
".
/install
/kubernetes/helm"
DPELOY_NAMESPACE
=
"istio-system"
NEED_CHECK_PREFIX
=
"deployment/skywalking-skywalking-"
ALS_ENABLED
=
true
...
...
@@ -47,10 +47,24 @@ and_stable_repo
helm dep up skywalking
helm
-n
$DPELOY_NAMESPACE
install
skywalking skywalking
--set
oap.istio.adapter.enabled
=
$MIXER_ENABLED
--set
oap.envoy.als.enabled
=
$ALS_ENABLED
sudo
sysctl
-w
vm.max_map_count
=
262144
sudo
sysctl
-w
vm.drop_caches
=
1
sudo
sysctl
-w
vm.drop_caches
=
3
for
component
in
$NEED_CHECK_PREFIX
"oap"
$NEED_CHECK_PREFIX
"ui"
;
do
kubectl
-n
istio-system rollout status
$component
--timeout
3m
TAG
=
"ci"
IMAGE
=
"skywalking/oap"
docker images
helm
-n
$DPELOY_NAMESPACE
install
skywalking skywalking
--set
oap.istio.adapter.enabled
=
$MIXER_ENABLED
\
--set
oap.envoy.als.enabled
=
$ALS_ENABLED
--set
oap.replicas
=
1
--set
oap.image.tag
=
$TAG
--set
oap.image.repository
=
$IMAGE
for
component
in
$NEED_CHECK_PREFIX
"oap"
;
do
sleep
60
kubectl get deploy
-o
wide
-n
$DPELOY_NAMESPACE
kubectl
-n
${
DPELOY_NAMESPACE
}
wait
$component
--for
condition
=
available
--timeout
=
600s
done
rm
-rf
tag.txt
echo
"SkyWalking deployed successfully"
install/kubernetes/helm/skywalking/Chart.yaml
浏览文件 @
3e22ff5e
...
...
@@ -30,6 +30,5 @@ maintainers:
dependencies
:
-
name
:
elasticsearch
version
:
~1.32.0
repository
:
https://kubernetes-charts.storage.googleapis.com/
version
:
6.8.2
condition
:
elasticsearch.enabled
\ No newline at end of file
install/kubernetes/helm/skywalking/charts/elasticsearch/.helmignore
0 → 100644
浏览文件 @
3e22ff5e
# 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.
# 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
.vscode/
install/kubernetes/helm/skywalking/charts/elasticsearch/Chart.yaml
0 → 100644
浏览文件 @
3e22ff5e
# 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
:
v2
name
:
elasticsearch
description
:
A ES Helm chart for SkyWalking CI pipeline
# A chart can be either an 'application' or a 'library' chart.
#
# Application charts are a collection of templates that can be packaged into versioned archives
# to be deployed.
#
# Library charts provide useful utilities or functions for the chart developer. They're included as
# a dependency of application charts to inject those utilities and functions into the rendering
# pipeline. Library charts do not define any templates and therefore cannot be deployed.
type
:
application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
version
:
6.8.2
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application.
appVersion
:
6.8.2
maintainers
:
-
name
:
hanahmily
email
:
hanahmily@gmail.com
-
name
:
innerpeacez
email
:
innerpeace.zhai@gmail.com
\ No newline at end of file
install/kubernetes/helm/skywalking/charts/elasticsearch/templates/NOTES.txt
0 → 100644
浏览文件 @
3e22ff5e
{{/*
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.
*/}}
1. Get the application URL by running these commands:
{{- if .Values.ingress.enabled }}
{{- range $host := .Values.ingress.hosts }}
{{- range .paths }}
http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ . }}
{{- end }}
{{- end }}
{{- else if contains "NodePort" .Values.service.type }}
export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "elasticsearch.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.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 --namespace {{ .Release.Namespace }} svc -w {{ include "elasticsearch.fullname" . }}'
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "elasticsearch.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
echo http://$SERVICE_IP:{{ .Values.service.port }}
{{- else if contains "ClusterIP" .Values.service.type }}
export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "elasticsearch.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
echo "Visit http://127.0.0.1:8080 to use your application"
kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:80
{{- end }}
install/kubernetes/helm/skywalking/charts/elasticsearch/templates/_helpers.tpl
0 → 100644
浏览文件 @
3e22ff5e
{{
/*
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
.
*/
}}
{
{
/*
vim
:
set
filetype
=
mustache
:
*/
}
}
{
{
/*
Expand
the
name
of
the
chart
.
*/
}
}
{{- define "elasticsearch.name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{
{
/*
Create
a
default
fully
qualified
app
name
.
We
truncate
at
63
chars
because
some
Kubernetes
name
fields
are
limited
to
this
(
by
the
DNS
naming
spec
).
If
release
name
contains
chart
name
it
will
be
used
as
a
full
name
.
*/
}
}
{{- define "elasticsearch.fullname" -}}
{{- if .Values.fullnameOverride -}}
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- $name := default .Chart.Name .Values.nameOverride -}}
{{- if contains $name .Release.Name -}}
{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{- end -}}
{{- end -}}
{
{
/*
Create
chart
name
and
version
as
used
by
the
chart
label
.
*/
}
}
{{- define "elasticsearch.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{
{
/*
Common
labels
*/
}
}
{{- define "elasticsearch.labels" -}}
helm.sh/chart: {{ include "elasticsearch.chart" . }}
{{ include "elasticsearch.selectorLabels" . }}
{{- if .Chart.AppVersion }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- end -}}
{
{
/*
Selector
labels
*/
}
}
{{- define "elasticsearch.selectorLabels" -}}
app.kubernetes.io/name: {{ include "elasticsearch.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end -}}
{
{
/*
Create
the
name
of
the
service
account
to
use
*/
}
}
{{- define "elasticsearch.serviceAccountName" -}}
{{- if .Values.serviceAccount.create -}}
{{ default (include "elasticsearch.fullname" .) .Values.serviceAccount.name }}
{{- else -}}
{{ default "default" .Values.serviceAccount.name }}
{{- end -}}
{{- end -}}
install/kubernetes/helm/skywalking/charts/elasticsearch/templates/deployment.yaml
0 → 100644
浏览文件 @
3e22ff5e
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
apiVersion
:
apps/v1
kind
:
Deployment
metadata
:
name
:
{{
include "elasticsearch.fullname" .
}}
labels
:
{{
- include "elasticsearch.labels" . | nindent 4
}}
spec
:
replicas
:
{{
.Values.replicaCount
}}
selector
:
matchLabels
:
{{
- include "elasticsearch.selectorLabels" . | nindent 6
}}
template
:
metadata
:
labels
:
{{
- include "elasticsearch.selectorLabels" . | nindent 8
}}
spec
:
{{
- with .Values.imagePullSecrets
}}
imagePullSecrets
:
{{
- toYaml . | nindent 8
}}
{{
- end
}}
serviceAccountName
:
{{
include "elasticsearch.serviceAccountName" .
}}
securityContext
:
{{
- toYaml .Values.podSecurityContext | nindent 8
}}
containers
:
-
name
:
{{
.Chart.Name
}}
securityContext
:
{{
- toYaml .Values.securityContext | nindent 12
}}
image
:
"
{{
.Values.image.repository
}}:{{
.Chart.AppVersion
}}"
imagePullPolicy
:
{{
.Values.image.pullPolicy
}}
ports
:
-
name
:
http
containerPort
:
9200
-
name
:
transport
containerPort
:
9300
# livenessProbe:
# httpGet:
# path: /
# port: http
# readinessProbe:
# httpGet:
# path: /
# port: http
resources
:
{{
- toYaml .Values.resources | nindent 12
}}
{{
- with .Values.nodeSelector
}}
nodeSelector
:
{{
- toYaml . | nindent 8
}}
{{
- end
}}
{{
- with .Values.affinity
}}
affinity
:
{{
- toYaml . | nindent 8
}}
{{
- end
}}
{{
- with .Values.tolerations
}}
tolerations
:
{{
- toYaml . | nindent 8
}}
{{
- end
}}
install/kubernetes/helm/skywalking/
templates/ui-
ingress.yaml
→
install/kubernetes/helm/skywalking/
charts/elasticsearch/templates/
ingress.yaml
浏览文件 @
3e22ff5e
...
...
@@ -13,37 +13,44 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{
- if .Values.ui.ingress.enabled -
}}
{{
- $serviceName
:
= include "skywalking.ui.fullname" . -
}}
{{
- $servicePort
:
= .Values.ui.service.externalPort -
}}
{{
- if .Values.ingress.enabled -
}}
{{
- $fullName
:
= include "elasticsearch.fullname" . -
}}
{{
- $svcPort
:
= .Values.service.port -
}}
{{
- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -
}}
apiVersion
:
networking.k8s.io/v1beta1
{{
- else -
}}
apiVersion
:
extensions/v1beta1
{{
- end
}}
kind
:
Ingress
metadata
:
name
:
{{
$fullName
}}
labels
:
app
:
{{
template "skywalking.name" .
}}
chart
:
{{
.Chart.Name
}}
-{{ .Chart.Version }}
component
:
"
{{
.Values.ui.name
}}"
heritage
:
{{
.Release.Service
}}
release
:
{{
.Release.Name
}}
name
:
{{
template "skywalking.ui.fullname" .
}}
{{
- include "elasticsearch.labels" . | nindent 4
}}
{{
- with .Values.ingress.annotations
}}
annotations
:
{{
- range $key
,
$value
:
= .Values.ui.ingress.annotations
}}
{{
$key
}}:
{{
$value | quote
}}
{{
- end
}}
{{
- toYaml . | nindent 4
}}
{{
- end
}}
spec
:
{{
- if .Values.ingress.tls
}}
tls
:
{{
- range .Values.ingress.tls
}}
-
hosts
:
{{
- range .hosts
}}
-
{{
. | quote
}}
{{
- end
}}
secretName
:
{{
.secretName
}}
{{
- end
}}
{{
- end
}}
rules
:
{{
- range .Values.ui.ingress.hosts
}}
{{
- $url
:
= splitList "/" .
}}
-
host
:
{{
first $url
}}
{{
- range .Values.ingress.hosts
}}
-
host
:
{{
.host | quote
}}
http
:
paths
:
-
path
:
/{{ rest $url | join "/" }}
{{
- range .paths
}}
-
path
:
{{
.
}}
backend
:
serviceName
:
{{
$serviceName
}}
servicePort
:
{{
$servicePort
}}
{{
- end -
}}
{{
- if .Values.ui.ingress.tls
}}
tls
:
{{
toYaml .Values.ui.ingress.tls | indent 4
}}
{{
- end -
}}
{{
- end -
}}
serviceName
:
{{
$fullName
}}
servicePort
:
{{
$svcPort
}}
{{
- end
}}
{{
- end
}}
{{
- end
}}
install/kubernetes/helm/skywalking/
templates/ui-deployment
.yaml
→
install/kubernetes/helm/skywalking/
charts/elasticsearch/templates/service
.yaml
浏览文件 @
3e22ff5e
...
...
@@ -13,45 +13,20 @@
# See the License for the specific language governing permissions and
# limitations under the License.
apiVersion
:
apps/
v1
kind
:
Deployment
apiVersion
:
v1
kind
:
Service
metadata
:
name
:
{{
template "skywalking.ui
.fullname" .
}}
name
:
{{
include "elasticsearch
.fullname" .
}}
labels
:
app
:
{{
template "skywalking.name" .
}}
chart
:
{{
.Chart.Name
}}
-{{ .Chart.Version }}
component
:
"
{{
.Values.ui.name
}}"
heritage
:
{{
.Release.Service
}}
release
:
{{
.Release.Name
}}
{{
- include "elasticsearch.labels" . | nindent 4
}}
spec
:
replicas
:
{{
.Values.ui.replicas
}}
type
:
{{
.Values.service.type
}}
ports
:
-
port
:
{{
.Values.service.ports.http
}}
targetPort
:
http
name
:
http
-
name
:
tcp
port
:
{{
.Values.service.ports.transport
}}
targetPort
:
transport
selector
:
matchLabels
:
app
:
{{
template "skywalking.name" .
}}
component
:
"
{{
.Values.ui.name
}}"
release
:
{{
.Release.Name
}}
template
:
metadata
:
labels
:
app
:
{{
template "skywalking.name" .
}}
component
:
"
{{
.Values.ui.name
}}"
release
:
{{
.Release.Name
}}
{{
- if .Values.ui.podAnnotations
}}
annotations
:
{{
toYaml .Values.ui.podAnnotations | indent 8
}}
{{
- end
}}
spec
:
containers
:
-
name
:
{{
.Values.ui.name
}}
image
:
"
{{
.Values.ui.image.repository
}}:{{
.Chart.AppVersion
}}"
imagePullPolicy
:
{{
.Values.ui.image.pullPolicy
}}
ports
:
-
containerPort
:
{{
.Values.ui.service.internalPort
}}
name
:
page
{{
- if .Values.ui.resources
}}
resources
:
{{
toYaml .Values.ui.resources | indent 10
}}
{{
- end
}}
env
:
-
name
:
SW_OAP_ADDRESS
value
:
{{
template "skywalking.oap.fullname" .
}}
:{{ .Values.oap.ports.rest }}
{{
- include "elasticsearch.selectorLabels" . | nindent 4
}}
install/kubernetes/helm/skywalking/
templates/ui-svc
.yaml
→
install/kubernetes/helm/skywalking/
charts/elasticsearch/templates/serviceaccount
.yaml
浏览文件 @
3e22ff5e
...
...
@@ -13,51 +13,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{
- if .Values.serviceAccount.create
}}
apiVersion
:
v1
kind
:
Service
kind
:
Service
Account
metadata
:
name
:
{{
include "elasticsearch.serviceAccountName" .
}}
labels
:
app
:
{{
template "skywalking.name" .
}}
chart
:
{{
.Chart.Name
}}
-{{ .Chart.Version }}
component
:
"
{{
.Values.ui.name
}}"
heritage
:
{{
.Release.Service
}}
release
:
{{
.Release.Name
}}
name
:
{{
template "skywalking.ui.fullname" .
}}
{{
- with .Values.ui.service.annotations
}}
annotations
:
{{
- range $key
,
$value
:
= .
}}
{{
$key
}}:
{{
$value | quote
}}
{{
- end
}}
{{
- end
}}
spec
:
{{
- if .Values.ui.service.loadBalancerSourceRanges
}}
loadBalancerSourceRanges
:
{{
- range $cidr
:
= .Values.ui.service.loadBalancerSourceRanges
}}
-
{{
$cidr
}}
{{
- end
}}
{{
- end
}}
type
:
{{
.Values.ui.service.type
}}
{{
- if and (eq .Values.ui.service.type "ClusterIP") .Values.ui.service.clusterIP
}}
clusterIP
:
{{
.Values.ui.service.clusterIP
}}
{{
- end
}}
ports
:
-
port
:
{{
.Values.ui.service.externalPort
}}
targetPort
:
{{
.Values.ui.service.internalPort
}}
protocol
:
TCP
{{
if (and (eq .Values.ui.service.type "NodePort") (not (empty .Values.ui.service.nodePort)))
}}
nodePort
:
{{
.Values.ui.service.nodePort
}}
{{
end
}}
{{
- if .Values.ui.service.portName
}}
name
:
{{
.Values.ui.service.portName
}}
{{
- end
}}
{{
- if .Values.ui.service.externalIPs
}}
externalIPs
:
{{
toYaml .Values.ui.service.externalIPs | indent 4
}}
{{
- end
}}
selector
:
app
:
{{
template "skywalking.name" .
}}
component
:
"
{{
.Values.ui.name
}}"
release
:
{{
.Release.Name
}}
{{
- if .Values.ui.service.loadBalancerIP
}}
loadBalancerIP
:
{{
.Values.ui.service.loadBalancerIP
}}
{{
include "elasticsearch.labels" . | nindent 4
}}
{{
- end
}}
install/kubernetes/helm/skywalking/charts/elasticsearch/values.yaml
0 → 100644
浏览文件 @
3e22ff5e
# 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.
# Default values for elasticsearch.
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.
replicaCount
:
1
image
:
repository
:
elasticsearch
pullPolicy
:
IfNotPresent
imagePullSecrets
:
[]
nameOverride
:
"
"
fullnameOverride
:
"
"
serviceAccount
:
# Specifies whether a service account should be created
create
:
true
# The name of the service account to use.
# If not set and create is true, a name is generated using the fullname template
name
:
podSecurityContext
:
{}
# fsGroup: 2000
securityContext
:
{}
# capabilities:
# drop:
# - ALL
# readOnlyRootFilesystem: true
# runAsNonRoot: true
# runAsUser: 1000
service
:
type
:
ClusterIP
ports
:
transport
:
9300
http
:
9200
ingress
:
enabled
:
false
annotations
:
{}
# kubernetes.io/ingress.class: nginx
# kubernetes.io/tls-acme: "true"
hosts
:
-
host
:
chart-example.local
paths
:
[]
tls
:
[]
# - secretName: chart-example-tls
# hosts:
# - chart-example.local
resources
:
{}
# We usually recommend not to specify default resources and to leave this as a conscious
# choice for the user. This also increases chances charts run on environments with little
# resources, such as Minikube. If you do want to specify resources, uncomment the following
# lines, adjust them as necessary, and remove the curly braces after 'resources:'.
# limits:
# cpu: 100m
# memory: 128Mi
# requests:
# cpu: 100m
# memory: 128Mi
nodeSelector
:
{}
tolerations
:
[]
affinity
:
{}
install/kubernetes/helm/skywalking/templates/_helpers.tpl
浏览文件 @
3e22ff5e
...
...
@@ -74,5 +74,5 @@ Create the name of the service account to use for the oap cluster
- name: wait-for-elasticsearch
image: busybox:1.30
imagePullPolicy: IfNotPresent
command: ['sh', '-c', 'for i in $(seq 1 60); do nc -z -w3 {{ include "call-nested" (list . "elasticsearch" "elasticsearch.
client.
fullname") }} 9200
&&
exit 0 || sleep 5; done; exit 1']
command: ['sh', '-c', 'for i in $(seq 1 60); do nc -z -w3 {{ include "call-nested" (list . "elasticsearch" "elasticsearch.fullname") }} 9200
&&
exit 0 || sleep 5; done; exit 1']
{{- end -}}
install/kubernetes/helm/skywalking/templates/es-init.job.yaml
浏览文件 @
3e22ff5e
...
...
@@ -50,4 +50,4 @@ spec:
-
name
:
SW_STORAGE
value
:
elasticsearch
-
name
:
SW_STORAGE_ES_CLUSTER_NODES
value
:
"
{{
include
"call-nested" (list . "elasticsearch" "elasticsearch.
client.
fullname") }}:9200"
value
:
"
{{
include
"call-nested" (list . "elasticsearch" "elasticsearch.fullname") }}:9200"
install/kubernetes/helm/skywalking/templates/oap-deployment.yaml
浏览文件 @
3e22ff5e
...
...
@@ -80,7 +80,7 @@ spec:
{{
- include "skywalking.containers.wait-for-es" . | nindent 6
}}
containers
:
-
name
:
{{
.Values.oap.name
}}
image
:
"
{{
.Values.oap.image.repository
}}:{{
.
Chart.AppVersion
}}"
image
:
"
{{
.Values.oap.image.repository
}}:{{
.
Values.oap.image.tag
}}"
imagePullPolicy
:
{{
.Values.oap.image.pullPolicy
}}
ports
:
-
containerPort
:
11800
...
...
@@ -111,7 +111,7 @@ spec:
value
:
{{
.Values.oap.envoy.als.enabled | quote
}}
{{
- end
}}
-
name
:
SW_STORAGE_ES_CLUSTER_NODES
value
:
"
{{
include
"call-nested" (list . "elasticsearch" "elasticsearch.
client.
fullname") }}:9200"
value
:
"
{{
include
"call-nested" (list . "elasticsearch" "elasticsearch.fullname") }}:9200"
{{
- range $key
,
$value
:
= .Values.oap.env
}}
-
name
:
{{
$key
}}
value
:
{{
$value | quote
}}
...
...
skywalking-ui
@
e6a036fb
比较
77d6532d
...
e6a036fb
Subproject commit
77d6532d0e1bb1dcaadbcc739cc9f60ea7e870fe
Subproject commit
e6a036fb9e54f2f06a59f1a2cfc79eb3b432cc89
test/scripts/clean.sh
→
test/
e2e-mesh/e2e-istio/
scripts/clean.sh
浏览文件 @
3e22ff5e
文件已移动
test/e2e-mesh/e2e-istio/scripts/compile_build.sh
0 → 100755
浏览文件 @
3e22ff5e
#!/usr/bin/env bash
# ----------------------------------------------------------------------------
# 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.
# ----------------------------------------------------------------------------
set
-e
TAG
=
"ci"
git rev-parse HEAD
git submodule init
git submodule update
make build.all
&&
make docker.oap
-e
TAG
=
$TAG
test/scripts/minikube.sh
→
test/
e2e-mesh/e2e-istio/
scripts/minikube.sh
浏览文件 @
3e22ff5e
文件已移动
test/scripts/pre.sh
→
test/
e2e-mesh/e2e-istio/
scripts/pre.sh
浏览文件 @
3e22ff5e
...
...
@@ -23,7 +23,7 @@ set -ex
HELMVERSION
=
$1
if
[[
"
${
HELMVERSION
}
"
==
""
]]
;
then
HELMVERSION
=
"helm-v3.0.0
-rc.3
"
HELMVERSION
=
"helm-v3.0.0"
fi
MINIKUBEVERESION
=
$2
...
...
@@ -70,7 +70,8 @@ sudo apt-get install -y \
ca-certificates
\
curl
\
gnupg-agent
\
software-properties-common
software-properties-common
\
openjdk-8-jdk-headless
curl
-fsSL
https://download.docker.com/linux/ubuntu/gpg |
sudo
apt-key add -
sudo
apt-key fingerprint 0EBFCD88
sudo
add-apt-repository
\
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录