You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2019/10/06 09:25:18 UTC
[skywalking-kubernetes] 08/38: Update sciprts
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking-kubernetes.git
commit aa2ec5b93611656e8f022a7fc29bbc4079a1c4e7
Author: gaohongtao <ha...@gmail.com>
AuthorDate: Mon Dec 3 00:11:26 2018 +0800
Update sciprts
---
6/6.0.0-alpha/namespace.yml | 0
6/6.0.0-alpha/oap/01-config.yml | 2 +-
6/6.0.0-alpha/oap/{01-service.yml => 02-service.yml} | 0
6/6.0.0-alpha/oap/{02-deployment.yml => 03-deployment.yml} | 14 --------------
README.md | 2 +-
5 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/6/6.0.0-alpha/namespace.yml b/6/6.0.0-alpha/namespace.yml
new file mode 100644
index 0000000..e69de29
diff --git a/6/6.0.0-alpha/oap/01-config.yml b/6/6.0.0-alpha/oap/01-config.yml
index c3c2eaf..98a5b0b 100644
--- a/6/6.0.0-alpha/oap/01-config.yml
+++ b/6/6.0.0-alpha/oap/01-config.yml
@@ -76,7 +76,7 @@ data:
alarm:
default:
- log4j2.xml: |--
+ log4j2.xml: |-
<Configuration status="INFO">
<Appenders>
<Console name="Console" target="SYSTEM_OUT">
diff --git a/6/6.0.0-alpha/oap/01-service.yml b/6/6.0.0-alpha/oap/02-service.yml
similarity index 100%
rename from 6/6.0.0-alpha/oap/01-service.yml
rename to 6/6.0.0-alpha/oap/02-service.yml
diff --git a/6/6.0.0-alpha/oap/02-deployment.yml b/6/6.0.0-alpha/oap/03-deployment.yml
similarity index 82%
rename from 6/6.0.0-alpha/oap/02-deployment.yml
rename to 6/6.0.0-alpha/oap/03-deployment.yml
index a309195..cb9292e 100644
--- a/6/6.0.0-alpha/oap/02-deployment.yml
+++ b/6/6.0.0-alpha/oap/03-deployment.yml
@@ -32,20 +32,6 @@ spec:
app: oap
spec:
serviceAccountName: skywalking-oap
- initContainers:
- - name: init-oap
- image: skywalking/oap:6.0.0-alpha
- resources:
- requests:
- memory: 1Gi
- limits:
- memory: 2Gi
- env:
- - name: JAVA_OPTS
- value: mode=init
- volumeMounts:
- - name: config
- mountPath: /skywalking/config
containers:
- name: oap
image: skywalking/oap:6.0.0-alpha
diff --git a/README.md b/README.md
index 920429a..e67900d 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ To install and configure skywalking in a Kubernetes cluster, follow these instru
Please promise the `skywalking` namespace existed in the cluster, otherwise, create a new one.
-`kubctl apply -f scripts/namespace.yml`
+`kubctl apply -f namespace.yml`
## Deploy Elasticsearch