diff --git a/install/deploy/istio-deploy.sh b/install/deploy/istio-deploy.sh index ba8675cb2d8d..133049b94dd0 100644 --- a/install/deploy/istio-deploy.sh +++ b/install/deploy/istio-deploy.sh @@ -74,15 +74,13 @@ deploy_istio() { helm install istio istio -n ${NAMESPACE} --set prometheus.enabled=false --set pilot.autoscaleEnabled=false \ --set gateways.istio-ingressgateway.autoscaleEnabled=false --set mixer.policy.autoscaleEnabled=false \ --set mixer.telemetry.autoscaleEnabled=false \ - --set gateways.istio-ingressgateway.resources=null \ - --set pilot.resources=null \ - --set mixer.telemetry.resources=null \ - --set pilot.resources=null \ - --set global.defaultResources=null \ - --set global.proxy.init.resources.requests.cpu=50m,global.proxy.init.resources.requests.memory=128m \ - --set global.proxy.init.resources.limits.cpu=50m,global.proxy.init.resources.limits.memory=128m \ - --set global.proxy.resources.requests.cpu=50m,global.proxy.resources.requests.memory=128m \ - --set global.proxy.resources.limits.cpu=50m,global.proxy.resources.limits.memory=128m + --set gateways.istio-ingressgateway.resources.requests={},gateways.istio-ingressgateway.resources.limits={}, \ + --set pilot.resources.requests={},pilot.resources.limits={} \ + --set mixer.telemetry.resources.requests={},mixer.telemetry.resources.limits={} \ + --set pilot.resources.requests={},pilot.resources.limits={} \ + --set global.defaultResources.requests={},global.defaultResources.limits={} \ + --set global.proxy.init.resources.requests={},global.proxy.init.resources.limits={} \ + --set global.proxy.resources.requests={},global.proxy.resources.limits={} check() { kubectl -n ${NAMESPACE} get deploy | grep istio | awk '{print "deployment/"$1}' | while read line ; diff --git a/install/kubernetes/helm/skywalking/charts/elasticsearch/.helmignore b/install/kubernetes/helm/skywalking/charts/elasticsearch/.helmignore index 50af03172541..17b07a365418 100644 --- a/install/kubernetes/helm/skywalking/charts/elasticsearch/.helmignore +++ b/install/kubernetes/helm/skywalking/charts/elasticsearch/.helmignore @@ -1,3 +1,18 @@ +# 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. diff --git a/install/kubernetes/helm/skywalking/charts/elasticsearch/Chart.yaml b/install/kubernetes/helm/skywalking/charts/elasticsearch/Chart.yaml index ce3b84b083d7..6ed6f9ca1206 100644 --- a/install/kubernetes/helm/skywalking/charts/elasticsearch/Chart.yaml +++ b/install/kubernetes/helm/skywalking/charts/elasticsearch/Chart.yaml @@ -1,3 +1,18 @@ +# 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 diff --git a/install/kubernetes/helm/skywalking/charts/elasticsearch/templates/NOTES.txt b/install/kubernetes/helm/skywalking/charts/elasticsearch/templates/NOTES.txt index 8791b0665aa2..c58086e0c113 100644 --- a/install/kubernetes/helm/skywalking/charts/elasticsearch/templates/NOTES.txt +++ b/install/kubernetes/helm/skywalking/charts/elasticsearch/templates/NOTES.txt @@ -1,3 +1,20 @@ +{{/* +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 }} diff --git a/install/kubernetes/helm/skywalking/charts/elasticsearch/templates/_helpers.tpl b/install/kubernetes/helm/skywalking/charts/elasticsearch/templates/_helpers.tpl index cd6cf2e6068a..70ea209bc15d 100644 --- a/install/kubernetes/helm/skywalking/charts/elasticsearch/templates/_helpers.tpl +++ b/install/kubernetes/helm/skywalking/charts/elasticsearch/templates/_helpers.tpl @@ -1,3 +1,20 @@ +{{/* +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. diff --git a/install/kubernetes/helm/skywalking/charts/elasticsearch/templates/deployment.yaml b/install/kubernetes/helm/skywalking/charts/elasticsearch/templates/deployment.yaml index 7fd39cfd0398..1383786375c1 100644 --- a/install/kubernetes/helm/skywalking/charts/elasticsearch/templates/deployment.yaml +++ b/install/kubernetes/helm/skywalking/charts/elasticsearch/templates/deployment.yaml @@ -1,3 +1,18 @@ +# 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: diff --git a/install/kubernetes/helm/skywalking/charts/elasticsearch/templates/ingress.yaml b/install/kubernetes/helm/skywalking/charts/elasticsearch/templates/ingress.yaml index 035bbc0a4c4d..43d9f22df072 100644 --- a/install/kubernetes/helm/skywalking/charts/elasticsearch/templates/ingress.yaml +++ b/install/kubernetes/helm/skywalking/charts/elasticsearch/templates/ingress.yaml @@ -1,4 +1,19 @@ -{{- if .Values.ingress.enabled -}} +# 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. + + {{- if .Values.ingress.enabled -}} {{- $fullName := include "elasticsearch.fullname" . -}} {{- $svcPort := .Values.service.port -}} {{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} diff --git a/install/kubernetes/helm/skywalking/charts/elasticsearch/templates/service.yaml b/install/kubernetes/helm/skywalking/charts/elasticsearch/templates/service.yaml index 03b5710ee644..a7351bc35bec 100644 --- a/install/kubernetes/helm/skywalking/charts/elasticsearch/templates/service.yaml +++ b/install/kubernetes/helm/skywalking/charts/elasticsearch/templates/service.yaml @@ -1,3 +1,18 @@ +# 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: diff --git a/install/kubernetes/helm/skywalking/charts/elasticsearch/templates/serviceaccount.yaml b/install/kubernetes/helm/skywalking/charts/elasticsearch/templates/serviceaccount.yaml index d5e5b85e3b4c..1d941c16b0ae 100644 --- a/install/kubernetes/helm/skywalking/charts/elasticsearch/templates/serviceaccount.yaml +++ b/install/kubernetes/helm/skywalking/charts/elasticsearch/templates/serviceaccount.yaml @@ -1,4 +1,19 @@ -{{- if .Values.serviceAccount.create -}} +# 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. + + {{- if .Values.serviceAccount.create -}} apiVersion: v1 kind: ServiceAccount metadata: diff --git a/install/kubernetes/helm/skywalking/charts/elasticsearch/values.yaml b/install/kubernetes/helm/skywalking/charts/elasticsearch/values.yaml index ac7989285003..0c8c62e141ef 100644 --- a/install/kubernetes/helm/skywalking/charts/elasticsearch/values.yaml +++ b/install/kubernetes/helm/skywalking/charts/elasticsearch/values.yaml @@ -1,3 +1,18 @@ +# 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.