fix: improve chart

2025-10-03 13:04:20 +02:00
parent 744938f8f4
commit d02f63be7a
52 changed files with 3193 additions and 405 deletions
--- a/templates/athens-proxy/_common.tpl
+++ b/templates/athens-proxy/_common.tpl
@@ -0,0 +1,58 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "athens-proxy.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- 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 "athens-proxy.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 }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "athens-proxy.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common annotations
+*/}}
+{{- define "athens-proxy.annotations" -}}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "athens-proxy.labels" -}}
+{{ include "athens-proxy.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+helm.sh/chart: {{ include "athens-proxy.chart" . }}
+{{- end }}
+
+{{/*
+Common selector labels
+*/}}
+{{- define "athens-proxy.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "athens-proxy.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
--- a/templates/athens-proxy/_configMap.tpl
+++ b/templates/athens-proxy/_configMap.tpl
@@ -0,0 +1,33 @@
+---
+
+{{/* annotations */}}
+
+{{- define "athens-proxy.configMap.downloadMode.annotations" -}}
+{{ include "athens-proxy.annotations" . }}
+{{- if .Values.config.downloadMode.configMap.annotations }}
+{{ toYaml .Values.config.downloadMode.configMap.annotations }}
+{{- end }}
+{{- end }}
+
+{{- define "athens-proxy.configMap.gitConfig.annotations" -}}
+{{ include "athens-proxy.annotations" . }}
+{{- if .Values.config.gitConfig.configMap.annotations }}
+{{ toYaml .Values.config.gitConfig.configMap.annotations }}
+{{- end }}
+{{- end }}
+
+{{/* labels */}}
+
+{{- define "athens-proxy.configMap.downloadMode.labels" -}}
+{{ include "athens-proxy.labels" . }}
+{{- if .Values.config.downloadMode.configMap.labels }}
+{{ toYaml .Values.config.downloadMode.configMap.labels }}
+{{- end }}
+{{- end }}
+
+{{- define "athens-proxy.configMap.gitConfig.labels" -}}
+{{ include "athens-proxy.labels" . }}
+{{- if .Values.config.gitConfig.configMap.labels }}
+{{ toYaml .Values.config.gitConfig.configMap.labels }}
+{{- end }}
+{{- end }}
--- a/templates/athens-proxy/_deployment.tpl
+++ b/templates/athens-proxy/_deployment.tpl
@@ -0,0 +1,79 @@
+{{/* vim: set filetype=mustache: */}}
+
+{{/* annotations */}}
+
+{{- define "athens-proxy.deployment.annotations" -}}
+{{ include "athens-proxy.annotations" . }}
+{{- if .Values.deployment.annotations }}
+{{ toYaml .Values.deployment.annotations }}
+{{- end }}
+{{- end }}
+
+{{/* env */}}
+
+{{- define "athens-proxy.deployment.env" -}}
+{{- $env := dict "env" (.Values.deployment.athensProxy.env | default (list) ) }}
+{{- if and .Values.persistence.enabled }}
+{{- $env = merge $env (dict "env" (list (dict "name" "ATHENS_STORAGE_TYPE" "value" "disk") (dict "name" "ATHENS_DISK_STORAGE_ROOT" "value" .Values.persistence.data.mountPath)))}}
+{{- end }}
+{{- if and (hasKey .Values.deployment.athensProxy.resources "limits") (hasKey .Values.deployment.athensProxy.resources.limits "cpu") }}
+{{- $env = merge $env (dict "env" (list (dict "name" "GOMAXPROCS" "valueFrom" (dict "resourceFieldRef" (dict "divisor" "1" "resource" "limits.cpu"))))) }}
+{{- end }}
+{{ toYaml $env }}
+{{- end -}}
+
+
+{{/* envFrom */}}
+
+{{- define "athens-proxy.deployment.envFrom" -}}
+{{- end -}}
+
+{{/* image */}}
+
+{{- define "athens-proxy.deployment.images.athens-proxy.fqin" -}}
+{{- $registry := .Values.deployment.athensProxy.image.registry -}}
+{{- $repository := .Values.deployment.athensProxy.image.repository -}}
+{{- $tag := default .Chart.AppVersion .Values.deployment.athensProxy.image.tag -}}
+{{- printf "%s/%s:v%s" $registry $repository $tag -}}
+{{- end -}}
+
+{{/* labels */}}
+
+{{- define "athens-proxy.deployment.labels" -}}
+{{ include "athens-proxy.labels" . }}
+{{- if .Values.deployment.labels }}
+{{ toYaml .Values.deployment.labels }}
+{{- end }}
+{{- end }}
+
+{{/* serviceAccount */}}
+
+{{- define "athens-proxy.deployment.serviceAccount" -}}
+{{- if .Values.serviceAccount.existing.enabled -}}
+{{- printf "%s" .Values.serviceAccount.existing.serviceAccountName -}}
+{{- else -}}
+{{- include "athens-proxy.fullname" . -}}
+{{- end -}}
+{{- end }}
+
+{{/* volumeMounts */}}
+
+{{- define "athens-proxy.deployment.volumeMounts" -}}
+{{- $volumeMounts := dict "volumeMounts" (.Values.deployment.athensProxy.volumeMounts | default (list) ) }}
+{{- if .Values.persistence.enabled }}
+{{- $volumeMounts = merge $volumeMounts (dict "volumeMounts" (list (dict "name" "data" "mountPath" .Values.persistence.data.mountPath))) }}
+{{- end }}
+{{ toYaml $volumeMounts }}
+{{- end -}}
+
+{{/* volumes */}}
+
+{{- define "athens-proxy.deployment.volumes" -}}
+{{- $volumes := dict "volumes" (.Values.deployment.athensProxy.volumes | default (list) ) }}
+{{- if and .Values.persistence.enabled (not .Values.persistence.data.existingPersistentVolumeClaim.enabled) }}
+{{- $volumes = merge $volumes (dict "volumes" (list (dict "name" "data" "persistentVolumeClaim" (dict "claimName" (include "athens-proxy.persistentVolumeClaim.data.name" $))))) }}
+{{- else if and .Values.persistence.enabled .Values.persistence.data.existingPersistentVolumeClaim.enabled }}
+{{- $volumes = merge $volumes (dict "volumes" (list (dict "name" "data" "persistentVolumeClaim" (dict "claimName" .Values.persistence.data.existingPersistentVolumeClaim.persistentVolumeClaimName)))) }}
+{{- end }}
+{{ toYaml $volumes }}
+{{- end -}}
--- a/templates/athens-proxy/_hpa.tpl
+++ b/templates/athens-proxy/_hpa.tpl
@@ -0,0 +1,19 @@
+---
+
+{{/* annotations */}}
+
+{{- define "athens-proxy.hpa.annotations" -}}
+{{ include "athens-proxy.annotations" . }}
+{{- if .Values.hpa.annotations }}
+{{ toYaml .Values.hpa.annotations }}
+{{- end }}
+{{- end }}
+
+{{/* labels */}}
+
+{{- define "athens-proxy.hpa.labels" -}}
+{{ include "athens-proxy.labels" . }}
+{{- if .Values.hpa.labels }}
+{{ toYaml .Values.hpa.labels }}
+{{- end }}
+{{- end }}
--- a/templates/athens-proxy/_ingress.tpl
+++ b/templates/athens-proxy/_ingress.tpl
@@ -0,0 +1,19 @@
+{{/* vim: set filetype=mustache: */}}
+
+{{/* annotations */}}
+
+{{- define "athens-proxy.ingress.annotations" -}}
+{{ include "athens-proxy.annotations" . }}
+{{- if .Values.ingress.annotations }}
+{{ toYaml .Values.ingress.annotations }}
+{{- end }}
+{{- end }}
+
+{{/* labels */}}
+
+{{- define "athens-proxy.ingress.labels" -}}
+{{ include "athens-proxy.labels" . }}
+{{- if .Values.ingress.labels }}
+{{ toYaml .Values.ingress.labels }}
+{{- end }}
+{{- end }}
--- a/templates/athens-proxy/_networkPolicies.tpl
+++ b/templates/athens-proxy/_networkPolicies.tpl
@@ -0,0 +1,19 @@
+{{/* vim: set filetype=mustache: */}}
+
+{{/* annotations */}}
+
+{{- define "athens-proxy.networkPolicies.annotations" -}}
+{{ include "athens-proxy.annotations" .context }}
+{{- if .networkPolicy.annotations }}
+{{ toYaml .networkPolicy.annotations }}
+{{- end }}
+{{- end }}
+
+{{/* labels */}}
+
+{{- define "athens-proxy.networkPolicies.labels" -}}
+{{ include "athens-proxy.labels" .context }}
+{{- if .networkPolicy.labels }}
+{{ toYaml .networkPolicy.labels }}
+{{- end }}
+{{- end }}
--- a/templates/athens-proxy/_persistentVolumeClaim.tpl
+++ b/templates/athens-proxy/_persistentVolumeClaim.tpl
@@ -0,0 +1,25 @@
+{{/* vim: set filetype=mustache: */}}
+
+{{/* annotations */}}
+
+{{- define "athens-proxy.persistentVolumeClaim.data.annotations" -}}
+{{ include "athens-proxy.annotations" . }}
+{{- if .Values.persistence.data.persistentVolumeClaim.annotations }}
+{{ toYaml .Values.persistence.data.persistentVolumeClaim.annotations}}
+{{- end }}
+{{- end }}
+
+{{/* labels */}}
+
+{{- define "athens-proxy.persistentVolumeClaim.data.labels" -}}
+{{ include "athens-proxy.labels" . }}
+{{- if .Values.persistence.data.persistentVolumeClaim.labels }}
+{{ toYaml .Values.persistence.data.persistentVolumeClaim.labels}}
+{{- end }}
+{{- end }}
+
+{{/* name */}}
+
+{{- define "athens-proxy.persistentVolumeClaim.data.name" -}}
+{{ include "athens-proxy.fullname" . }}-data
+{{- end }}
--- a/templates/athens-proxy/_pod.tpl
+++ b/templates/athens-proxy/_pod.tpl
@@ -0,0 +1,17 @@
+---
+
+{{/* annotations */}}
+
+{{- define "athens-proxy.pod.annotations" -}}
+{{ include "athens-proxy.annotations" . }}
+{{- end }}
+
+{{/* labels */}}
+
+{{- define "athens-proxy.pod.labels" -}}
+{{ include "athens-proxy.labels" . }}
+{{- end }}
+
+{{- define "athens-proxy.pod.selectorLabels" -}}
+{{ include "athens-proxy.selectorLabels" . }}
+{{- end }}
--- a/templates/athens-proxy/_secrets.tpl
+++ b/templates/athens-proxy/_secrets.tpl
@@ -0,0 +1,47 @@
+{{/* vim: set filetype=mustache: */}}
+
+{{/* annotations */}}
+
+{{- define "athens-proxy.secrets.env.annotations" -}}
+{{ include "athens-proxy.annotations" . }}
+{{- if .Values.config.env.secret.annotations }}
+{{ toYaml .Values.config.env.secret.annotations }}
+{{- end }}
+{{- end }}
+
+{{- define "athens-proxy.secrets.netrc.annotations" -}}
+{{ include "athens-proxy.annotations" . }}
+{{- if .Values.config.netrc.secret.annotations }}
+{{ toYaml .Values.config.netrc.secret.annotations }}
+{{- end }}
+{{- end }}
+
+{{- define "athens-proxy.secrets.ssh.annotations" -}}
+{{ include "athens-proxy.annotations" . }}
+{{- if .Values.config.ssh.secret.annotations }}
+{{ toYaml .Values.config.ssh.secret.annotations }}
+{{- end }}
+{{- end }}
+
+{{/* labels */}}
+
+{{- define "athens-proxy.secrets.env.labels" -}}
+{{ include "athens-proxy.labels" . }}
+{{- if .Values.config.env.secret.labels }}
+{{ toYaml .Values.config.env.secret.labels }}
+{{- end }}
+{{- end }}
+
+{{- define "athens-proxy.secrets.netrc.labels" -}}
+{{ include "athens-proxy.labels" . }}
+{{- if .Values.config.netrc.secret.labels }}
+{{ toYaml .Values.config.netrc.secret.labels }}
+{{- end }}
+{{- end }}
+
+{{- define "athens-proxy.secrets.ssh.labels" -}}
+{{ include "athens-proxy.labels" . }}
+{{- if .Values.config.ssh.secret.labels }}
+{{ toYaml .Values.config.ssh.secret.labels }}
+{{- end }}
+{{- end }}
--- a/templates/athens-proxy/_serviceAccount.tpl
+++ b/templates/athens-proxy/_serviceAccount.tpl
@@ -0,0 +1,17 @@
+{{/* vim: set filetype=mustache: */}}
+
+{{/* annotations */}}
+
+{{- define "athens-proxy.serviceAccount.annotations" -}}
+{{- if .Values.serviceAccount.new.annotations }}
+{{ toYaml .Values.serviceAccount.new.annotations }}
+{{- end }}
+{{- end }}
+
+{{/* labels */}}
+
+{{- define "athens-proxy.serviceAccount.labels" -}}
+{{- if .Values.serviceAccount.new.labels }}
+{{ toYaml .Values.serviceAccount.new.labels }}
+{{- end }}
+{{- end }}
--- a/templates/athens-proxy/_services.tpl
+++ b/templates/athens-proxy/_services.tpl
@@ -0,0 +1,29 @@
+{{/* vim: set filetype=mustache: */}}
+
+{{/* annotations */}}
+
+{{- define "athens-proxy.services.http.annotations" -}}
+{{ include "athens-proxy.annotations" . }}
+{{- if .Values.services.http.annotations }}
+{{ toYaml .Values.services.http.annotations }}
+{{- end }}
+{{- end }}
+
+{{/* labels */}}
+
+{{- define "athens-proxy.services.http.labels" -}}
+{{ include "athens-proxy.labels" . }}
+{{/* Add label to select the correct service via `selector.matchLabels` of the serviceMonitor resource. */}}
+app.kubernetes.io/service-name: http
+{{- if .Values.services.http.labels }}
+{{ toYaml .Values.services.http.labels }}
+{{- end }}
+{{- end }}
+
+{{/* names */}}
+
+{{- define "athens-proxy.services.http.name" -}}
+{{- if .Values.services.http.enabled -}}
+{{ include "athens-proxy.fullname" . }}-http
+{{- end -}}
+{{- end -}}
--- a/templates/athens-proxy/configMapDownloadMode.yaml
+++ b/templates/athens-proxy/configMapDownloadMode.yaml
@@ -0,0 +1,19 @@
+{{- if not .Values.config.downloadMode.existingConfigMap.enabled }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  {{- with (include "athens-proxy.configMap.downloadMode.annotations" . | fromYaml) }}
+  annotations:
+    {{- tpl (toYaml .) $ | nindent 4 }}
+  {{- end }}
+  {{- with (include "athens-proxy.configMap.downloadMode.labels" . | fromYaml) }}
+  labels:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  name: {{ include "athens-proxy.fullname" . }}-download-mode-file
+  namespace: {{ .Release.Namespace }}
+data:
+  downloadMode: |
+    {{- tpl .Values.config.downloadMode.configMap.content . | nindent 4 }}
+{{- end }}
--- a/templates/athens-proxy/configMapGitConfig.yaml
+++ b/templates/athens-proxy/configMapGitConfig.yaml
@@ -0,0 +1,19 @@
+{{- if not .Values.config.gitConfig.existingConfigMap.enabled }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  {{- with (include "athens-proxy.configMap.gitConfig.annotations" . | fromYaml) }}
+  annotations:
+    {{- tpl (toYaml .) $ | nindent 4 }}
+  {{- end }}
+  {{- with (include "athens-proxy.configMap.gitConfig.labels" . | fromYaml) }}
+  labels:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  name: {{ include "athens-proxy.fullname" . }}-git-config
+  namespace: {{ .Release.Namespace }}
+data:
+  .gitconfig: |
+    {{- tpl .Values.config.gitConfig.configMap.content . | nindent 4 }}
+{{- end }}
--- a/templates/athens-proxy/deployment.yaml
+++ b/templates/athens-proxy/deployment.yaml
@@ -0,0 +1,135 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  {{- with (include "athens-proxy.deployment.annotations" . | fromYaml) }}
+  annotations:
+    {{- tpl (toYaml .) $ | nindent 4 }}
+  {{- end }}
+  {{- with (include "athens-proxy.deployment.labels" . | fromYaml) }}
+  labels:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  name: {{ include "athens-proxy.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+spec:
+  replicas: {{ .Values.deployment.replicas }}
+  selector:
+    matchLabels:
+      {{- include "athens-proxy.pod.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      annotations:
+        {{- include "athens-proxy.pod.annotations" . | nindent 8 }}
+      labels:
+        {{- include "athens-proxy.pod.labels" . | nindent 8 }}
+    spec:
+      {{- with .Values.deployment.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      containers:
+      - name: athens-proxy
+        {{- with .Values.deployment.athensProxy.args }}
+        args:
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+        {{- with .Values.deployment.athensProxy.command }}
+        command:
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+        {{- $env := (include "athens-proxy.deployment.env" . | fromYaml) }}
+        {{- if and (hasKey $env "env") (gt (len $env.env) 0) }}
+        env:
+        {{- toYaml $env.env | nindent 8 }}
+        {{- end }}
+        {{- $envFrom := (include "athens-proxy.deployment.envFrom" . | fromYaml) }}
+        {{- if and (hasKey $envFrom "envFrom") (gt (len $envFrom.envFrom) 0) }}
+        envFrom:
+        {{- toYaml $envFrom.envFrom | nindent 8 }}
+        {{- end }}
+        image: {{ include "athens-proxy.deployment.images.athens-proxy.fqin" . | quote }}
+        imagePullPolicy: {{ .Values.deployment.athensProxy.image.pullPolicy }}
+        livenessProbe:
+          tcpSocket:
+            port: http
+          failureThreshold: 3
+          initialDelaySeconds: 5
+          periodSeconds: 60
+          successThreshold: 1
+          timeoutSeconds: 3
+        readinessProbe:
+          tcpSocket:
+            port: http
+          failureThreshold: 3
+          initialDelaySeconds: 5
+          periodSeconds: 15
+          successThreshold: 1
+          timeoutSeconds: 3
+        ports:
+        - name: http
+          containerPort: 3000
+          protocol: TCP
+        {{- with .Values.deployment.athensProxy.resources }}
+        resources:
+          {{- toYaml . | nindent 10 }}
+        {{- end }}
+        {{- with .Values.deployment.athensProxy.securityContext }}
+        securityContext:
+          {{- toYaml . | nindent 10 }}
+        {{- end }}
+        {{- $volumeMounts := (include "athens-proxy.deployment.volumeMounts" . | fromYaml) }}
+        {{- if and (hasKey $volumeMounts "volumeMounts") (gt (len $volumeMounts.volumeMounts) 0) }}
+        volumeMounts:
+        {{- toYaml $volumeMounts.volumeMounts | nindent 8 }}
+        {{- end }}
+      {{- with .Values.deployment.dnsConfig }}
+      dnsConfig:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- if .Values.deployment.dnsPolicy }}
+      dnsPolicy: {{ .Values.deployment.dnsPolicy }}
+      {{- end }}
+      {{- if .Values.deployment.hostname }}
+      hostname: {{ .Values.deployment.hostname }}
+      {{- end }}
+      hostNetwork: {{ .Values.deployment.hostNetwork }}
+      {{- with .Values.deployment.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.deployment.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- if .Values.deployment.priorityClassName }}
+      priorityClassName: {{ .Values.deployment.priorityClassName }}
+      {{- end }}
+      {{- if .Values.deployment.restartPolicy }}
+      restartPolicy: {{ .Values.deployment.restartPolicy }}
+      {{- end }}
+      {{- with .Values.deployment.securityContext }}
+      securityContext:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      serviceAccount: {{ include "athens-proxy.deployment.serviceAccount" . }}
+      {{- if .Values.deployment.subdomain }}
+      subdomain: {{ .Values.deployment.subdomain }}
+      {{- end }}
+      terminationGracePeriodSeconds: {{ .Values.deployment.terminationGracePeriodSeconds }}
+      {{- with .Values.deployment.tolerations }}
+      tolerations:
+      {{- toYaml . | nindent 6 }}
+      {{- end }}
+      {{- with .Values.deployment.topologySpreadConstraints }}
+      topologySpreadConstraints:
+      {{- toYaml . | nindent 6 }}
+      {{- end }}
+      {{- $volumes := (include "athens-proxy.deployment.volumes" . | fromYaml) }}
+      {{- if and (hasKey $volumes "volumes") (gt (len $volumes.volumes) 0) }}
+      volumes:
+      {{- toYaml $volumes.volumes | nindent 6 }}
+      {{- end }}
+  {{- with .Values.deployment.strategy }}
+  strategy:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
--- a/templates/athens-proxy/hpa.yaml
+++ b/templates/athens-proxy/hpa.yaml
@@ -0,0 +1,25 @@
+{{- if .Values.hpa.enabled -}}
+---
+apiVersion: autoscaling/v2
+kind: HorizontalPodAutoscaler
+metadata:
+  {{- with (include "athens-proxy.hpa.annotations" . | fromYaml) }}
+  annotations:
+    {{- tpl (toYaml .) $ | nindent 4 }}
+  {{- end }}
+  {{- with (include "athens-proxy.hpa.labels" . | fromYaml) }}
+  labels:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  name: {{ include "athens-proxy.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+spec:
+  metrics:
+  {{- toYaml .Values.hpa.metrics | nindent 2 }}
+  maxReplicas: {{ .Values.hpa.maxReplicas }}
+  minReplicas: {{ .Values.hpa.minReplicas }}
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ include "athens-proxy.fullname" . }}
+{{- end -}}
--- a/templates/athens-proxy/ingress.yaml
+++ b/templates/athens-proxy/ingress.yaml
@@ -0,0 +1,45 @@
+{{- if and .Values.services.http.enabled .Values.ingress.enabled }}
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  {{- with (include "athens-proxy.ingress.annotations" . | fromYaml) }}
+  annotations:
+    {{- tpl (toYaml .) $ | nindent 4 }}
+  {{- end }}
+  {{- with (include "athens-proxy.ingress.labels" . | fromYaml) }}
+  labels:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  name: {{ include "athens-proxy.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+spec:
+  ingressClassName: {{ .Values.ingress.className }}
+  rules:
+  {{- range .Values.ingress.hosts }}
+  - host: {{ tpl .host $ | quote }}
+    http:
+      paths:
+      {{- range .paths }}
+      - path: {{ .path }}
+        {{- if .pathType }}
+        pathType: {{ .pathType }}
+        {{- end }}
+        backend:
+          service:
+            name: {{ include "athens-proxy.services.http.name" $ }}
+            port:
+              number: {{ $.Values.services.http.port }}
+      {{- end }}
+  {{- end }}
+  {{- if .Values.ingress.tls }}
+  tls:
+  {{- range .Values.ingress.tls }}
+  - hosts:
+    {{- range .hosts }}
+    - {{ tpl . $ | quote }}
+    {{- end }}
+    secretName: {{ .secretName | quote }}
+  {{- end }}
+{{- end }}
+{{- end }}
--- a/templates/athens-proxy/networkPolicies.yaml
+++ b/templates/athens-proxy/networkPolicies.yaml
@@ -0,0 +1,36 @@
+{{- if .Values.networkPolicies.enabled }}
+{{- range $key, $value := .Values.networkPolicies -}}
+{{- if and (not (eq $key "enabled")) $value.enabled }}
+---
+apiVersion: networking.k8s.io/v1
+kind: NetworkPolicy
+metadata:
+  {{- with (include "athens-proxy.networkPolicies.annotations" (dict "networkPolicy" $value "context" $) | fromYaml) }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with (include "athens-proxy.networkPolicies.labels" (dict "networkPolicy" $value "context" $) | fromYaml) }}
+  labels:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  name: {{ printf "%s-%s" (include "athens-proxy.fullname" $ ) $key }}
+  namespace: {{ $.Release.Namespace }}
+spec:
+  podSelector:
+    matchLabels:
+      {{- include "athens-proxy.pod.selectorLabels" $ | nindent 6 }}
+  {{- with $value.policyTypes }}
+  policyTypes:
+  {{- toYaml . | nindent 2 }}
+  {{- end }}
+  {{- with $value.egress }}
+  egress:
+  {{- toYaml . | nindent 2 }}
+  {{- end }}
+  {{- with $value.ingress }}
+  ingress:
+  {{- toYaml . | nindent 2 }}
+  {{- end }}
+{{- end }}
+{{- end }}
+{{- end }}
--- a/templates/athens-proxy/persistentVolumeClaim.yaml
+++ b/templates/athens-proxy/persistentVolumeClaim.yaml
@@ -0,0 +1,26 @@
+{{- if and .Values.persistence.enabled (not .Values.persistence.data.existingPersistentVolumeClaim.enabled) }}
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  {{- with (include "athens-proxy.persistentVolumeClaim.data.annotations" . | fromYaml) }}
+  annotations:
+    {{- tpl (toYaml .) $ | nindent 4 }}
+  {{- end }}
+  {{- with (include "athens-proxy.persistentVolumeClaim.data.labels" . | fromYaml) }}
+  labels:
+    {{- tpl (toYaml .) $ | nindent 4 }}
+  {{- end }}
+  name: {{ include "athens-proxy.persistentVolumeClaim.data.name" . }}
+  namespace: {{ $.Release.Namespace }}
+spec:
+  {{- with .Values.persistence.data.persistentVolumeClaim.accessModes }}
+  accessModes:
+    {{ toYaml . | nindent 4 }}
+  {{- end }}
+  resources:
+    requests:
+      storage: {{ .Values.persistence.data.persistentVolumeClaim.storageSize }}
+  {{- if .Values.persistence.data.persistentVolumeClaim.storageClassName }}
+  storageClassName: {{ .Values.persistence.data.persistentVolumeClaim.storageClassName }}
+  {{- end }}
+{{- end }}
--- a/templates/athens-proxy/secretEnv.yaml
+++ b/templates/athens-proxy/secretEnv.yaml
@@ -0,0 +1,20 @@
+{{- if not .Values.config.env.existingSecret.enabled }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  {{- with (include "athens-proxy.secrets.env.annotations" . | fromYaml) }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with (include "athens-proxy.secrets.env.labels" . | fromYaml) }}
+  labels:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  name: {{ include "athens-proxy.fullname" . }}-env
+  namespace: {{ .Release.Namespace }}
+stringData:
+  {{- range $key, $value := .Values.config.env.secret.envs }}
+  {{ upper $key }}: {{ quote $value }}
+  {{- end }}
+{{- end }}
--- a/templates/athens-proxy/secretNetRC.yaml
+++ b/templates/athens-proxy/secretNetRC.yaml
@@ -0,0 +1,19 @@
+{{- if not .Values.config.netrc.existingSecret.enabled }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  {{- with (include "athens-proxy.secrets.netrc.annotations" . | fromYaml) }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with (include "athens-proxy.secrets.netrc.labels" . | fromYaml) }}
+  labels:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  name: {{ include "athens-proxy.fullname" . }}-netrc
+  namespace: {{ .Release.Namespace }}
+stringData:
+  .netrc: |
+    {{- tpl .Values.config.netrc.secret.content . | nindent 4 }}
+{{- end }}
--- a/templates/athens-proxy/secretSSH.yaml
+++ b/templates/athens-proxy/secretSSH.yaml
@@ -0,0 +1,35 @@
+{{- if not .Values.config.ssh.existingSecret.enabled }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  {{- with (include "athens-proxy.secrets.ssh.annotations" . | fromYaml) }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with (include "athens-proxy.secrets.ssh.labels" . | fromYaml) }}
+  labels:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  name: {{ include "athens-proxy.fullname" . }}-ssh
+  namespace: {{ .Release.Namespace }}
+stringData:
+  config: |
+    {{- tpl $.Values.config.ssh.secret.config $ | nindent 4 }}
+  {{- if .Values.config.ssh.secret.id_ed25519 }}
+  id_ed25519: |
+    {{- .Values.config.ssh.secret.id_ed25519 | nindent 4 }}
+  {{- end }}
+  {{- if .Values.config.ssh.secret.id_ed25519_pub }}
+  id_ed25519.pub: |
+    {{- .Values.config.ssh.secret.id_ed25519_pub | nindent 4 }}
+  {{- end }}
+  {{- if .Values.config.ssh.secret.id_rsa }}
+  id_rsa: |
+    {{- .Values.config.ssh.secret.id_rsa | nindent 4 }}
+  {{- end }}
+  {{- if .Values.config.ssh.secret.id_rsa_pub }}
+  id_rsa.pub: |
+    {{- .Values.config.ssh.secret.id_rsa_pub | nindent 4 }}
+  {{- end }}
+{{- end }}
--- a/templates/athens-proxy/serviceAccount.yaml
+++ b/templates/athens-proxy/serviceAccount.yaml
@@ -0,0 +1,25 @@
+{{- if not .Values.serviceAccount.existing.enabled }}
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  {{- with (include "athens-proxy.serviceAccount.annotations" . | fromYaml) }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with (include "athens-proxy.serviceAccount.labels" . | fromYaml) }}
+  labels:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  name: {{ include "athens-proxy.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+automountServiceAccountToken: {{ .Values.serviceAccount.new.automountServiceAccountToken }}
+{{- with .Values.serviceAccount.new.imagePullSecrets }}
+imagePullSecrets:
+  {{- toYaml . | nindent 4 }}
+{{- end }}
+{{- with .Values.serviceAccount.new.secrets }}
+secrets:
+  {{- toYaml . | nindent 4 }}
+{{- end }}
+{{- end }}
--- a/templates/athens-proxy/serviceHTTP.yaml
+++ b/templates/athens-proxy/serviceHTTP.yaml
@@ -0,0 +1,57 @@
+{{- if .Values.services.http.enabled }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  {{- with (include "athens-proxy.services.http.annotations" . | fromYaml) }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with (include "athens-proxy.services.http.labels" . | fromYaml) }}
+  labels:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  name: {{ include "athens-proxy.services.http.name" . }}
+  namespace: {{ .Release.Namespace }}
+spec:
+  {{- if not (empty .Values.services.http.externalIPs) }}
+  externalIPs:
+  {{- range .Values.services.http.externalIPs }}
+  - {{ . }}
+  {{- end }}
+  {{- end }}
+  {{- if and (or (eq .Values.services.http.type "LoadBalancer") (eq .Values.services.http.type "NodePort") ) .Values.services.http.externalTrafficPolicy }}
+  externalTrafficPolicy: {{ .Values.services.http.externalTrafficPolicy }}
+  {{- end }}
+  internalTrafficPolicy: {{ required "No internal traffic policy defined!" .Values.services.http.internalTrafficPolicy }}
+  {{- if .Values.services.http.ipFamilies }}
+  ipFamilies:
+  {{- range .Values.services.http.ipFamilies }}
+  - {{ . }}
+  {{- end }}
+  {{- end }}
+  {{- if and (eq .Values.services.http.type "LoadBalancer") .Values.services.http.loadBalancerClass }}
+  loadBalancerClass: {{ .Values.services.http.loadBalancerClass }}
+  {{- end }}
+  {{- if and (eq .Values.services.http.type "LoadBalancer") .Values.services.http.loadBalancerIP }}
+  loadBalancerIP: {{ .Values.services.http.loadBalancerIP }}
+  {{- end }}
+  {{- if eq .Values.services.http.type "LoadBalancer" }}
+  loadBalancerSourceRanges:
+  {{- range .Values.services.http.loadBalancerSourceRanges }}
+  - {{ . }}
+  {{- end }}
+  {{- end }}
+  ports:
+  - name: http
+    protocol: TCP
+    port: {{ required "No service port defined!" .Values.services.http.port }}
+  selector:
+    {{- include "athens-proxy.pod.selectorLabels" . | nindent 4 }}
+  sessionAffinity: {{ required "No session affinity defined!" .Values.services.http.sessionAffinity }}
+  {{- with .Values.services.http.sessionAffinityConfig }}
+  sessionAffinityConfig:
+    {{- toYaml . | nindent 4}}
+  {{- end }}
+  type: {{ required "No service type defined!" .Values.services.http.type }}
+{{- end }}