🐛 Add deletecollection permission to pods

config/chart/samsahai/templates/clusterrole-rbac.yaml

@@ -98,6 +98,14 @@ rules:
       - watch
       - delete
       - deletecollection
+  - apiGroups:
+      - ""
+    resources:
+      - pods
+      - pods/log
+    verbs:
+      - delete
+      - deletecollection
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding

docs/docs.go

@@ -2,7 +2,6 @@
 // This file was generated by swaggo/swag at
 // 2019-12-19 17:43:08.557491 +0700 +07 m=+0.156893839
 
-
 package docs
 
 import (

internal/samsahai/activepromotion/history.go

@@ -68,7 +68,6 @@ func (c *controller) updateActivePromotionHistory(ctx context.Context, histName
 		return errors.Wrapf(err, "cannot update activepromotionhistory %s", histName)
 	}
 
-
 	atpHisList := s2hv1beta1.ActivePromotionHistoryList{Items: []s2hv1beta1.ActivePromotionHistory{*atpHist}}
 	exporter.SetActivePromotionHistoriesMetric(&atpHisList)
 

internal/staging/controller.go

@@ -531,35 +531,7 @@ func forceCleanupResources(client *kubernetes.Clientset, namespace string, listO
 	deletePropagation := metav1.DeletePropagationBackground
 	deleteOpt := &metav1.DeleteOptions{GracePeriodSeconds: &gracePeriod, PropagationPolicy: &deletePropagation}
 
-	if err := client.AppsV1().StatefulSets(namespace).DeleteCollection(deleteOpt, listOpt); err != nil {
-		logger.Error(err, "cannot delete statefulsets", "namespace", namespace, "listOpt", listOpt)
-	}
-	if err := client.AppsV1().Deployments(namespace).DeleteCollection(deleteOpt, listOpt); err != nil {
-		logger.Error(err, "cannot delete deployments", "namespace", namespace, "listOpt", listOpt)
-	}
-	if err := client.CoreV1().ServiceAccounts(namespace).DeleteCollection(deleteOpt, listOpt); err != nil {
-		logger.Error(err, "cannot delete serviceaccounts", "namespace", namespace, "listOpt", listOpt)
-	}
-	if err := client.CoreV1().ConfigMaps(namespace).DeleteCollection(deleteOpt, listOpt); err != nil {
-		logger.Error(err, "cannot delete configmaps", "namespace", namespace, "listOpt", listOpt)
-	}
-	if err := client.CoreV1().Secrets(namespace).DeleteCollection(deleteOpt, listOpt); err != nil {
-		logger.Error(err, "cannot delete secrets", "namespace", namespace, "listOpt", listOpt)
-	}
-	if err := client.ExtensionsV1beta1().Ingresses(namespace).DeleteCollection(deleteOpt, listOpt); err != nil {
-		logger.Error(err, "cannot delete ingresses", "namespace", namespace, "listOpt", listOpt)
-	}
-	if err := client.PolicyV1beta1().PodDisruptionBudgets(namespace).DeleteCollection(deleteOpt, listOpt); err != nil {
-		logger.Error(err, "cannot delete poddisruptionbudgets", "namespace", namespace, "listOpt", listOpt)
-	}
 	if err := client.CoreV1().Pods(namespace).DeleteCollection(deleteOpt, listOpt); err != nil {
 		logger.Error(err, "cannot delete pods", "namespace", namespace, "listOpt", listOpt)
 	}
-
-	svcList, _ := client.CoreV1().Services(namespace).List(listOpt)
-	if len(svcList.Items) > 0 {
-		for _, svc := range svcList.Items {
-			_ = client.CoreV1().Services(namespace).Delete(svc.Name, deleteOpt)
-		}
-	}
 }