Merge pull request #9 from mkilchhofer/v2_apiVersion_and_labels

refactor!: drop support for helm2, update labels, support v1 Ingress
chartmuseum · Mar 17, 2021 · 2076d41 · 2076d41
2 parents 0db375d + e41722e
commit 2076d41
Show file tree

Hide file tree

Showing 13 changed files with 312 additions and 294 deletions.
diff --git a/ct.yaml b/ct.yaml
@@ -5,3 +5,4 @@ chart-dirs:
 chart-repos:
   - bitnami=https://charts.bitnami.com/bitnami
 helm-extra-args: --timeout 600s
+target-branch: main
diff --git a/src/chartmuseum/Chart.yaml b/src/chartmuseum/Chart.yaml
@@ -1,11 +1,18 @@
-apiVersion: v1
+apiVersion: v2
 description: Host your own Helm Chart Repository
 name: chartmuseum
-version: 2.16.0
+version: 3.0.0
 appVersion: 0.13.0
 home: https://github.com/helm/chartmuseum
-icon: https://raw.githubusercontent.com/chartmuseum/charts/main/logo.jpg 
+icon: https://raw.githubusercontent.com/chartmuseum/charts/main/logo.jpg
 keywords:
-- chartmuseum
-- helm
-- charts repo
+  - chartmuseum
+  - helm
+  - charts repo
+sources:
+  - https://github.com/chartmuseum/charts/tree/main/src/chartmuseum
+  - https://github.com/chartmuseum
+  - https://github.com/helm/chartmuseum
+maintainers:
+  - name: chartmuseum
+    url: https://github.com/chartmuseum
diff --git a/src/chartmuseum/README.md b/src/chartmuseum/README.md
diff --git a/src/chartmuseum/templates/_helpers.tpl b/src/chartmuseum/templates/_helpers.tpl
@@ -1,88 +1,72 @@
-{{- /*
-name defines a template for the name of the chartmuseum chart.
-
-The prevailing wisdom is that names should only contain a-z, 0-9 plus dot (.) and dash (-), and should
-not exceed 63 characters.
-
-Parameters:
-
-- .Values.nameOverride: Replaces the computed name with this given name
-- .Values.namePrefix: Prefix
-- .Values.global.namePrefix: Global prefix
-- .Values.nameSuffix: Suffix
-- .Values.global.nameSuffix: Global suffix
-
-The applied order is: "global prefix + prefix + name + suffix + global suffix"
-
-Usage: 'name: "{{- template "chartmuseum.name" . -}}"'
-*/ -}}
-{{- define "chartmuseum.name"}}
-{{- $global := default (dict) .Values.global -}}
-{{- $base := default .Chart.Name .Values.nameOverride -}}
-{{- $gpre := default "" $global.namePrefix -}}
-{{- $pre := default "" .Values.namePrefix -}}
-{{- $suf := default "" .Values.nameSuffix -}}
-{{- $gsuf := default "" $global.nameSuffix -}}
-{{- $name := print $gpre $pre $base $suf $gsuf -}}
-{{- $name | lower | trunc 54 | trimSuffix "-" -}}
-{{- end -}}
-
-{{- /*
-fullname defines a suitably unique name for a resource by combining
-the release name and the chartmuseum chart name.
-
-The prevailing wisdom is that names should only contain a-z, 0-9 plus dot (.) and dash (-), and should
-not exceed 63 characters.
-
-Parameters:
-
-- .Values.fullnameOverride: Replaces the computed name with this given name
-- .Values.fullnamePrefix: Prefix
-- .Values.global.fullnamePrefix: Global prefix
-- .Values.fullnameSuffix: Suffix
-- .Values.global.fullnameSuffix: Global suffix
-
-The applied order is: "global prefix + prefix + name + suffix + global suffix"
-
-Usage: 'name: "{{- template "chartmuseum.fullname" . -}}"'
-*/ -}}
-{{- define "chartmuseum.fullname"}}
-{{- $global := default (dict) .Values.global -}}
-{{- $base := default (printf "%s-%s" .Release.Name .Chart.Name) .Values.fullnameOverride -}}
-{{- $gpre := default "" $global.fullnamePrefix -}}
-{{- $pre := default "" .Values.fullnamePrefix -}}
-{{- $suf := default "" .Values.fullnameSuffix -}}
-{{- $gsuf := default "" $global.fullnameSuffix -}}
-{{- $name := print $gpre $pre $base $suf $gsuf -}}
-{{- $name | lower | trunc 54 | trimSuffix "-" -}}
-{{- end -}}
-
-
-{{- /*
-chartmuseum.labels.standard prints the standard chartmuseum Helm labels.
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "chartmuseum.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
 
-The standard labels are frequently used in metadata.
-*/ -}}
-{{- define "chartmuseum.labels.standard" -}}
-app: {{ template "chartmuseum.name" . }}
-chart: {{ template "chartmuseum.chartref" . }}
-heritage: {{ .Release.Service | quote }}
-release: {{ .Release.Name | quote }}
-{{- end -}}
+{{/*
+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 "chartmuseum.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
 
 {{- /*
-chartmuseum.chartref prints a chart name and version.
+Create chart name and version as used by the chart label.
 
 It does minimal escaping for use in Kubernetes labels.
 
 Example output:
 
 chartmuseum-0.4.5
 */ -}}
