refactor: remove k8s & eks helm hooks & cleanup charts

loft-sh · Oct 25, 2023 · f3a496d · f3a496d
1 parent 8eca39e
commit f3a496d
Show file tree

Hide file tree

Showing 52 changed files with 1,166 additions and 1,483 deletions.
diff --git a/charts/eks/templates/_helpers.tpl b/charts/eks/templates/_helpers.tpl
@@ -71,21 +71,6 @@ Whether to create a cluster role or not
 {{- printf "vc-mn-%s-v-%s" .Release.Name .Release.Namespace | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "vcluster.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Get
-*/}}
-{{- $}}
-{{- define "vcluster.admin.accessKey" -}}
-{{- now | unixEpoch | toString | trunc 8 | sha256sum -}}
-{{- end -}}
-
 {{/*
 Syncer flags for enabling/disabling controllers
 Prints only the flags that modify the defaults:

diff --git a/charts/eks/templates/ingress.yaml b/charts/eks/templates/ingress.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.ingress.enabled }}
-apiVersion: {{ .Values.ingress.apiVersion }}
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   {{- $annotations := merge .Values.ingress.annotations .Values.globalAnnotations  }}

diff --git a/charts/eks/templates/pre-install-hook-job-role.yaml b/charts/eks/templates/pre-install-hook-job-role.yaml
diff --git a/charts/eks/templates/pre-install-hook-job-rolebinding.yaml b/charts/eks/templates/pre-install-hook-job-rolebinding.yaml
diff --git a/charts/eks/templates/pre-install-hook-job-serviceaccount.yaml b/charts/eks/templates/pre-install-hook-job-serviceaccount.yaml
diff --git a/charts/eks/templates/pre-install-hook-job.yaml b/charts/eks/templates/pre-install-hook-job.yaml
diff --git a/charts/eks/templates/syncer-deployment.yaml b/charts/eks/templates/syncer-deployment.yaml
@@ -75,8 +75,7 @@ spec:
         - name: tmp
           emptyDir: {}
         - name: certs
-          secret:
-            secretName: {{ .Release.Name }}-certs
+          emptyDir: {}
       {{- if .Values.syncer.volumes }}
 {{ toYaml .Values.syncer.volumes | indent 8 }}
       {{- end }}
@@ -234,7 +233,11 @@ spec:
             mountPath: /.cache/helm
           - name: tmp
             mountPath: /tmp
+          - mountPath: /pki
+            name: certs
+        {{- if .Values.syncer.volumeMounts }}
 {{ toYaml .Values.syncer.volumeMounts | indent 10 }}
+        {{- end }}
         {{- if .Values.syncer.extraVolumeMounts }}
 {{ toYaml .Values.syncer.extraVolumeMounts | indent 10 }}
         {{- end }}

diff --git a/charts/eks/values.yaml b/charts/eks/values.yaml
@@ -138,9 +138,6 @@ syncer:
     - mountPath: /manifests/coredns
       name: coredns
       readOnly: true
-    - mountPath: /pki
-      name: certs
-      readOnly: true
   extraVolumeMounts: []
   env: []
   livenessProbe:
@@ -388,37 +385,12 @@ service:
   # Set the loadBalancerClass if using an external load balancer controller
   loadBalancerClass: ""
 
-# job configuration
-job:
-  enabled: true
-  volumes: []
-  volumeMounts: []
-  extraArgs: []
-  priorityClassName: ""
-  nodeSelector: {}
-  affinity: {}
-  tolerations: []
-  resources: {}
-  podAnnotations: {}
-  podLabels: {}
-  # Security context configuration of the container
-  securityContext:
-    capabilities:
-      drop:
-        - ALL
-    allowPrivilegeEscalation: false
-    readOnlyRootFilesystem: true
-    runAsNonRoot: true
-    runAsUser: 10001
-    runAsGroup: 10001
-
 # Configure the ingress resource that allows you to access the vcluster
 ingress:
   # Enable ingress record generation
   enabled: false
   # Ingress path type
   pathType: ImplementationSpecific
-  apiVersion: networking.k8s.io/v1
   ingressClassName: ""
   host: vcluster.local
   annotations:

diff --git a/charts/k0s/templates/_helpers.tpl b/charts/k0s/templates/_helpers.tpl
@@ -71,21 +71,6 @@ Whether to create a cluster role or not
 {{- printf "vc-mn-%s-v-%s" .Release.Name .Release.Namespace | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "vcluster.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Get
-*/}}
-{{- $}}
-{{- define "vcluster.admin.accessKey" -}}
-{{- now | unixEpoch | toString | trunc 8 | sha256sum -}}
-{{- end -}}
-
 {{/*
 Syncer flags for enabling/disabling controllers
 Prints only the flags that modify the defaults:

diff --git a/charts/k0s/templates/ingress.yaml b/charts/k0s/templates/ingress.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.ingress.enabled }}
-apiVersion: {{ .Values.ingress.apiVersion }}
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   {{- $annotations := merge .Values.ingress.annotations .Values.globalAnnotations }}

diff --git a/charts/k0s/values.yaml b/charts/k0s/values.yaml
@@ -279,7 +279,6 @@ ingress:
   enabled: false
   # Ingress path type
   pathType: ImplementationSpecific
-  apiVersion: networking.k8s.io/v1
   ingressClassName: ""
   host: vcluster.local
   annotations:

diff --git a/charts/k3s/templates/_helpers.tpl b/charts/k3s/templates/_helpers.tpl
@@ -71,21 +71,6 @@ Whether to create a cluster role or not
 {{- printf "vc-mn-%s-v-%s" .Release.Name .Release.Namespace | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "vcluster.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Get
-*/}}
-{{- $}}
-{{- define "vcluster.admin.accessKey" -}}
-{{- now | unixEpoch | toString | trunc 8 | sha256sum -}}
-{{- end -}}
-
 {{/*
 Syncer flags for enabling/disabling controllers
 Prints only the flags that modify the defaults:

diff --git a/charts/k3s/templates/ingress.yaml b/charts/k3s/templates/ingress.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.ingress.enabled }}
-apiVersion: {{ .Values.ingress.apiVersion }}
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   {{- $annotations := merge .Values.ingress.annotations .Values.globalAnnotations }}

diff --git a/charts/k3s/values.yaml b/charts/k3s/values.yaml
@@ -296,7 +296,6 @@ ingress:
   enabled: false
   # Ingress path type
   pathType: ImplementationSpecific
-  apiVersion: networking.k8s.io/v1
   ingressClassName: ""
   host: vcluster.local
   annotations:

diff --git a/charts/k8s/templates/_helpers.tpl b/charts/k8s/templates/_helpers.tpl
@@ -71,21 +71,6 @@ Whether to create a cluster role or not
 {{- printf "vc-mn-%s-v-%s" .Release.Name .Release.Namespace | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "vcluster.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Get
-*/}}
-{{- $}}
-{{- define "vcluster.admin.accessKey" -}}
-{{- now | unixEpoch | toString | trunc 8 | sha256sum -}}
-{{- end -}}
-
 {{/*
 Syncer flags for enabling/disabling controllers
 Prints only the flags that modify the defaults:

diff --git a/charts/k8s/templates/ingress.yaml b/charts/k8s/templates/ingress.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.ingress.enabled }}
-apiVersion: {{ .Values.ingress.apiVersion }}
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   {{- $annotations := merge .Values.ingress.annotations .Values.globalAnnotations }}

diff --git a/charts/k8s/templates/pre-install-hook-job-role.yaml b/charts/k8s/templates/pre-install-hook-job-role.yaml