Merge pull request #20 from tardich/master

Adapting to flat install of latest whereabouts
k8snetworkplumbingwg · Jun 24, 2022 · 49fbeda · 49fbeda
2 parents a5b1556 + 958588f
commit 49fbeda
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/whereabouts/templates/cluster_role.yaml b/whereabouts/templates/cluster_role.yaml
@@ -7,6 +7,7 @@ rules:
   - whereabouts.cni.cncf.io
   resources:
   - ippools
+  - overlappingrangeipreservations
   verbs:
   - get
   - list
@@ -26,3 +27,20 @@ rules:
   - pods
   verbs:
   - list
+  - watch
+- apiGroups: ["k8s.cni.cncf.io"]
+  resources:
+  - network-attachment-definitions
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - ""
+  - events.k8s.io
+  resources:
+    - events
+  verbs:
+  - create
+  - patch
+  - update
diff --git a/whereabouts/templates/cronjob.yaml b/whereabouts/templates/cronjob.yaml
@@ -7,7 +7,7 @@ metadata:
     {{- include "whereabouts.labels" . | nindent 4 }}
 spec:
   concurrencyPolicy: Forbid
-  successfulJobsHistoryLimit: 0
+  successfulJobsHistoryLimit: {{ .Values.successfulJobsHistoryLimit | default "0" }}
   schedule: "*/5 * * * *"
   jobTemplate:
     spec:

diff --git a/whereabouts/templates/daemonset.yaml b/whereabouts/templates/daemonset.yaml
@@ -22,13 +22,12 @@ spec:
         name: whereabouts
         {{- include "whereabouts.selectorLabels" . | nindent 8 }}
     spec:
-      priorityClassName: system-node-critical
       hostNetwork: true
+      serviceAccountName: {{ include "whereabouts.serviceAccountName" . }}
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      serviceAccountName: {{ include "whereabouts.serviceAccountName" . }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       containers:

diff --git a/whereabouts/values.yaml b/whereabouts/values.yaml
@@ -13,6 +13,7 @@ imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
 namespaceOverride: "kube-system"
+successfulJobsHistoryLimit: 0
 
 serviceAccount:
   # Specifies whether a service account should be created