Merge pull request #22 from codecentric/several-improvements

Summarize improvements from old PRs
codecentric · Jan 19, 2024 · 3024454 · 3024454
2 parents 3ec9cab + 6a92d6c
commit 3024454
Show file tree

Hide file tree

Showing 6 changed files with 122 additions and 108 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.17
+FROM alpine:3.19
 
 RUN apk add yq curl --no-cache
 

diff --git a/charts/cluster-overprovisioner/Chart.yaml b/charts/cluster-overprovisioner/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: cluster-overprovisioner
 description: Helm chart, that enables scheduled scaling of a target resource, intended to be add overprovisioning to an autoscaling k8s cluster.
 type: application
-version: 0.7.0
-appVersion: "1.16.0"
+version: 0.8.0
+appVersion: "1.8.9"
 keywords:
   - cluster-autoscaler
   - overprovisioning

diff --git a/charts/cluster-overprovisioner/README.md b/charts/cluster-overprovisioner/README.md
diff --git a/charts/cluster-overprovisioner/templates/cpa-configmap.yaml b/charts/cluster-overprovisioner/templates/cpa-configmap.yaml
@@ -14,7 +14,7 @@ data:
   {{- end }}
 ---
 {{- $labels := include "cluster-overprovisioner.cpa.labels" . -}}
-{{- $namespace := .Values.Namespace -}}
+{{- $namespace := .Release.Namespace -}}
 {{- range $schedule := .Values.schedules }}
 {{- if ne (len $schedule.config) 1 }}
 {{ fail (printf "%s%s." "You need to specify exactly one config for schedule " $schedule.name) }}
@@ -32,7 +32,7 @@ data:
 ---
 {{- end }}
 {{- $labels := include "cluster-overprovisioner.labels" . -}}
-{{- $namespace := .Values.Namespace -}}
+{{- $namespace := .Release.Namespace -}}
 {{- range $schedule := .Values.schedules }}
 apiVersion: v1
 kind: ConfigMap

diff --git a/charts/cluster-overprovisioner/templates/cpa-cronjob.yaml b/charts/cluster-overprovisioner/templates/cpa-cronjob.yaml
@@ -14,6 +14,9 @@ metadata:
 spec:
   failedJobsHistoryLimit: {{ $failedJobsHistoryLimit }}
   successfulJobsHistoryLimit: {{ $successfulJobsHistoryLimit }}
+  {{- if $schedule.timeZone }}
+  timeZone: {{ $schedule.timeZone | quote }}
+  {{- end }}
   schedule: {{ $schedule.cronTimeExpression | quote }}
   jobTemplate:
     spec:
@@ -44,5 +47,18 @@ spec:
                 defaultMode: 0777
             - name: tmp
               emptyDir: {}
+          {{- with $.Values.cpa.nodeSelector }}
+          nodeSelector:
+          {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with $.Values.cpa.affinity }}
+          affinity:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with $.Values.cpa.tolerations }}
+          tolerations:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+
 ---
 {{- end }}
diff --git a/charts/cluster-overprovisioner/values.yaml b/charts/cluster-overprovisioner/values.yaml
@@ -3,9 +3,9 @@
 # Declare variables to be passed into your templates.
 cpa:
   image:
-    repository: k8s.gcr.io/cpa/cluster-proportional-autoscaler
+    repository: registry.k8s.io/cpa/cluster-proportional-autoscaler
     pullPolicy: IfNotPresent
-    tag: 1.8.5
+    tag: v1.8.9
 
   extraArgs:
     - --logtostderr=true
@@ -158,13 +158,14 @@ defaultConfig:
 # If you want to use the schedule-feature, specify as many schedules as you want.
 # Example of a schedule:
 # - name: night
-#  cronTimeExpression: "0 16 * * 1-5"  # disable overprovisioning Monday - Friday from 6pm
-#  config:
-#    ladder:
-#      {
-#        "nodesToReplicas":
-#          [
-#            [0, 0]
-#          ]
-#      }
+#   cronTimeExpression: "0 16 * * 1-5"  # disable overprovisioning Monday - Friday from 6pm
+#   timeZone: America/New_York # https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+#   config:
+#     ladder:
+#       {
+#         "nodesToReplicas":
+#           [
+#             [0, 0]
+#           ]
+#       }
 schedules: []