-{{- define "chartmuseum.chartref" -}}
-{{- replace "+" "_" .Chart.Version | printf "%s-%s" .Chart.Name -}}
+{{- define "chartmuseum.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
 {{- end -}}
 
+{{/*
+Common labels
+*/}}
+{{- define "chartmuseum.labels" -}}
+helm.sh/chart: {{ include "chartmuseum.chart" . }}
+{{ include "chartmuseum.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "chartmuseum.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "chartmuseum.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "chartmuseum.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "chartmuseum.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
+
 {{/*
 Return the proper image name to change the volume permissions
 */}}

diff --git a/src/chartmuseum/templates/deployment.yaml b/src/chartmuseum/templates/deployment.yaml
@@ -2,41 +2,31 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "chartmuseum.fullname" . }}
+  {{- with .Values.deployment.annotations }}
   annotations:
-{{ toYaml .Values.deployment.annotations | indent 4 }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   labels:
-{{ include "chartmuseum.labels.standard" . | indent 4 }}
-{{- if .Values.deployment.labels }}
-{{ toYaml .Values.deployment.labels | indent 4 }}
-{{- end }}
+    {{- include "chartmuseum.labels" . | nindent 4 }}
+    {{- if .Values.deployment.labels }}
+    {{- toYaml .Values.deployment.labels | nindent 4 }}
+    {{- end }}
 spec:
   selector:
     matchLabels:
-      app: {{ template "chartmuseum.name" . }}
-      release: {{ .Release.Name | quote }}
-{{- if .Values.deployment.labels }}
-{{ toYaml .Values.deployment.labels | indent 6 }}
-{{- end }}
+      {{- include "chartmuseum.selectorLabels" . | nindent 6 }}
   replicas: {{ .Values.replicaCount }}
   strategy:
 {{ toYaml .Values.strategy | indent 4 }}
   revisionHistoryLimit: 10
-{{- if .Values.deployment.matchlabes }}
-  selector:
-    matchLabels:
-{{ toYaml .Values.deployment.matchlabels | indent 6 }}
-{{- end }}
   template:
     metadata:
-      name: {{ include "chartmuseum.fullname" . }}
+      {{- with .Values.podAnnotations }}
       annotations:
-{{ toYaml .Values.replica.annotations | indent 8 }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       labels:
-        app: {{ template "chartmuseum.name" . }}
-        release: {{ .Release.Name | quote }}
-{{- if .Values.deployment.labels }}
-{{ toYaml .Values.deployment.labels | indent 8 }}
-{{- end }}
+        {{- include "chartmuseum.selectorLabels" . | nindent 8 }}
     spec:
       {{- if .Values.priorityClassName }}
       priorityClassName: "{{ .Values.priorityClassName }}"
@@ -170,40 +160,35 @@ spec:
       tolerations:
 {{ toYaml . | indent 8 }}
     {{- end }}
-    {{- if .Values.deployment.schedulerName }}
-      schedulerName: {{ .Values.deployment.schedulerName }}
-    {{- end -}}
-    {{- if and .Values.serviceAccount.create .Values.serviceAccount.name }}
-      serviceAccountName: {{ .Values.serviceAccount.name }}
-    {{- else if .Values.serviceAccount.create }}
-      serviceAccountName: {{ include "chartmuseum.fullname" . }}
-    {{- else if .Values.serviceAccount.name }}
-      serviceAccountName: {{ .Values.serviceAccount.name }}
+    {{- if .Values.schedulerName }}
+      schedulerName: {{ .Values.schedulerName }}
     {{- end }}
+      serviceAccountName: {{ include "chartmuseum.serviceAccountName" . }}
+      automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }}
       volumes:
       - name: storage-volume
       {{- if .Values.persistence.enabled }}
         persistentVolumeClaim:
           claimName: {{ .Values.persistence.existingClaim | default (include "chartmuseum.fullname" .) }}
       {{- else }}
         emptyDir: {}
-      {{- end -}}
+      {{- end }}
       {{ if .Values.gcp.secret.enabled }}
       - name: {{ include "chartmuseum.fullname" . }}-gcp
         secret:
-      {{ if .Values.env.secret.GOOGLE_CREDENTIALS_JSON }}
+      {{- if .Values.env.secret.GOOGLE_CREDENTIALS_JSON }}
           secretName: {{ include "chartmuseum.fullname" . }}
           items:
           - key: GOOGLE_CREDENTIALS_JSON
             path: credentials.json
-      {{ else }}
+      {{- else }}
           secretName: {{ .Values.gcp.secret.name }}
           items:
           - key: {{ .Values.gcp.secret.key }}
             path: credentials.json
-      {{ end }}
-      {{ end }}
-      {{ if .Values.oracle.secret.enabled }}
+      {{- end }}
+      {{- end }}
+      {{- if .Values.oracle.secret.enabled }}
       - name: {{ include "chartmuseum.fullname" . }}-oracle
         secret:
           secretName: {{ .Values.oracle.secret.name }}

diff --git a/src/chartmuseum/templates/ingress.yaml b/src/chartmuseum/templates/ingress.yaml
@@ -3,21 +3,25 @@
 {{- $serviceName := include "chartmuseum.fullname" . -}}
 {{- $ingressExtraPaths := .Values.ingress.extraPaths -}}
 ---
-{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion }}
+{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion }}
+apiVersion: extensions/v1beta1
+{{- else if semverCompare "<1.19-0" .Capabilities.KubeVersion.GitVersion }}
 apiVersion: networking.k8s.io/v1beta1
 {{- else }}
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 {{- end }}
 kind: Ingress
 metadata:
   name: {{ include "chartmuseum.fullname" . }}
