From 52be3a64ad73dde82390737797f8e3bb8be86236 Mon Sep 17 00:00:00 2001 From: Scott Rigby Date: Fri, 13 Nov 2020 09:20:04 -0500 Subject: [PATCH] [stable/spotify-docker-gc] add repo archive notice (#24197) * [stable/spotify-docker-gc] add repo archive notice Signed-off-by: Scott Rigby * [stable/spotify-docker-gc] use apps/v1 Signed-off-by: Carlos Panato Co-authored-by: Carlos Panato --- stable/spotify-docker-gc/Chart.yaml | 2 +- stable/spotify-docker-gc/README.md | 5 ++++ stable/spotify-docker-gc/templates/NOTES.txt | 4 +-- .../spotify-docker-gc/templates/_helpers.tpl | 25 +++++++++++++++---- .../templates/daemonset.yaml | 23 ++++++++++++++--- 5 files changed, 47 insertions(+), 12 deletions(-) diff --git a/stable/spotify-docker-gc/Chart.yaml b/stable/spotify-docker-gc/Chart.yaml index bde03c9ce3..cbba40da13 100644 --- a/stable/spotify-docker-gc/Chart.yaml +++ b/stable/spotify-docker-gc/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: spotify-docker-gc home: https://github.com/spotify/docker-gc -version: 1.0.0 +version: 1.0.1 appVersion: latest description: A simple Docker container and image garbage collection script. sources: diff --git a/stable/spotify-docker-gc/README.md b/stable/spotify-docker-gc/README.md index 5576085c95..efd2480a54 100644 --- a/stable/spotify-docker-gc/README.md +++ b/stable/spotify-docker-gc/README.md @@ -1,3 +1,8 @@ +# ⚠️ Repo Archive Notice + +As of Nov 13, 2020, charts in this repo will no longer be updated. +For more information, see the Helm Charts [Deprecation and Archive Notice](https://github.com/helm/charts#%EF%B8%8F-deprecation-and-archive-notice), and [Update](https://helm.sh/blog/charts-repo-deprecation/). + # Spotify's Docker-GC Helm Chart This chart wraps the [spotify/docker-gc][] Docker image in the form of a [DaemonSet][], so that Docker resource garbage collection occurs on all nodes of a given Kubernetes cluster. diff --git a/stable/spotify-docker-gc/templates/NOTES.txt b/stable/spotify-docker-gc/templates/NOTES.txt index 65bad093d4..a478045bd6 100644 --- a/stable/spotify-docker-gc/templates/NOTES.txt +++ b/stable/spotify-docker-gc/templates/NOTES.txt @@ -1,6 +1,6 @@ The spotify/docker-gc utility is now running on all Kubernetes cluster nodes. -To access the DaemonSet, run 'kubectl get ds --namespace {{ .Release.Namespace }} {{ template "name" . }}' -To access the Pod(s), run 'kubectl get pods --namespace {{ .Release.Namespace }} -l daemonset={{ template "name" . }}' +To access the DaemonSet, run 'kubectl get ds --namespace {{ .Release.Namespace }} {{ include "spotify-docker-gc.name" . }}' +To access the Pod(s), run 'kubectl get pods --namespace {{ .Release.Namespace }} -l daemonset={{ include "spotify-docker-gc.name" . }}' For more information on configuration possibilities of this utility, visit: https://github.com/spotify/docker-gc diff --git a/stable/spotify-docker-gc/templates/_helpers.tpl b/stable/spotify-docker-gc/templates/_helpers.tpl index f7877c321f..99f37e5bf4 100644 --- a/stable/spotify-docker-gc/templates/_helpers.tpl +++ b/stable/spotify-docker-gc/templates/_helpers.tpl @@ -2,15 +2,30 @@ {{/* Expand the name of the chart. */}} -{{- define "name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 24 | trimSuffix "-" -}} +{{- define "spotify-docker-gc.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} {{/* Create a default fully qualified app name. -We truncate at 24 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +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 "fullname" -}} +{{- define "spotify-docker-gc.fullname" -}} +{{- if .Values.fullnameOverride -}} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} +{{- else -}} {{- $name := default .Chart.Name .Values.nameOverride -}} -{{- printf "%s-%s" .Release.Name $name | trunc 24 | trimSuffix "-" -}} +{{- if contains $name .Release.Name -}} +{{- .Release.Name | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} +{{- end -}} +{{- end -}} +{{/* +Create chart name and version as used by the chart label. +*/}} +{{- define "spotify-docker-gc.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} {{- end -}} diff --git a/stable/spotify-docker-gc/templates/daemonset.yaml b/stable/spotify-docker-gc/templates/daemonset.yaml index 2df2eb4ef4..0d811ecd29 100644 --- a/stable/spotify-docker-gc/templates/daemonset.yaml +++ b/stable/spotify-docker-gc/templates/daemonset.yaml @@ -1,16 +1,31 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: DaemonSet metadata: - name: {{ template "name" . }} + name: {{ include "spotify-docker-gc.name" . }} + labels: + app.kubernetes.io/name: {{ include "spotify-docker-gc.name" . }} + helm.sh/chart: {{ include "spotify-docker-gc.chart" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + kubernetes.io/cluster-service: "true" + addonmanager.kubernetes.io/mode: Reconcile spec: {{- if semverCompare "^1.6-0" .Capabilities.KubeVersion.GitVersion }} updateStrategy: type: RollingUpdate {{- end }} + selector: + matchLabels: + app.kubernetes.io/name: {{ include "spotify-docker-gc.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} template: metadata: labels: - daemonset: {{ template "name" . }} + app.kubernetes.io/name: {{ include "spotify-docker-gc.name" . }} + helm.sh/chart: {{ include "spotify-docker-gc.chart" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + kubernetes.io/cluster-service: "true" spec: {{- if .Values.serviceAccount }} serviceAccountName: {{ .Values.serviceAccount }} @@ -20,7 +35,7 @@ spec: {{ toYaml .Values.imagePullSecrets | indent 8 }} {{- end }} containers: - - name: {{ template "name" . }} + - name: {{ include "spotify-docker-gc.name" . }} image: "{{ .Values.image.registry }}/{{ .Values.image.org }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }} command: ["/bin/sh"]