Merge pull request #40 from ritmas/fix/node-selector

Introduced nodeSelector support, code readability
hiddeco · Dec 23, 2020 · 4ae4a73 · 4ae4a73
2 parents 9ffb11e + 84421f1
commit 4ae4a73
Show file tree

Hide file tree

Showing 17 changed files with 217 additions and 211 deletions.
diff --git a/README.md b/README.md
@@ -29,7 +29,7 @@ $ kubectl apply -f https://raw.githubusercontent.com/hiddeco/cronjobber/master/d
 > database until this issue has been resolved.
 
 Cronjobber embeds a default timezone database in its binary, this database is
-however not updated regulary. To help your overcome this issue there is an
+however not updated regularly. To help your overcome this issue there is an
 [`cronjobber-updatetz`](https://quay.io/repository/hiddeco/cronjobber-updatetz)
 image available that can be used as a sidecar.
 
@@ -66,12 +66,12 @@ spec:
       template:
         spec:
           containers:
-          - name: hello
-            image: busybox
-            args:
-            - /bin/sh
-            - -c
-            - date; echo "Hello, World!"
+            - name: hello
+              image: busybox
+              args:
+                - /bin/sh
+                - -c
+                - date; echo "Hello, World!"
           restartPolicy: OnFailure
 ```
 

diff --git a/chart/Chart.yaml b/chart/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
 name: cronjobber
 home: https://github.com/hiddeco/cronjobber
-version: 0.1.0
+version: 0.1.1
 appVersion: 0.3.0
 description: Cronjobber is the cronjob controller from Kubernetes patched with time zone support.
 maintainers:
-- name: CyberHippo
+  - name: CyberHippo
diff --git a/chart/templates/clusterrole.yaml b/chart/templates/clusterrole.yaml
@@ -0,0 +1,17 @@
+---
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: ClusterRole
+metadata:
+  name: {{ .Values.name }}
+  labels:
+    name: {{ .Values.name }}
+rules:
+  - apiGroups: ['cronjobber.hidde.co']
+    resources: ['*']
+    verbs: ['*']
+  - apiGroups: ['batch']
+    resources: ['jobs']
+    verbs: ['*']
+  - apiGroups: ['']
+    resources: ['events']
+    verbs: ['create', 'patch', 'update']
diff --git a/chart/templates/clusterrolebinding.yaml b/chart/templates/clusterrolebinding.yaml
@@ -0,0 +1,15 @@
+---
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: ClusterRoleBinding
+metadata:
+  name: {{ .Values.name }}
+  labels:
+    name: {{ .Values.name }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: {{ .Values.name }}
+subjects:
+  - kind: ServiceAccount
+    name: {{ .Values.name }}
+    namespace: {{ .Values.namespace }}
diff --git a/chart/templates/crd.yaml → ...t/templates/customresourcedefinition.yaml b/chart/templates/crd.yaml → ...t/templates/customresourcedefinition.yaml
@@ -4,19 +4,19 @@ kind: CustomResourceDefinition
 metadata:
   name: tzcronjobs.cronjobber.hidde.co
 spec:
-    group: cronjobber.hidde.co
-    version: v1alpha1
-    names:
-      plural: tzcronjobs
-      singular: tzcronjob
-      kind: TZCronJob
-      listKind: TZCronJobList
-      shortNames:
+  group: cronjobber.hidde.co
+  version: v1alpha1
+  names:
+    plural: tzcronjobs
+    singular: tzcronjob
+    kind: TZCronJob
+    listKind: TZCronJobList
+    shortNames:
       - tzc
-    scope: Namespaced
-    subresources:
-      status: {}
-    additionalPrinterColumns:
+  scope: Namespaced
+  subresources:
+    status: {}
+  additionalPrinterColumns:
     - name: Schedule
       type: string
       description: The schedule defining the interval a TZCronJob is run
@@ -31,4 +31,4 @@ spec:
       JSONPath: .status.lastScheduleTime
     - name: Age
       type: date
-      JSONPath: .metadata.creationTimestamp
+      JSONPath: .metadata.creationTimestamp
diff --git a/chart/templates/deployment.yaml b/chart/templates/deployment.yaml
@@ -21,57 +21,61 @@ spec:
         fsGroup: 2 #daemon
       {{- if .Values.sidecar.enabled }}
       volumes:
-      - name: timezonedb
-        emptyDir: {}
+        - name: timezonedb
+          emptyDir: {}
       {{- end }}
       {{- if .Values.sidecar.enabled }}
       initContainers:
-      - name: init-updatetz
-        image: {{ printf "%s:%s" .Values.sidecar.image.repository .Values.sidecar.image.tag | quote }}
-        securityContext:
-{{ toYaml .Values.sidecar.securityContext | indent 10 }}
-        resources:
-          limits:
-            cpu: {{ .Values.sidecar.resources.requests.cpu }}
-            memory: {{ .Values.sidecar.resources.requests.memory }}
-        volumeMounts:
-        - name: timezonedb
-          mountPath: /tmp/zoneinfo
-          readOnly: false
-        env:
-        - name: INIT_CONTAINER
-          value: "true"
-        - name: REFRESH_INTERVAL
-          value: "3s"
+        - name: init-updatetz
+          image: {{ printf "%s:%s" .Values.sidecar.image.repository .Values.sidecar.image.tag | quote }}
+          securityContext:
+{{ toYaml .Values.sidecar.securityContext | indent 12 }}
+          resources:
+            limits:
+              cpu: {{ .Values.sidecar.resources.requests.cpu }}
+              memory: {{ .Values.sidecar.resources.requests.memory }}
+          volumeMounts:
+            - name: timezonedb
+              mountPath: /tmp/zoneinfo
+              readOnly: false
+          env:
+            - name: INIT_CONTAINER
+              value: "true"
+            - name: REFRESH_INTERVAL
+              value: "3s"
       {{- end }}
       containers:
-      - name: {{ .Values.name }}
-        image: {{ printf "%s:%s" .Values.image.repository .Values.image.tag | quote }}
-        resources:
-          requests:
-            cpu: {{ .Values.resources.requests.cpu }}
-            memory: {{ .Values.resources.requests.memory }}
-        args:
-        - --log-level=info
-        {{- if .Values.sidecar.enabled }}
-        volumeMounts:
-        - name: timezonedb
-          mountPath: /usr/share/zoneinfo
-          readOnly: true
-        {{- end }}
+        - name: {{ .Values.name }}
+          image: {{ printf "%s:%s" .Values.image.repository .Values.image.tag | quote }}
+          resources:
+            requests:
+              cpu: {{ .Values.resources.requests.cpu }}
+              memory: {{ .Values.resources.requests.memory }}
+          args:
+            - --log-level=info
+          {{- if .Values.sidecar.enabled }}
+          volumeMounts:
+            - name: timezonedb
+              mountPath: /usr/share/zoneinfo
+              readOnly: true
+          {{- end }}
       {{- if .Values.sidecar.enabled }}
-      - name: updatetz
-        image: {{ printf "%s:%s" .Values.sidecar.image.repository .Values.sidecar.image.tag | quote }}
-        # NB: the security context configuration below may not work
-        # out of the box on OpenShift
-        securityContext:
-{{ toYaml .Values.sidecar.securityContext | indent 10 }}
-        resources:
-          limits:
-            cpu: {{ .Values.sidecar.resources.requests.cpu }}
-            memory: {{ .Values.sidecar.resources.requests.memory }}
-        volumeMounts:
-        - name: timezonedb
-          mountPath: /tmp/zoneinfo
-          readOnly: false
-        {{- end }}
+        - name: updatetz
+          image: {{ printf "%s:%s" .Values.sidecar.image.repository .Values.sidecar.image.tag | quote }}
+          # NB: the security context configuration below may not work
+          # out of the box on OpenShift
+          securityContext:
+{{ toYaml .Values.sidecar.securityContext | indent 12 }}
+          resources:
+            limits:
+              cpu: {{ .Values.sidecar.resources.requests.cpu }}
+              memory: {{ .Values.sidecar.resources.requests.memory }}
+          volumeMounts:
+            - name: timezonedb
+              mountPath: /tmp/zoneinfo
+              readOnly: false
+      {{- end }}
+      {{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+      {{- end }}
diff --git a/chart/templates/rbac.yaml b/chart/templates/rbac.yaml
diff --git a/chart/templates/serviceaccount.yaml b/chart/templates/serviceaccount.yaml
@@ -0,0 +1,8 @@
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ .Values.name }}
+  namespace: {{ .Values.namespace }}
+  labels:
+    name: {{ .Values.name }}
diff --git a/chart/values.yaml b/chart/values.yaml
@@ -24,4 +24,5 @@ sidecar:
     allowPrivilegeEscalation: false
     capabilities:
       drop:
-      - ALL
+        - ALL
+nodeSelector: {}
diff --git a/deploy/crd.yaml b/deploy/crd.yaml
@@ -4,19 +4,19 @@ kind: CustomResourceDefinition
 metadata:
   name: tzcronjobs.cronjobber.hidde.co
 spec:
-    group: cronjobber.hidde.co
-    version: v1alpha1
-    names:
-      plural: tzcronjobs
-      singular: tzcronjob
-      kind: TZCronJob
-      listKind: TZCronJobList
-      shortNames:
+  group: cronjobber.hidde.co
+  version: v1alpha1
+  names:
+    plural: tzcronjobs
+    singular: tzcronjob
+    kind: TZCronJob
+    listKind: TZCronJobList
+    shortNames:
       - tzc
-    scope: Namespaced
-    subresources:
-      status: {}
-    additionalPrinterColumns:
+  scope: Namespaced
+  subresources:
+    status: {}
+  additionalPrinterColumns:
     - name: Schedule
       type: string
       description: The schedule defining the interval a TZCronJob is run
@@ -31,4 +31,4 @@ spec:
       JSONPath: .status.lastScheduleTime
     - name: Age
       type: date
-      JSONPath: .metadata.creationTimestamp
+      JSONPath: .metadata.creationTimestamp