+  {{- with .Values.ingress.annotations }}
   annotations:
-{{ toYaml .Values.ingress.annotations | indent 4 }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   labels:
-{{- if .Values.ingress.labels }}
-{{ toYaml .Values.ingress.labels | indent 4 }}
-{{- end }}
-{{ include "chartmuseum.labels.standard" . | indent 4 }}
+    {{- include "chartmuseum.labels" . | nindent 4 }}
+    {{- with .Values.ingress.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   rules:
   {{- range .Values.ingress.hosts }}
@@ -27,21 +31,45 @@ spec:
       {{- range $ingressExtraPaths }}
       - path: {{ default "/" .path | quote }}
         backend:
-        {{- if $.Values.service.servicename }}
+        {{- if semverCompare "<1.19-0" $.Capabilities.KubeVersion.GitVersion }}
+          {{- if $.Values.service.servicename }}
           serviceName: {{ $.Values.service.servicename }}
-        {{- else }}
+          {{- else }}
           serviceName: {{ default $serviceName .service }}
-        {{- end }}
+          {{- end }}
           servicePort: {{ default $servicePort .port }}
+        {{- else }}
+          service:
+            {{- if $.Values.service.servicename }}
+            name: {{ $.Values.service.servicename }}
+            {{- else }}
+            name: {{ default $serviceName .service }}
+            {{- end }}
+            port:
+              number: {{ default $servicePort .port }}
+        pathType: ImplementationSpecific
+        {{- end }}
       {{- end }}
       - path: {{ default "/" .path | quote }}
         backend:
-        {{- if $.Values.service.servicename }}
+        {{- if semverCompare "<1.19-0" $.Capabilities.KubeVersion.GitVersion }}
+          {{- if $.Values.service.servicename }}
           serviceName: {{ $.Values.service.servicename }}
-        {{- else }}
+          {{- else }}
           serviceName: {{ default $serviceName .service }}
-        {{- end }}
+          {{- end }}
           servicePort: {{ default $servicePort .servicePort }}
+        {{- else }}
+          service:
+            {{- if $.Values.service.servicename }}
+            name: {{ $.Values.service.servicename }}
+            {{- else }}
+            name: {{ default $serviceName .service }}
+            {{- end }}
+            port:
+              number: {{ default $servicePort .port }}
+        pathType: ImplementationSpecific
+        {{- end }}
   {{- end }}
   tls:
   {{- range .Values.ingress.hosts }}

diff --git a/src/chartmuseum/templates/pv.yaml b/src/chartmuseum/templates/pv.yaml
@@ -2,14 +2,9 @@
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-{{- if .Values.persistence.pv.pvname }}
-  name: {{ .Values.persistence.pv.pvname }}
-{{- else }}
-  name: {{ include "chartmuseum.fullname" . }}
-{{- end }}
+  name: {{ .Values.persistence.pv.pvname | default (include "chartmuseum.fullname" .) }}
   labels:
-    app: {{ include "chartmuseum.fullname" . }}
-    release: {{ .Release.Name | quote }}
+    {{- include "chartmuseum.selectorLabels" . | nindent 4 }}
 spec:
   capacity:
     storage: {{ .Values.persistence.pv.capacity.storage }}

diff --git a/src/chartmuseum/templates/pvc.yaml b/src/chartmuseum/templates/pvc.yaml
@@ -4,11 +4,10 @@ apiVersion: v1
 metadata:
   name: {{ include "chartmuseum.fullname" . }}
   labels:
-    app: {{ include "chartmuseum.fullname" . }}
-    release: {{ .Release.Name | quote }}
-{{- if .Values.persistence.labels }}
-{{ toYaml .Values.persistence.labels | indent 4 }}
-{{- end }}
+    {{- include "chartmuseum.selectorLabels" . | nindent 4 }}
+    {{- with .Values.persistence.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   accessModes:
     - {{ .Values.persistence.accessMode | quote }}