From 6ddc855c6bae4b9af0e9bd6687d93ca45ebb2549 Mon Sep 17 00:00:00 2001
From: Hamid FzM <hamidfzm@gmail.com>
Date: Sat, 27 Apr 2024 07:55:37 -0400
Subject: [PATCH] Change labels & add registry mirror

---
 Chart.yaml                |  2 +-
 templates/deployment.yaml | 11 ++++++-----
 templates/pvc.yaml        | 18 ------------------
 values.yaml               | 35 +++++++++++++++++------------------
 4 files changed, 24 insertions(+), 42 deletions(-)

diff --git a/Chart.yaml b/Chart.yaml
index ceec046..61b9df2 100644
--- a/Chart.yaml
+++ b/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
 name: act-runner
 type: application
-version: 1.2.0
+version: 1.3.0
 appVersion: "0.2.10"
diff --git a/templates/deployment.yaml b/templates/deployment.yaml
index c913cf8..4b53da6 100644
--- a/templates/deployment.yaml
+++ b/templates/deployment.yaml
@@ -50,7 +50,7 @@ spec:
             - name: GITEA_RUNNER_LABELS
               value: {{ join "," .Values.act_runner.labels }}
           volumeMounts:
-            - name: {{ include "act_runner.fullname" . }}-docker-data
+            - name: docker-data
               mountPath: /shared
             - name: {{ include "act_runner.fullname" . }}-pvc
               mountPath: /data
@@ -64,13 +64,14 @@ spec:
               value: "overlay2"
             - name: DOCKER_TLS_CERTDIR
               value: ""
+            - name: DOCKER_REGISTRY_MIRROR
+              value: {{ .Values.act_runner.registryMirror }}
           volumeMounts:
-            - name: {{ include "act_runner.fullname" . }}-docker-data
+            - name: docker-data
               mountPath: /shared
       volumes:
-        - name: {{ include "act_runner.fullname" . }}-docker-data
-          persistentVolumeClaim:
-            claimName: {{ include "act_runner.fullname" . }}-shared-pvc
+        - name: docker-data
+          emptyDir: { }
         - name: {{ include "act_runner.fullname" . }}-pvc
           persistentVolumeClaim:
             claimName: {{ include "act_runner.fullname" . }}-pvc
diff --git a/templates/pvc.yaml b/templates/pvc.yaml
index bf0ae62..05e7b4b 100644
--- a/templates/pvc.yaml
+++ b/templates/pvc.yaml
@@ -16,21 +16,3 @@ spec:
     requests:
       storage: "1024Mi"
   storageClassName: {{ .Values.act_runner.storageclass }}
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: {{ include "act_runner.fullname" . }}-shared-pvc
-  labels:
-    {{- include "act_runner.labels" . | nindent 4 }}
-  {{- with .Values.serviceAccount.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-spec:
-  accessModes:
-    - ReadWriteMany
-  resources:
-    requests:
-      storage: {{ .Values.act_runner.sharedStorageSize }}
-  storageClassName: {{ .Values.act_runner.sharedStorageClass }}
diff --git a/values.yaml b/values.yaml
index 88262c8..0b49c1b 100644
--- a/values.yaml
+++ b/values.yaml
@@ -10,7 +10,7 @@ image:
   # Overrides the image tag whose default is the chart appVersion.
   tag: "0.2.10"
 
-imagePullSecrets: []
+imagePullSecrets: [ ]
 nameOverride: ""
 fullnameOverride: ""
 
@@ -18,25 +18,25 @@ serviceAccount:
   # Specifies whether a service account should be created
   create: true
   # Annotations to add to the service account
-  annotations: {}
+  annotations: { }
   # The name of the service account to use.
   # If not set and create is true, a name is generated using the fullname template
   name: ""
 
-podAnnotations: {}
+podAnnotations: { }
 
-podSecurityContext: {}
-  # fsGroup: 2000
+podSecurityContext: { }
+# fsGroup: 2000
 
-securityContext: {}
+securityContext: { }
   # capabilities:
   #   drop:
   #   - ALL
   # readOnlyRootFilesystem: true
   # runAsNonRoot: true
-  # runAsUser: 1000
+# runAsUser: 1000
 
-resources: {}
+resources: { }
   # We usually recommend not to specify default resources and to leave this as a conscious
   # choice for the user. This also increases chances charts run on environments with little
   # resources, such as Minikube. If you do want to specify resources, uncomment the following
@@ -46,7 +46,7 @@ resources: {}
   #   memory: 128Mi
   # requests:
   #   cpu: 100m
-  #   memory: 128Mi
+#   memory: 128Mi
 
 autoscaling:
   enabled: false
@@ -55,21 +55,20 @@ autoscaling:
   targetCPUUtilizationPercentage: 80
   # targetMemoryUtilizationPercentage: 80
 
-nodeSelector: {}
+nodeSelector: { }
 
-tolerations: []
+tolerations: [ ]
 
-affinity: {}
+affinity: { }
 
 act_runner:
   storageclass: "default"
-  sharedStorageSize: "50G"
-  sharedStorageClass: "default"
+  registryMirror: ""
 
   instance: "https://gitea.example.com"
   token: ""
   labels:
-    - "ubuntu-latest:docker://node:16-bullseye"
-    - "ubuntu-22.04:docker://node:16-bullseye"
-    - "ubuntu-20.04:docker://node:16-bullseye"
-    - "ubuntu-18.04:docker://node:16-buster"
+    - "ubuntu-latest:docker://catthehacker/ubuntu:act-latest"
+    - "ubuntu-22.04:docker://catthehacker/ubuntu:act-22.04"
+    - "ubuntu-20.04:docker://catthehacker/ubuntu:act-20.04"
+    - "ubuntu-18.04:docker://catthehacker/ubuntu:act-20.04"
\ No newline at end of file