Minor fixes in makefiles (#1000)

* Rephrase warning message When the API requested a non-existent secret, the error message we got was too alarming and confusing. This commit softens that message and provides additional context. Signed-off-by: Volkan Ozcelik <[email protected]> * Fix typo Signed-off-by: Volkan Ozcelik <[email protected]> * Fix minor error Signed-off-by: Volkan Ozcelik <[email protected]> * Increase timeouts from 60s to 120s Signed-off-by: Volkan Ozcelik <[email protected]> --------- Signed-off-by: Volkan Ozcelik <[email protected]>
vmware-tanzu · Jun 15, 2024 · 35d14de · 35d14de
1 parent 3125570
commit 35d14de
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 74 deletions.
diff --git a/app/safe/internal/server/route/fetch/fetch.go b/app/safe/internal/server/route/fetch/fetch.go
@@ -93,7 +93,8 @@ func Fetch(
 
 	secret, err := collection.ReadSecret(cid, workloadId)
 	if err != nil {
-		log.WarnLn(&cid, "Fetch: Problem reading secret", err.Error())
+		log.WarnLn(&cid, "Fetch: Attemted to read secret from disk.")
+		log.TraceLn(&cid, "Likely expected error. No need to panic:", err.Error())
 	}
 
 	log.TraceLn(&cid, "Fetch: workloadId", workloadId)

diff --git a/env-vars-export.txt b/env-vars-export.txt
diff --git a/hack/helm-delete.sh b/hack/helm-delete.sh
@@ -38,7 +38,7 @@ check_namespace_deleted() {
 if kubectl get deployment vsecm-sentinel -n "$VSECM_NS"; then
   kubectl delete deployment vsecm-sentinel -n "$VSECM_NS" || \
     { echo "Failed to delete vsecm-sentinel deployment"; exit 1; }
-  kubectl wait --for=delete pod -l app=vsecm-sentinel -n "$VSECM_NS" --timeout=60s || \
+  kubectl wait --for=delete pod -l app=vsecm-sentinel -n "$VSECM_NS" --timeout=120s || \
     { echo "Timeout or error while waiting for vsecm-sentinel pods to delete"; exit 1; }
 else
   echo "vsecm-sentinel deployment does not exist. Skipping delete."
@@ -47,7 +47,7 @@ fi
 if kubectl get deployment vsecm-safe -n "$VSECM_NS"; then
   kubectl delete deployment vsecm-safe -n "$VSECM_NS" || \
     { echo "Failed to delete vsecm-safe deployment"; exit 1; }
-  kubectl wait --for=delete pod -l app=vsecm-safe -n "$VSECM_NS" --timeout=60s || \
+  kubectl wait --for=delete pod -l app=vsecm-safe -n "$VSECM_NS" --timeout=120s || \
     { echo "Timeout or error while waiting for vsecm-safe pods to delete"; exit 1; }
 else
   echo "vsecm-safe deployment does not exist. Skipping delete."

diff --git a/hack/install-vsecm-to-eks.sh b/hack/install-vsecm-to-eks.sh
@@ -20,8 +20,8 @@
 helm install vsecm vsecm/vsecm
 
 echo "verifying vsecm installation"
-kubectl wait --timeout=60s --for=condition=Available deployment -n vsecm-system vsecm-sentinel
+kubectl wait --timeout=120s --for=condition=Available deployment -n vsecm-system vsecm-sentinel
 echo "vsecm-sentinel: deployment available"
-kubectl wait --timeout=60s --for=condition=Available deployment -n vsecm-system vsecm-safe
+kubectl wait --timeout=120s --for=condition=Available deployment -n vsecm-system vsecm-safe
 echo "vsecm-safe: deployment available"
 echo "vsecm installation successful"
diff --git a/makefiles/VSecMDeploy.mk b/makefiles/VSecMDeploy.mk
@@ -40,7 +40,7 @@ deploy-spire:
 		kubectl apply -f ${MANIFESTS_BASE_PATH}/crds; \
 		kubectl apply -f ${MANIFESTS_BASE_PATH}/spire.yaml; \
 		echo "verifying SPIRE installation"; \
-		kubectl wait --for=condition=ready pod spire-server-0 --timeout=60s -n $(VSECM_NAMESPACE_SPIRE_SERVER) \
+		kubectl wait --for=condition=ready pod spire-server-0 --timeout=120s -n $(VSECM_NAMESPACE_SPIRE_SERVER); \
 		echo "spire-server: deployment available"; \
 		echo "spire installation successful"; \
 		echo "sleeping for 15 seconds for webhooks to become responsive"; \
@@ -96,9 +96,9 @@ deploy-fips-eks: deploy-spire
 .PHONY: post-deploy
 post-deploy:
 	echo "verifying vsecm installation"
-	kubectl wait --timeout=60s --for=condition=Available deployment -n $(VSECM_NAMESPACE_SYSTEM) vsecm-sentinel
+	kubectl wait --timeout=120s --for=condition=Available deployment -n $(VSECM_NAMESPACE_SYSTEM) vsecm-sentinel
 	echo "vsecm-sentinel: deployment available"
-	kubectl wait --for=condition=ready pod vsecm-safe-0 --timeout=60s -n $(VSECM_NAMESPACE_SYSTEM)
+	kubectl wait --for=condition=ready pod vsecm-safe-0 --timeout=120s -n $(VSECM_NAMESPACE_SYSTEM)
 	echo "vsecm-safe: deployment available"
 	echo "vsecm installation successful"