From 0f8ef994a33e6988405ac97878eddd2ff69d7094 Mon Sep 17 00:00:00 2001 From: Paulo Pires Date: Wed, 28 Nov 2018 20:23:16 +0000 Subject: [PATCH 1/2] sync: don't swallow delete errors Signed-off-by: Paulo Pires --- vkubelet/pod.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vkubelet/pod.go b/vkubelet/pod.go index accd00db4..f538fd0ab 100644 --- a/vkubelet/pod.go +++ b/vkubelet/pod.go @@ -214,7 +214,7 @@ func (s *Server) deletePod(ctx context.Context, pod *corev1.Pod) error { logger := log.G(ctx).WithField("pod", pod.GetName()).WithField("namespace", pod.GetNamespace()) if !errors.IsNotFound(delErr) { var grace int64 - if err := s.k8sClient.CoreV1().Pods(pod.GetNamespace()).Delete(pod.GetName(), &metav1.DeleteOptions{GracePeriodSeconds: &grace}); err != nil && errors.IsNotFound(err) { + if err := s.k8sClient.CoreV1().Pods(pod.GetNamespace()).Delete(pod.GetName(), &metav1.DeleteOptions{GracePeriodSeconds: &grace}); err != nil { if errors.IsNotFound(err) { span.Annotate(nil, "Pod does not exist in k8s, nothing to delete") return nil From fe7b363f102bf22c0cde9f6e5235893045ec7d48 Mon Sep 17 00:00:00 2001 From: Paulo Pires Date: Wed, 28 Nov 2018 20:23:18 +0000 Subject: [PATCH 2/2] rbac: improve and add missing verb Signed-off-by: Paulo Pires --- hack/skaffold/virtual-kubelet/base.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/hack/skaffold/virtual-kubelet/base.yml b/hack/skaffold/virtual-kubelet/base.yml index fc856874f..9fc3d2f62 100644 --- a/hack/skaffold/virtual-kubelet/base.yml +++ b/hack/skaffold/virtual-kubelet/base.yml @@ -12,9 +12,18 @@ rules: - "" resources: - configmaps - - pods - secrets verbs: + - get + - list + - watch +- apiGroups: + - "" + resources: + - pods + verbs: + - delete + - get - list - watch - apiGroups: @@ -29,7 +38,6 @@ rules: resources: - nodes/status verbs: - - get - update - apiGroups: - ""