You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ke...@apache.org on 2022/02/24 11:56:22 UTC
[skywalking-showcase] branch main updated: Enlarge ES and make uninstallation commands idempotent
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-showcase.git
The following commit(s) were added to refs/heads/main by this push:
new cbe7425 Enlarge ES and make uninstallation commands idempotent
cbe7425 is described below
commit cbe742538929cf0b02f2f0da0edf52fc1fde7fb8
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Thu Feb 24 19:56:13 2022 +0800
Enlarge ES and make uninstallation commands idempotent
---
deploy/platform/kubernetes/feature-cluster/resources.yaml | 6 ++----
deploy/platform/kubernetes/feature-single-node/resources.yaml | 2 --
deploy/platform/kubernetes/features.mk | 4 ++--
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/deploy/platform/kubernetes/feature-cluster/resources.yaml b/deploy/platform/kubernetes/feature-cluster/resources.yaml
index 8b60bdc..e07b318 100644
--- a/deploy/platform/kubernetes/feature-cluster/resources.yaml
+++ b/deploy/platform/kubernetes/feature-cluster/resources.yaml
@@ -99,15 +99,13 @@ spec:
cpu: 4000m
memory: "4096Mi"
requests:
- cpu: 1000m
- memory: "1024Mi"
+ cpu: 4000m
+ memory: "4096Mi"
ports:
- containerPort: 9200
env:
- name: 'discovery.type'
value: 'single-node'
- - name: 'bootstrap.memory_lock'
- value: 'true'
---
apiVersion: v1
diff --git a/deploy/platform/kubernetes/feature-single-node/resources.yaml b/deploy/platform/kubernetes/feature-single-node/resources.yaml
index 24c1529..8e7c755 100644
--- a/deploy/platform/kubernetes/feature-single-node/resources.yaml
+++ b/deploy/platform/kubernetes/feature-single-node/resources.yaml
@@ -99,8 +99,6 @@ spec:
env:
- name: 'discovery.type'
value: 'single-node'
- - name: 'bootstrap.memory_lock'
- value: 'true'
---
apiVersion: v1
diff --git a/deploy/platform/kubernetes/features.mk b/deploy/platform/kubernetes/features.mk
index 7aeb55f..b2dc110 100644
--- a/deploy/platform/kubernetes/features.mk
+++ b/deploy/platform/kubernetes/features.mk
@@ -104,6 +104,6 @@ deploy.feature-java-agent-injector: install-cert-manager
# @feature: java-agent-injector; uninstall the swck operator and cert-manager
.PHONY: undeploy.feature-java-agent-injector
undeploy.feature-java-agent-injector:
- @curl -Ls https://archive.apache.org/dist/skywalking/swck/${SWCK_OPERATOR_VERSION}/skywalking-swck-${SWCK_OPERATOR_VERSION}-bin.tgz | tar -zxf - -O ./config/operator-bundle.yaml | kubectl delete -f -
- @kubectl delete -f https://github.com/jetstack/cert-manager/releases/download/${CERT_MANAGER_VERSION}/cert-manager.yaml
+ @curl -Ls https://archive.apache.org/dist/skywalking/swck/${SWCK_OPERATOR_VERSION}/skywalking-swck-${SWCK_OPERATOR_VERSION}-bin.tgz | tar -zxf - -O ./config/operator-bundle.yaml | kubectl delete --ignore-not-found -f -
+ @kubectl delete --ignore-not-found -f https://github.com/jetstack/cert-manager/releases/download/${CERT_MANAGER_VERSION}/cert-manager.yaml
$(MAKE) undeploy FEATURE_FLAGS=agent AGENTLESS=false SHOW_TIPS=false
\ No newline at end of file