Skip to content

Commit

Permalink
fix: chart adjustments
Browse files Browse the repository at this point in the history
  • Loading branch information
Fovty committed Apr 15, 2024
1 parent b7c4aa1 commit 92c73e9
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 29 deletions.
4 changes: 2 additions & 2 deletions chart/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
18 changes: 9 additions & 9 deletions chart/templates/_helpers.tpl
Original file line number Diff line number Diff line change
@@ -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 }}

Expand All @@ -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 }}
Expand All @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion chart/templates/configmap.yaml
Original file line number Diff line number Diff line change
@@ -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 }}"
10 changes: 5 additions & 5 deletions chart/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
12 changes: 6 additions & 6 deletions chart/templates/rbac.yaml
Original file line number Diff line number Diff line change
@@ -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:
- ""
Expand Down Expand Up @@ -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" . }}
10 changes: 4 additions & 6 deletions chart/values.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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

0 comments on commit 92c73e9

Please sign in to comment.