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

Fix Three Papercuts #1933

Merged
merged 3 commits into from
Feb 15, 2024
Merged

Fix Three Papercuts #1933

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
39d18e5
Papercut[1]: Fix kops clusters becoming stuck when local KUBECONFIG i…
ConnorJC3 Feb 14, 2024
e9b2a94
Papercut[2]: Restrain shfmt to hack/ directory
ConnorJC3 Feb 14, 2024
70de213
Papercut[3]: Attempt to delete Prow clusters that fail to create
ConnorJC3 Feb 14, 2024
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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ update/gomod:

.PHONY: update/shfmt
update/shfmt: bin/shfmt
./bin/shfmt -w -i 2 -d .
./bin/shfmt -w -i 2 -d ./hack/

## Verifiers
# Linters and similar
Expand Down
4 changes: 2 additions & 2 deletions hack/e2e/kops/kops.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ function kops_patch_cluster_file() {
jq "$FILTER" "$CLUSTER_FILE_JSON" >"$CLUSTER_FILE_0"

# Patch only the json objects
kubectl patch -f "$CLUSTER_FILE_0" --local --type merge --patch "$(cat "$KOPS_PATCH_FILE")" -o json >"$CLUSTER_FILE_1"
kubectl patch --kubeconfig /dev/null -f "$CLUSTER_FILE_0" --local --type merge --patch "$(cat "$KOPS_PATCH_FILE")" -o json >"$CLUSTER_FILE_1"
mv "$CLUSTER_FILE_1" "$CLUSTER_FILE_0"

# Delete the original json objects, add the patched
Expand All @@ -141,7 +141,7 @@ function kops_patch_cluster_file() {
function yaml_to_json() {
IN=${1}
OUT=${2}
kubectl patch -f "$IN" --local -p "{}" --type merge -o json | jq '.' -s >"$OUT"
kubectl patch --kubeconfig /dev/null -f "$IN" --local -p "{}" --type merge -o json | jq '.' -s >"$OUT"
}

function json_to_yaml() {
Expand Down
9 changes: 6 additions & 3 deletions hack/prow-e2e.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,12 @@ export KOPS_BUCKET=${KOPS_BUCKET:-"k8s-kops-csi-shared-e2e"}
# Always use us-west-2 in CI, no matter where the local client is
export AWS_REGION=us-west-2

make cluster/create || exit 1
make e2e/${TEST}
E2E_PASSED=$?
if make cluster/create; then
make e2e/${TEST}
E2E_PASSED=$?
else
E2E_PASSED=1
fi
make cluster/delete

echo "E2E_PASSED: ${E2E_PASSED}"
Expand Down
Loading