github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #61528 from zlabjp/ignore-deleted-objects 

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

cluster/update-storage-objects.sh: Fix to ignore deleted objects

**What this PR does / why we need it**:
This PR fixes to ignore deleted objects in `cluster/update-storage-objects.sh`.  If it failed to fetch the object at [here](https://github.com/kubernetes/kubernetes/blob/master/cluster/update-storage-objects.sh#L101), it must ignore the object, but currently this script exits as follows after 5 tries:

```
$ ./cluster/update-storage-objects.sh
Error from server (NotFound): events "minikube.151d894772669d981" not found
Looks like minikube.151d894772669d98 got deleted. Ignoring it
Error from server (NotFound): events "minikube.151d894772669d981" not found
Looks like minikube.151d894772669d98 got deleted. Ignoring it
Error from server (NotFound): events "minikube.151d894772669d981" not found
Looks like minikube.151d894772669d98 got deleted. Ignoring it
Error from server (NotFound): events "minikube.151d894772669d981" not found
Looks like minikube.151d894772669d98 got deleted. Ignoring it
Error from server (NotFound): events "minikube.151d894772669d981" not found
Looks like minikube.151d894772669d98 got deleted. Ignoring it
Error: failed to update events/minikube.151d894772669d98 in default namespace after 5 tries
```

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #

**Special notes for your reviewer**:

**Release note**:

```release-note
NONE
```
pull/8/head
Kubernetes Submit Queue 2018-03-25 22:36:38 -07:00 committed by GitHub
parent 433c01a7b7 e0237315f5
commit 53aac30f39
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/update-storage-objects.sh
View File

@ -104,7 +104,8 @@ do
# This happens when the instance has been deleted. We can hence ignore
# this instance.
echo "Looks like ${instance} got deleted. Ignoring it"
continue
success=1
break
fi
output=$("${KUBECTL}" replace -f "${filename}" --namespace="${namespace}") || true
rm "${filename}"