Skip to content

fix oadp detection commands #69

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

Merged
Joeavaikath merged 1 commit into from
Oct 16, 2025
Merged

fix oadp detection commands #69

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 19 additions & 19 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,31 +162,31 @@ install: build ## Build and install the kubectl plugin to ~/.local/bin (no sudo
if [[ "$(ASSUME_DEFAULT)" != "true" && "$(VELERO_NAMESPACE)" == "openshift-adp" ]]; then \
echo ""; \
echo "🔍 Detecting OADP deployment in cluster..."; \
DETECTED_NS=$$(kubectl get deployment openshift-adp-controller-manager --all-namespaces -o jsonpath='{.items[0].metadata.namespace}' 2>/dev/null | head -1); \
DETECTED_NS=$$(kubectl get deployments --all-namespaces -o jsonpath='{.items[?(@.metadata.name=="openshift-adp-controller-manager")].metadata.namespace}' 2>/dev/null | head -1); \
if [[ -n "$$DETECTED_NS" ]]; then \
echo "✅ Found OADP controller in namespace: $$DETECTED_NS"; \
NAMESPACE=$$DETECTED_NS; \
DETECTED=true; \
else \
echo " Could not find openshift-adp-controller-manager deployment"; \
echo "🔍 Looking for DataProtectionApplication (DPA) resources..."; \
DETECTED_NS=$$(kubectl get dataprotectionapplication --all-namespaces -o jsonpath='{.items[0].metadata.namespace}' 2>/dev/null | head -1); \
if [[ -n "$$DETECTED_NS" ]]; then \
echo "✅ Found DPA resource in namespace: $$DETECTED_NS"; \
NAMESPACE=$$DETECTED_NS; \
DETECTED=true; \
else \
echo " Could not find DataProtectionApplication resources"; \
echo "🔍 Looking for Velero deployment as fallback..."; \
DETECTED_NS=$$(kubectl get deployment velero --all-namespaces -o jsonpath='{.items[0].metadata.namespace}' 2>/dev/null | head -1); \
if [[ -n "$$DETECTED_NS" ]]; then \
echo "✅ Found Velero deployment in namespace: $$DETECTED_NS"; \
NAMESPACE=$$DETECTED_NS; \
DETECTED=true; \
else \
echo "⚠️ Could not detect OADP or Velero deployment in cluster"; \
fi; \
fi; \
fi; \
echo "🔍 Looking for DataProtectionApplication (DPA) resources..."; \
DETECTED_NS=$$(kubectl get dataprotectionapplication --all-namespaces -o jsonpath='{.items[0].metadata.namespace}' 2>/dev/null | head -1); \
if [[ -n "$$DETECTED_NS" ]]; then \
echo "✅ Found DPA resource in namespace: $$DETECTED_NS"; \
NAMESPACE=$$DETECTED_NS; \
DETECTED=true; \
else \
echo " Could not find DataProtectionApplication resources"; \
fi; \
echo "🔍 Looking for Velero deployment as fallback..."; \
DETECTED_NS=$$(kubectl get deployments --all-namespaces -o jsonpath='{.items[?(@.metadata.name=="velero")].metadata.namespace}' 2>/dev/null | head -1); \
if [[ -n "$$DETECTED_NS" ]]; then \
echo "✅ Found Velero deployment in namespace: $$DETECTED_NS"; \
NAMESPACE=$$DETECTED_NS; \
DETECTED=true; \
else \
echo "⚠️ Could not detect OADP or Velero deployment in cluster"; \
fi; \
if [[ "$$DETECTED" == "false" ]]; then \
echo "🤔 Which namespace should admin commands use for Velero resources?"; \
Expand Down
Loading