chore: convert chart to a simple one chart for all proxies

Author: portswigger-tim

helm-charts/simplejson-proxy/templates/_helpers.tpl

@@ -1,7 +1,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "ical-simplejson-proxy.name" -}}
+{{- define "simplejson-proxy.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 "ical-simplejson-proxy.fullname" -}}
+{{- define "simplejson-proxy.fullname" -}}
 {{- if .Values.fullnameOverride }}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
 {{- else }}
@@ -26,16 +26,16 @@ 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 "ical-simplejson-proxy.chart" -}}
+{{- define "simplejson-proxy.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
 {{/*
 Common labels
 */}}
-{{- define "ical-simplejson-proxy.labels" -}}
-helm.sh/chart: {{ include "ical-simplejson-proxy.chart" . }}
-{{ include "ical-simplejson-proxy.selectorLabels" . }}
+{{- define "simplejson-proxy.labels" -}}
+helm.sh/chart: {{ include "simplejson-proxy.chart" . }}
+{{ include "simplejson-proxy.selectorLabels" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
@@ -45,7 +45,7 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{/*
 Selector labels
 */}}
-{{- define "ical-simplejson-proxy.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "ical-simplejson-proxy.name" . }}
+{{- define "simplejson-proxy.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "simplejson-proxy.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}

helm-charts/simplejson-proxy/templates/deployment.yaml

@@ -1,18 +1,18 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "ical-simplejson-proxy.fullname" . }}
+  name: {{ include "simplejson-proxy.fullname" . }}
   labels:
-    {{- include "ical-simplejson-proxy.labels" . | nindent 4 }}
+    {{- include "simplejson-proxy.labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
-      {{- include "ical-simplejson-proxy.selectorLabels" . | nindent 6 }}
+      {{- include "simplejson-proxy.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       labels:
-        {{- include "ical-simplejson-proxy.selectorLabels" . | nindent 8 }}
+        {{- include "simplejson-proxy.selectorLabels" . | nindent 8 }}
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:

helm-charts/simplejson-proxy/templates/service.yaml

@@ -1,11 +1,11 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "ical-simplejson-proxy.fullname" . }}
+  name: {{ include "simplejson-proxy.fullname" . }}
 spec:
   type: ClusterIP
   selector:
-    {{- include "ical-simplejson-proxy.selectorLabels" . | nindent 4 }}
+    {{- include "simplejson-proxy.selectorLabels" . | nindent 4 }}
   ports:
     - name: http
       protocol: TCP

helm-charts/simplejson-proxy/values.yaml

@@ -1,4 +1,4 @@
-# Default values for ical-simplejson-proxy
+# Default values for simplejson-proxy
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
@@ -10,8 +10,8 @@ image:
   tag: ""
 
 imagePullSecrets: []
-nameOverride: ""
-fullnameOverride: ""
+nameOverride: "ical-simplejson-proxy"
+fullnameOverride: "ical-simplejson-proxy"
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious