Make it possible to create vcluster with numbers only name

loft-sh · Sep 24, 2024 · 00ed826 · 00ed826
1 parent d788f21
commit 00ed826
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 13 deletions.
diff --git a/chart/templates/_helper.tpl b/chart/templates/_helper.tpl
@@ -15,3 +15,7 @@
 {{ .repository }}:{{ .tag }}
 {{- end -}}
 {{- end -}}
+
+{{- define "vcluster.name" -}}
+{{- printf "vc-%s" .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
diff --git a/chart/templates/headless-service.yaml b/chart/templates/headless-service.yaml
@@ -3,7 +3,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Release.Name }}-headless
+  name: {{ template "vcluster.name" . }}-headless
   namespace: {{ .Release.Namespace }}
   labels:
     app: vcluster

diff --git a/chart/templates/service.yaml b/chart/templates/service.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Release.Name }}
+  name: {{ template "vcluster.name" . }}
   namespace: {{ .Release.Namespace }}
   labels:
     app: vcluster
@@ -41,6 +41,6 @@ spec:
   {{- if and (not .Values.controlPlane.service.spec.selector) (not .Values.experimental.isolatedControlPlane.headless) }}
   selector:
     app: vcluster
-    release: {{ .Release.Name }}
+    release: {{ template "vcluster.name" . }}
   {{- end }}
 {{- end }}
diff --git a/chart/templates/statefulset.yaml b/chart/templates/statefulset.yaml
@@ -2,7 +2,7 @@
 apiVersion: apps/v1
 kind: {{ include "vcluster.kind" . }}
 metadata:
-  name: {{ .Release.Name }}
+  name: {{ .Release.Name | quote }}
   namespace: {{ .Release.Namespace }}
   labels:
     app: vcluster
@@ -21,13 +21,13 @@ spec:
   selector:
     matchLabels:
       app: vcluster
-      release: {{ .Release.Name }}
+      release: {{ .Release.Name | quote }}
   {{- if eq (include "vcluster.kind" .) "StatefulSet" }}
   {{- if ge (int .Capabilities.KubeVersion.Minor) 27 }}
   persistentVolumeClaimRetentionPolicy:
     whenDeleted: {{ .Values.controlPlane.statefulSet.persistence.volumeClaim.retentionPolicy }}
   {{- end }}
-  serviceName: {{ .Release.Name }}-headless
+  serviceName: {{ template "vcluster.name" . }}-headless
   podManagementPolicy: {{ .Values.controlPlane.statefulSet.scheduling.podManagementPolicy }}
 {{ include "vcluster.persistence" . | indent 2 }}
   {{- else }}
@@ -51,7 +51,7 @@ spec:
       {{- end }}
       labels:
         app: vcluster
-        release: {{ .Release.Name }}
+        release: {{ .Release.Name | quote }}
         {{- if .Values.controlPlane.statefulSet.pods.labels }}
 {{ toYaml .Values.controlPlane.statefulSet.pods.labels | indent 8 }}
         {{- end }}
@@ -87,7 +87,7 @@ spec:
       dnsPolicy: {{ .Values.controlPlane.statefulSet.dnsPolicy }}
       {{- end }}
       {{- if .Values.controlPlane.statefulSet.dnsConfig }}
-      dnsConfig: 
+      dnsConfig:
 {{ toYaml .Values.controlPlane.statefulSet.dnsConfig | indent 8 }}
       {{- end }}
       {{- if .Values.controlPlane.advanced.serviceAccount.name }}

diff --git a/chart/tests/headless-service_test.yaml b/chart/tests/headless-service_test.yaml
@@ -56,7 +56,7 @@ tests:
           count: 1
       - equal:
           path: metadata.name
-          value: my-release-headless
+          value: vc-my-release-headless
       - equal:
           path: metadata.namespace
           value: my-namespace

diff --git a/chart/tests/service_test.yaml b/chart/tests/service_test.yaml
@@ -79,7 +79,7 @@ tests:
           count: 1
       - equal:
           path: metadata.name
-          value: my-release
+          value: vc-my-release
       - equal:
           path: metadata.namespace
           value: my-namespace

diff --git a/chart/tests/statefulset_test.yaml b/chart/tests/statefulset_test.yaml
@@ -426,7 +426,7 @@ tests:
           value: StatefulSet
       - equal:
           path: spec.serviceName
-          value: my-release-headless
+          value: vc-my-release-headless
       - contains:
           path: spec.volumeClaimTemplates
           content:
@@ -452,7 +452,7 @@ tests:
           value: StatefulSet
       - equal:
           path: spec.serviceName
-          value: my-release-headless
+          value: vc-my-release-headless
       - lengthEqual:
           path: spec.volumeClaimTemplates
           count: 1

diff --git a/pkg/config/parse.go b/pkg/config/parse.go
@@ -40,7 +40,7 @@ func ParseConfig(path, name string, setValues []string) (*VirtualClusterConfig,
 	retConfig := &VirtualClusterConfig{
 		Config:              *rawConfig,
 		Name:                name,
-		ControlPlaneService: name,
+		ControlPlaneService: fmt.Sprintf("vc-%s", name),
 	}
 
 	// validate config