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 <hanahm...@gmail.com>
AuthorDate: Sat Dec 1 22:29:20 2018 +0800
Add 6.0.0-alpha scripts
---
.../6.0.0-alpha}/elasticsearch/01-storageclass.yml | 0
.../6.0.0-alpha}/elasticsearch/02-service.yml | 0
.../6.0.0-alpha}/elasticsearch/03-statefulset.yml | 0
.../6.0.0-alpha}/istio/01-metrictemplete.yml | 0
.../6.0.0-alpha}/istio/02-skywalingadapter.yml | 0
.../6.0.0-alpha}/istio/03-operator_cfg.yml | 0
{scripts => 6/6.0.0-alpha}/oap/00-rbac.yml | 0
{scripts => 6/6.0.0-alpha}/oap/01-config.yml | 0
{scripts => 6/6.0.0-alpha}/oap/01-service.yml | 0
{scripts => 6/6.0.0-alpha}/oap/02-deployment.yml | 18 ++++++++++++++++--
{scripts => 6/6.0.0-alpha}/ui/01-service.yml | 0
{scripts => 6/6.0.0-alpha}/ui/02-deployment.yml | 2 +-
README.md | 8 ++++----
scripts/namespace.yml | 22 ----------------------
14 files changed, 21 insertions(+), 29 deletions(-)
diff --git a/scripts/elasticsearch/01-storageclass.yml
b/6/6.0.0-alpha/elasticsearch/01-storageclass.yml
similarity index 100%
rename from scripts/elasticsearch/01-storageclass.yml
rename to 6/6.0.0-alpha/elasticsearch/01-storageclass.yml
diff --git a/scripts/elasticsearch/02-service.yml
b/6/6.0.0-alpha/elasticsearch/02-service.yml
similarity index 100%
rename from scripts/elasticsearch/02-service.yml
rename to 6/6.0.0-alpha/elasticsearch/02-service.yml
diff --git a/scripts/elasticsearch/03-statefulset.yml
b/6/6.0.0-alpha/elasticsearch/03-statefulset.yml
similarity index 100%
rename from scripts/elasticsearch/03-statefulset.yml
rename to 6/6.0.0-alpha/elasticsearch/03-statefulset.yml
diff --git a/scripts/istio/01-metrictemplete.yml
b/6/6.0.0-alpha/istio/01-metrictemplete.yml
similarity index 100%
rename from scripts/istio/01-metrictemplete.yml
rename to 6/6.0.0-alpha/istio/01-metrictemplete.yml
diff --git a/scripts/istio/02-skywalingadapter.yml
b/6/6.0.0-alpha/istio/02-skywalingadapter.yml
similarity index 100%
rename from scripts/istio/02-skywalingadapter.yml
rename to 6/6.0.0-alpha/istio/02-skywalingadapter.yml
diff --git a/scripts/istio/03-operator_cfg.yml
b/6/6.0.0-alpha/istio/03-operator_cfg.yml
similarity index 100%
rename from scripts/istio/03-operator_cfg.yml
rename to 6/6.0.0-alpha/istio/03-operator_cfg.yml
diff --git a/scripts/oap/00-rbac.yml b/6/6.0.0-alpha/oap/00-rbac.yml
similarity index 100%
rename from scripts/oap/00-rbac.yml
rename to 6/6.0.0-alpha/oap/00-rbac.yml
diff --git a/scripts/oap/01-config.yml b/6/6.0.0-alpha/oap/01-config.yml
similarity index 100%
rename from scripts/oap/01-config.yml
rename to 6/6.0.0-alpha/oap/01-config.yml
diff --git a/scripts/oap/01-service.yml b/6/6.0.0-alpha/oap/01-service.yml
similarity index 100%
rename from scripts/oap/01-service.yml
rename to 6/6.0.0-alpha/oap/01-service.yml
diff --git a/scripts/oap/02-deployment.yml b/6/6.0.0-alpha/oap/02-deployment.yml
similarity index 78%
rename from scripts/oap/02-deployment.yml
rename to 6/6.0.0-alpha/oap/02-deployment.yml
index b525878..a309195 100644
--- a/scripts/oap/02-deployment.yml
+++ b/6/6.0.0-alpha/oap/02-deployment.yml
@@ -32,9 +32,23 @@ spec:
app: oap
spec:
serviceAccountName: skywalking-oap
+ initContainers:
+ - name: init-oap
+ image: skywalking/oap:6.0.0-alpha
+ resources:
+ requests:
+ memory: 1Gi
+ limits:
+ memory: 2Gi
+ env:
+ - name: JAVA_OPTS
+ value: mode=init
+ volumeMounts:
+ - name: config
+ mountPath: /skywalking/config
containers:
- name: oap
- image: us.gcr.io/skywalking-live-demo/skywalking/oap:latest
+ image: skywalking/oap:6.0.0-alpha
ports:
- containerPort: 11800
name: grpc
@@ -54,7 +68,7 @@ spec:
fieldPath: metadata.uid
volumeMounts:
- name: config
- mountPath: /apache-skywalking-apm-incubating/config
+ mountPath: /skywalking/config
volumes:
- name: config
configMap:
diff --git a/scripts/ui/01-service.yml b/6/6.0.0-alpha/ui/01-service.yml
similarity index 100%
rename from scripts/ui/01-service.yml
rename to 6/6.0.0-alpha/ui/01-service.yml
diff --git a/scripts/ui/02-deployment.yml b/6/6.0.0-alpha/ui/02-deployment.yml
similarity index 95%
rename from scripts/ui/02-deployment.yml
rename to 6/6.0.0-alpha/ui/02-deployment.yml
index 2839981..e4f3116 100644
--- a/scripts/ui/02-deployment.yml
+++ b/6/6.0.0-alpha/ui/02-deployment.yml
@@ -33,7 +33,7 @@ spec:
spec:
containers:
- name: ui
- image: us.gcr.io/skywalking-live-demo/skywalking/ui:latest
+ image: skywalking/ui:6.0.0-alpha
ports:
- containerPort: 8080
name: page
diff --git a/README.md b/README.md
index 4bae8d1..920429a 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ Please promise the `skywalking` namespace existed in the
cluster, otherwise, cre
## Deploy Elasticsearch
-Use `kubectl apply -f ` with the scripts in `scripts/elasticsearch` to deploy
elasticsearch servers
+Use `kubectl apply -f ` with the scripts in `elasticsearch` to deploy
elasticsearch servers
in the cluster.
> `01-storageclass.yml` assume to use GKE as the kubernetes provisioner. You
> could fix it according
@@ -21,12 +21,12 @@ to your kubernetes environment.
## Deploy OAP server
-Use `kubectl apply -f ` with the scripts in `scripts/opa` to deploy oap server
+Use `kubectl apply -f ` with the scripts in `opa` to deploy oap server
in the cluster.
## Deploy UI server
-Use `kubectl apply -f ` with the scripts in `scripts/ui` to deploy oap server
+Use `kubectl apply -f ` with the scripts in `ui` to deploy oap server
in the cluster.
# Setup Istio to send metric to oap
@@ -37,4 +37,4 @@ Istio should be installed in kubernetes cluster.
## Setup Istio to send metric to oap
-Use `kubectl apply -f ` with the scripts in `scripts/istio` to setup.
+Use `kubectl apply -f ` with the scripts in `istio` to setup.
diff --git a/scripts/namespace.yml b/scripts/namespace.yml
deleted file mode 100644
index c0ebe1d..0000000
--- a/scripts/namespace.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: v1
-kind: Namespace
-metadata:
- name: skywalking
- labels:
- istio-injection: disabled
