Simplify shared cache node chart

Author: KevinGruber2001

theia-shared-cache/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: theia-shared-cache
-description: A Helm chart for Kubernetes
+description: A Gradle Shared Cache for Theia IDE deployments in Kubernetes
 
 # A chart can be either an 'application' or a 'library' chart.
 #
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
+version: 0.1.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

theia-shared-cache/templates/NOTES.txt

@@ -1,5 +1,5 @@
 1. Port-forward to access the build cache node locally:
 
-  kubectl --namespace {{ .Release.Namespace }} port-forward svc/{{ include "theia-shared-cache.fullname" . }} 5071:5071
+  kubectl --namespace {{ .Release.Namespace }} port-forward svc/theia-shared-cache 5071:5071
 
 Open http://127.0.0.1:5071 in your local Gradle build cache config to test the service.

theia-shared-cache/templates/_helpers.tpl

@@ -1,13 +1,13 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "theia-shared-cache.fullname" . }}-gradle-config
+  name: theia-shared-cache-gradle-config
   labels:
-    app: {{ include "theia-shared-cache.name" . }}
+    app: theia-shared-cache
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
 data:
   gradle.properties: |-
     org.gradle.caching=true
     org.gradle.caching.remote.push=true
-    # Use the release-scoped service name so DNS resolves correctly within the cluster
-    org.gradle.caching.remote.url=http://{{ include "theia-shared-cache.fullname" . }}-node.{{ .Release.Namespace }}.svc.cluster.local:5071
+    # Use the static service name so DNS resolves correctly within the cluster
+    org.gradle.caching.remote.url=http://theia-shared-cache:5071

theia-shared-cache/templates/gradle-configmap.yaml

@@ -1,14 +1,14 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "theia-shared-cache.fullname" . }}-node
+  name: theia-shared-cache
   labels:
-    app.kubernetes.io/name: {{ include "theia-shared-cache.name" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/name: theia-shared-cache
+    app.kubernetes.io/instance: theia-shared-cache
 spec:
   selector:
-    app.kubernetes.io/name: {{ include "theia-shared-cache.name" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/part-of: gradle-enterprise
+    app.kubernetes.io/component: theia-shared-cache
   ports:
     - name: http
       port: 5071

theia-shared-cache/templates/service.yaml

@@ -1,25 +1,25 @@
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: {{ include "theia-shared-cache.fullname" . }}-node
+  name: theia-shared-cache
   labels:
-    app.kubernetes.io/name: {{ include "theia-shared-cache.name" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/name: theia-shared-cache
+    app.kubernetes.io/instance: theia-shared-cache
 spec:
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{ include "theia-shared-cache.name" . }}
-      app.kubernetes.io/instance: {{ .Release.Name }}
-  serviceName: {{ include "theia-shared-cache.fullname" . }}-node
+      app.kubernetes.io/name: theia-shared-cache
+      app.kubernetes.io/instance: theia-shared-cache
+  serviceName: theia-shared-cache
   replicas: {{ .Values.replicaCount | default 1 }}
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: {{ include "theia-shared-cache.name" . }}
-        app.kubernetes.io/instance: {{ .Release.Name }}
+        app.kubernetes.io/name: theia-shared-cache
+        app.kubernetes.io/instance: theia-shared-cache
     spec:
       containers:
-        - name: build-cache-node
+        - name: theia-shared-cache
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           args: ["start"]
           ports:
@@ -28,16 +28,16 @@ spec:
             - name: grpc-bazel
               containerPort: 6011
           resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ toYaml .Values.resources | nindent 12 }}
           env:
             - name: EXCLUSIVE_VOLUME_SIZE
               value: "{{ .Values.persistence.size }}"
           volumeMounts:
             - mountPath: /data
-              name: {{ include "theia-shared-cache.fullname" . }}-data
+              name: theia-shared-cache-data-volume
   volumeClaimTemplates:
     - metadata:
-        name: {{ include "theia-shared-cache.fullname" . }}-data
+        name: theia-shared-cache-data-volume
       spec:
         accessModes:
           - ReadWriteOnce

theia-shared-cache/templates/statefulset.yaml

@@ -1,15 +1,16 @@
 apiVersion: v1
 kind: Pod
 metadata:
-  name: "{{ include "theia-shared-cache.fullname" . }}-test-connection"
+  name: "theia-shared-cache-test-connection"
   labels:
-  {{- include "theia-shared-cache.labels" . | nindent 4 }}
+    app.kubernetes.io/name: theia-shared-cache
+    app.kubernetes.io/instance: theia-shared-cache
   annotations:
     "helm.sh/hook": test
 spec:
   containers:
     - name: wget
       image: busybox
-      command: ['wget']
-  args: ['http://{{ include "theia-shared-cache.fullname" . }}:5071']
+      command: ["wget"]
+  args: ["http://theia-shared-cache:5071"]
   restartPolicy: Never

theia-shared-cache/templates/tests/test-connection.yaml

@@ -13,10 +13,3 @@ persistence:
 
 # Resources applied to the container. Keep empty to use cluster defaults.
 resources: {}
-
-# Gradle configmap settings (operator can mount this ConfigMap)
-gradleConfig:
-  enabled: true
-  # If you want to override the default gradle.properties entirely, set this string.
-  # If empty, the template will write a sensible default using the release service name.
-  gradleProperties: ""