diff --git a/README.md b/README.md index 0c0c0f6..fe65e31 100644 --- a/README.md +++ b/README.md @@ -95,7 +95,8 @@ You should be good to go! ### Global -| Name | Description | Value | -| ---------------------- | ------------------------------ | ----- | -| `global.imageRegistry` | global image registry override | `""` | -| `global.storageClass` | global storage class override | `""` | +| Name | Description | Value | +| ------------------------- | ---------------------------------- | ----- | +| `global.imageRegistry` | global image registry override | `""` | +| `global.imagePullSecrets` | global image registry pull secrets | `[]` | +| `global.storageClass` | global storage class override | `""` | diff --git a/templates/statefulset.yaml b/templates/statefulset.yaml index 2508499..9157d8e 100644 --- a/templates/statefulset.yaml +++ b/templates/statefulset.yaml @@ -47,12 +47,12 @@ spec: echo "Gitea has been reached!" - name: dind image: "{{ include "gitea.actions.dind.image" . }}" + restartPolicy: Always imagePullPolicy: {{ .Values.statefulset.dind.pullPolicy }} {{- if .Values.statefulset.dind.extraEnvs }} env: {{- toYaml .Values.statefulset.dind.extraEnvs | nindent 12 }} {{- end }} - restartPolicy: Always securityContext: privileged: true startupProbe: @@ -83,6 +83,7 @@ spec: {{- with .Values.statefulset.dind.extraVolumeMounts }} {{- toYaml . | nindent 12 }} {{- end }} + restartPolicy: Always containers: - name: act-runner image: "{{ include "gitea.actions.actRunner.image" . }}" @@ -117,6 +118,12 @@ spec: {{- with .Values.statefulset.actRunner.extraVolumeMounts }} {{- toYaml . | nindent 12 }} {{- end }} + {{- if .Values.global.imagePullSecrets }} + imagePullSecrets: + {{- range .Values.global.imagePullSecrets }} + - name: {{ . }} + {{- end }} + {{- end }} {{- range $key, $value := .Values.statefulset.nodeSelector }} nodeSelector: {{ $key }}: {{ $value | quote }} @@ -143,7 +150,9 @@ spec: name: data-act-runner spec: accessModes: [ "ReadWriteOnce" ] - {{- include "gitea.actions.persistence.storageClass" . | nindent 8 }} + {{- if .Values.global.storageClass }} + {{- include "gitea.actions.persistence.storageClass" . | indent 8 }} + {{- end }} resources: requests: storage: {{ .Values.statefulset.persistence.size }} diff --git a/unittests/helm/config-act-runner.yaml b/unittests/helm/config-act-runner.yaml index 43e9524..7474bdf 100644 --- a/unittests/helm/config-act-runner.yaml +++ b/unittests/helm/config-act-runner.yaml @@ -48,7 +48,7 @@ tests: enabled: true statefulset: actRunner: - config: + config: | container: valid_volumes: - /var/run/docker.sock diff --git a/values.yaml b/values.yaml index 1ba3cf6..375e2e8 100644 --- a/values.yaml +++ b/values.yaml @@ -50,6 +50,22 @@ statefulset: extraVolumes: [] securityContext: {} + dind: + registry: "" + repository: docker + tag: 28.3.3-dind + digest: "" + pullPolicy: IfNotPresent + fullOverride: "" + extraVolumeMounts: [] + + # If the container keeps crashing in your environment, you might have to add the `DOCKER_IPTABLES_LEGACY` environment variable. + # See https://github.com/docker-library/docker/issues/463#issuecomment-1881909456 + extraEnvs: + [] + # - name: "DOCKER_IPTABLES_LEGACY" + # value: "1" + actRunner: registry: "docker.gitea.com" repository: act_runner @@ -125,7 +141,9 @@ giteaRootURL: "" ## @section Global # ## @param global.imageRegistry global image registry override +## @param global.imagePullSecrets global image registry pull secrets ## @param global.storageClass global storage class override global: imageRegistry: "" + imagePullSecrets: [] storageClass: ""