From 92c73e9f63994db0ce3280b583ae298f5c1bef19 Mon Sep 17 00:00:00 2001
From: Johannes Thiem <johannes.thiem@telekom.de>
Date: Mon, 15 Apr 2024 08:57:07 +0200
Subject: [PATCH] fix: chart adjustments

---
 chart/Chart.yaml                |  4 ++--
 chart/templates/_helpers.tpl    | 18 +++++++++---------
 chart/templates/configmap.yaml  |  2 +-
 chart/templates/deployment.yaml | 10 +++++-----
 chart/templates/rbac.yaml       | 12 ++++++------
 chart/values.yaml               | 10 ++++------
 6 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/chart/Chart.yaml b/chart/Chart.yaml
index 420ff56..eb6a14a 100644
--- a/chart/Chart.yaml
+++ b/chart/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
-name: kube-downscaler
-description: A Helm chart for deploying kube-downscaler
+name: py-kube-downscaler
+description: A Helm chart for deploying py-kube-downscaler
 
 type: application
 version: 0.1.0
diff --git a/chart/templates/_helpers.tpl b/chart/templates/_helpers.tpl
index 4d6b869..4dacfb9 100644
--- a/chart/templates/_helpers.tpl
+++ b/chart/templates/_helpers.tpl
@@ -1,7 +1,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "kube-downscaler.name" -}}
+{{- define "py-kube-downscaler.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
@@ -10,7 +10,7 @@ Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 If release name contains chart name it will be used as a full name.
 */}}
-{{- define "kube-downscaler.fullname" -}}
+{{- define "py-kube-downscaler.fullname" -}}
 {{- if .Values.fullnameOverride }}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
 {{- else }}
@@ -26,30 +26,30 @@ If release name contains chart name it will be used as a full name.
 {{/*
 Create chart name and version as used by the chart label.
 */}}
-{{- define "kube-downscaler.chart" -}}
+{{- define "py-kube-downscaler.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
 {{/*
 Common labels
 */}}
-{{- define "kube-downscaler.labels" -}}
-application: {{ include "kube-downscaler.name" . }}
+{{- define "py-kube-downscaler.labels" -}}
+application: {{ include "py-kube-downscaler.name" . }}
 {{- end }}
 
 {{/*
 Selector labels
 */}}
-{{- define "kube-downscaler.selectorLabels" -}}
-application: {{ include "kube-downscaler.name" . }}
+{{- define "py-kube-downscaler.selectorLabels" -}}
+application: {{ include "py-kube-downscaler.name" . }}
 {{- end }}
 
 {{/*
 Create the name of the service account to use
 */}}
-{{- define "kube-downscaler.serviceAccountName" -}}
+{{- define "py-kube-downscaler.serviceAccountName" -}}
 {{- if .Values.serviceAccount.create }}
-{{- default (include "kube-downscaler.fullname" .) .Values.serviceAccount.name }}
+{{- default (include "py-kube-downscaler.fullname" .) .Values.serviceAccount.name }}
 {{- else }}
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}
diff --git a/chart/templates/configmap.yaml b/chart/templates/configmap.yaml
index 8dc3b63..8764211 100644
--- a/chart/templates/configmap.yaml
+++ b/chart/templates/configmap.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "kube-downscaler.name" . }}
+  name: {{ include "py-kube-downscaler.name" . }}
 data:
   # downscale for non-work hours
   EXCLUDE_NAMESPACES: "{{- join ", " .Values.excludedNamespaces }}"
diff --git a/chart/templates/deployment.yaml b/chart/templates/deployment.yaml
index 1b994ef..8cf1ffd 100644
--- a/chart/templates/deployment.yaml
+++ b/chart/templates/deployment.yaml
@@ -2,21 +2,21 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    {{- include "kube-downscaler.labels" . | nindent 4 }}
-  name: {{ include "kube-downscaler.name" . }}
+    {{- include "py-kube-downscaler.labels" . | nindent 4 }}
+  name: {{ include "py-kube-downscaler.name" . }}
 spec:
   {{- if not .Values.autoscaling.enabled }}
   replicas: {{ .Values.replicaCount }}
   {{- end }}
   selector:
     matchLabels:
-      {{- include "kube-downscaler.selectorLabels" . | nindent 6 }}
+      {{- include "py-kube-downscaler.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       labels:
-        {{- include "kube-downscaler.selectorLabels" . | nindent 8 }}
+        {{- include "py-kube-downscaler.selectorLabels" . | nindent 8 }}
     spec:
-      serviceAccountName: {{ include "kube-downscaler.serviceAccountName" . }}
+      serviceAccountName: {{ include "py-kube-downscaler.serviceAccountName" . }}
       containers:
       - name: {{ .Chart.Name }}
         image: {{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}
diff --git a/chart/templates/rbac.yaml b/chart/templates/rbac.yaml
index 6a7d514..e429138 100644
--- a/chart/templates/rbac.yaml
+++ b/chart/templates/rbac.yaml
@@ -1,12 +1,12 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ include "kube-downscaler.name" . }}
+  name: {{ include "py-kube-downscaler.name" . }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ include "kube-downscaler.name" . }}
+  name: {{ include "py-kube-downscaler.name" . }}
 rules:
 - apiGroups:
     - ""
@@ -93,12 +93,12 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: {{ include "kube-downscaler.name" . }}
+  name: {{ include "py-kube-downscaler.name" . }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: {{ include "kube-downscaler.name" . }}
+  name: {{ include "py-kube-downscaler.name" . }}
 subjects:
   - kind: ServiceAccount
-    name: {{ include "kube-downscaler.name" . }}
-    namespace: {{ include "kube-downscaler.name" . }}
+    name: {{ include "py-kube-downscaler.name" . }}
+    namespace: {{ include "py-kube-downscaler.name" . }}
diff --git a/chart/values.yaml b/chart/values.yaml
index dede024..aee6cbf 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -1,11 +1,9 @@
 replicaCount: 1
 
 image:
-  # see https://github.com/hjacobs/kube-downscaler/releases
-  repository: mtr.devops.telekom.de/caas/kube-downscaler
+  repository: ghcr.io/caas-team/py-kube-downscaler
   pullPolicy: IfNotPresent
-  # Overrides the image tag whose default is the chart appVersion.
-  tag: "23.2.0@sha256:4129e7e7551eb451ee2b43680ef818f3057304ad50888f79ec9722afab6c29ff"
+  tag: "{{ .Values.image.tag | default .Chart.AppVersion }}"  # Dynamically set from CI
 
 arguments:
   - --interval=60
@@ -66,10 +64,10 @@ tolerations: []
 affinity: {}
 
 # Used to configure the env
-configMapName: kube-downscaler
+configMapName: py-kube-downscaler
 
 # Namespaces being excluded from the 'downscale for non-work hours'
 # DEFAULT_UPTIME: "Mon-Fri 07:30-20:30 CET"
 excludedNamespaces:
-  - kube-downscaler
+  - py-kube-downscaler
   - kube-system