Skip to content

Commit 3e67d37

Browse files
fix oadp detection command (#69)
1 parent 34b10f2 commit 3e67d37

1 file changed

Lines changed: 19 additions & 19 deletions

File tree

Makefile

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -162,31 +162,31 @@ install: build ## Build and install the kubectl plugin to ~/.local/bin (no sudo
162162
if [[ "$(ASSUME_DEFAULT)" != "true" && "$(VELERO_NAMESPACE)" == "openshift-adp" ]]; then \
163163
echo ""; \
164164
echo "🔍 Detecting OADP deployment in cluster..."; \
165-
DETECTED_NS=$$(kubectl get deployment openshift-adp-controller-manager --all-namespaces -o jsonpath='{.items[0].metadata.namespace}' 2>/dev/null | head -1); \
165+
DETECTED_NS=$$(kubectl get deployments --all-namespaces -o jsonpath='{.items[?(@.metadata.name=="openshift-adp-controller-manager")].metadata.namespace}' 2>/dev/null | head -1); \
166166
if [[ -n "$$DETECTED_NS" ]]; then \
167167
echo "✅ Found OADP controller in namespace: $$DETECTED_NS"; \
168168
NAMESPACE=$$DETECTED_NS; \
169169
DETECTED=true; \
170170
else \
171171
echo " Could not find openshift-adp-controller-manager deployment"; \
172-
echo "🔍 Looking for DataProtectionApplication (DPA) resources..."; \
173-
DETECTED_NS=$$(kubectl get dataprotectionapplication --all-namespaces -o jsonpath='{.items[0].metadata.namespace}' 2>/dev/null | head -1); \
174-
if [[ -n "$$DETECTED_NS" ]]; then \
175-
echo "✅ Found DPA resource in namespace: $$DETECTED_NS"; \
176-
NAMESPACE=$$DETECTED_NS; \
177-
DETECTED=true; \
178-
else \
179-
echo " Could not find DataProtectionApplication resources"; \
180-
echo "🔍 Looking for Velero deployment as fallback..."; \
181-
DETECTED_NS=$$(kubectl get deployment velero --all-namespaces -o jsonpath='{.items[0].metadata.namespace}' 2>/dev/null | head -1); \
182-
if [[ -n "$$DETECTED_NS" ]]; then \
183-
echo "✅ Found Velero deployment in namespace: $$DETECTED_NS"; \
184-
NAMESPACE=$$DETECTED_NS; \
185-
DETECTED=true; \
186-
else \
187-
echo "⚠️ Could not detect OADP or Velero deployment in cluster"; \
188-
fi; \
189-
fi; \
172+
fi; \
173+
echo "🔍 Looking for DataProtectionApplication (DPA) resources..."; \
174+
DETECTED_NS=$$(kubectl get dataprotectionapplication --all-namespaces -o jsonpath='{.items[0].metadata.namespace}' 2>/dev/null | head -1); \
175+
if [[ -n "$$DETECTED_NS" ]]; then \
176+
echo "✅ Found DPA resource in namespace: $$DETECTED_NS"; \
177+
NAMESPACE=$$DETECTED_NS; \
178+
DETECTED=true; \
179+
else \
180+
echo " Could not find DataProtectionApplication resources"; \
181+
fi; \
182+
echo "🔍 Looking for Velero deployment as fallback..."; \
183+
DETECTED_NS=$$(kubectl get deployments --all-namespaces -o jsonpath='{.items[?(@.metadata.name=="velero")].metadata.namespace}' 2>/dev/null | head -1); \
184+
if [[ -n "$$DETECTED_NS" ]]; then \
185+
echo "✅ Found Velero deployment in namespace: $$DETECTED_NS"; \
186+
NAMESPACE=$$DETECTED_NS; \
187+
DETECTED=true; \
188+
else \
189+
echo "⚠️ Could not detect OADP or Velero deployment in cluster"; \
190190
fi; \
191191
if [[ "$$DETECTED" == "false" ]]; then \
192192
echo "🤔 Which namespace should admin commands use for Velero resources?"; \

0 commit comments

Comments
 (0)