Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove leftover e2e resouces due to test failure #1034

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Remove leftover e2e resouces due to test failure #1034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e317c4c
create e2e test clean up script
HaoYang0000 Jan 15, 2025
2272558
Add make target
HaoYang0000 Jan 15, 2025
9aa7b5f
add script and make target to cleanup prometheus leftover resources
HaoYang0000 Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,10 @@ endif
.PHONY: init-e2e-env
init-e2e-env: install-kuttl-plugin install-stern-plugin kustomize ## Download necessary tools to run the integration tests

.PHONY: cleanup-e2e-env
cleanup-e2e-env: ## remove leftover e2e resouces due to test failure.
HaoYang0000 marked this conversation as resolved.
Show resolved Hide resolved
scripts/cleanup-e2e-env.sh

.PHONY: run-int-tests
run-int-tests: init-e2e-env vdb-gen setup-e2e-communal ## Run the integration tests
ifeq ($(DEPLOY_WITH), $(filter $(DEPLOY_WITH), olm))
Expand Down Expand Up @@ -696,6 +700,10 @@ deploy-prometheus-adapter: ## Setup prometheus adapter for VerticaAutoscaler
undeploy-prometheus-adapter: ## Remove prometheus adapter
helm uninstall $(PROMETHEUS_ADAPTER_NAME) -n $(PROMETHEUS_ADAPTER_NAMESPACE)

.PHONY: cleanup-prometheus-leftover
cleanup-prometheus-leftover: ## remove leftover Prometheus resouces due to e2e test failure.
scripts/cleanup-prometheus.sh PROMETHEUS_NAMESPACE

.PHONY: undeploy-operator
undeploy-operator: ## Undeploy operator that was previously deployed
scripts/undeploy.sh $(if $(filter false,$(ignore-not-found)),,-i)
Expand Down
25 changes: 25 additions & 0 deletions scripts/cleanup-e2e-env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#!/bin/bash

# (c) Copyright [2021-2024] Open Text.
# Licensed 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.

# A script that will clean up left over resources for local env due to failure of kuttl run.

set -o errexit
set -o pipefail

# Fetch leftover kuttl resources and remove the namespace
for ns in $(kubectl get ns | grep kuttl-test | cut -d' ' -f1); do
kubectl delete all --all -n $ns
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This won't clean up prometheus-kube-prometheus-kube-proxy which is in kube-system.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, here I intend to remove only kuttl-test namespace leftover resources. For the other kinds I may add another target.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why a separate PR, just do it here!

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, I didn't mean another PR, I mean another make target. Deleting non-namespace scoped resources can be very destructive, for example: kubectl delete clusterrole. It will impact the Prometheus instance.

kubectl delete ns $ns
done
26 changes: 26 additions & 0 deletions scripts/cleanup-prometheus.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#!/bin/bash

# (c) Copyright [2021-2024] Open Text.
# Licensed 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.

# A script that will clean up left over resources of Prometheus.

NAMESPACE=$1
kubectl delete clusterrole prometheus-kube-prometheus-operator -n $NAMESPACE
kubectl delete clusterrole prometheus-kube-prometheus-prometheus -n $NAMESPACE
kubectl delete clusterrolebinding prometheus-kube-prometheus-operator -n $NAMESPACE
kubectl delete clusterrolebinding prometheus-kube-prometheus-prometheus -n $NAMESPACE
kubectl delete svc prometheus-kube-prometheus-kube-proxy -n kube-system
kubectl delete svc prometheus-kube-prometheus-kubelet -n kube-system
kubectl delete MutatingWebhookConfiguration prometheus-kube-prometheus-admission -n $NAMESPACE
kubectl delete ValidatingWebhookConfiguration prometheus-kube-prometheus-admission -n $NAMESPACE
Loading