[stable/spotify-docker-gc] add repo archive notice (#24197)

* [stable/spotify-docker-gc] add repo archive notice

Signed-off-by: Scott Rigby <scott@r6by.com>

* [stable/spotify-docker-gc] use apps/v1

Signed-off-by: Carlos Panato <ctadeu@gmail.com>

Co-authored-by: Carlos Panato <ctadeu@gmail.com>

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:

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.

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

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 -}}

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"]