fix cluster-role permissions issue and add ability to control log-level in deployment (#348)

Author: sfotony

charts/k8s-shredder/Chart.yaml

@@ -15,5 +15,5 @@ maintainers:
   email: [email protected]
   url: https://adobe.com
 
-version: 0.2.1
+version: 0.2.2
 appVersion: v0.3.1

charts/k8s-shredder/README.md

@@ -1,6 +1,6 @@
 # k8s-shredder
 
-![Version: 0.2.1](https://img.shields.io/badge/Version-0.2.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.3.1](https://img.shields.io/badge/AppVersion-v0.3.1-informational?style=flat-square)
+![Version: 0.2.2](https://img.shields.io/badge/Version-0.2.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.3.1](https://img.shields.io/badge/AppVersion-v0.3.1-informational?style=flat-square)
 
 a novel way of dealing with kubernetes nodes blocked from draining
 

charts/k8s-shredder/templates/cluster-role.yaml

@@ -8,7 +8,7 @@ metadata:
 rules:
 - apiGroups: ["*"]
   resources: [nodes]
-  verbs: [get, list, watch]
+  verbs: [get, list, watch, update, patch]
 - apiGroups: ["*"]
   resources: [pods, pods/eviction]
   verbs: ["*"]
@@ -18,4 +18,7 @@ rules:
 - apiGroups: [ "argoproj.io" ]
   resources: [ rollouts ]
   verbs: [ get, list, watch, update, patch ]
-{{ end }}
+- apiGroups: [ "karpenter.sh" ]
+  resources: [ nodeclaims ]
+  verbs: [ get, list, watch ]
+{{ end }}

charts/k8s-shredder/templates/deployment.yaml

@@ -47,6 +47,7 @@ spec:
           args:
           - "--config=/k8s-shredder-config/config.yaml"
           - "--metrics-port=8080"
+          - "--log-level={{ .Values.logLevel }}"
           {{- if .Values.dryRun }}
           - "--dry-run"
           {{- end }}
@@ -86,13 +87,29 @@ spec:
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.affinity }}
+      {{- if .Values.affinity }}
       affinity:
-        {{- toYaml . | nindent 8 }}
+        {{- toYaml .Values.affinity | nindent 8 }}
+      {{- else }}
+      affinity:
+        nodeAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - weight: 1
+            preference:
+              matchExpressions:
+              - key: node.kubernetes.io/role
+                operator: In
+                values:
+                - master
       {{- end }}
-      {{- with .Values.tolerations }}
+      {{- if .Values.tolerations }}
       tolerations:
-        {{- toYaml . | nindent 8 }}
+        {{- toYaml .Values.tolerations | nindent 8 }}
+      {{- else }}
+      tolerations:
+      - key: "node-role.kubernetes.io/control-plane"
+        operator: "Exists"
+        effect: "NoSchedule"
       {{- end }}
       {{- with .Values.topologySpreadConstraints }}
       topologySpreadConstraints: