diff --git a/charts/gitea/Chart.lock b/charts/gitea/Chart.lock
index 12ae4d638aaf0a34e942e6193e933851d5ef93a0..b4e7b8dc7814eca087feb5b1b3dc8e7374eeeb53 100644
--- a/charts/gitea/Chart.lock
+++ b/charts/gitea/Chart.lock
@@ -1,12 +1,12 @@
dependencies:
- name: mariadb
repository: https://groundhog2k.github.io/helm-charts
- version: 0.2.0
+ version: 0.2.2
- name: postgres
repository: https://groundhog2k.github.io/helm-charts
- version: 0.2.0
+ version: 0.2.3
- name: redis
repository: https://groundhog2k.github.io/helm-charts
- version: 0.2.0
-digest: sha256:af6eae5c008d192ad641787586c71f96d4bdf3893e00fc3df087dd09ec951655
-generated: "2020-12-11T20:00:57.6829646+01:00"
+ version: 0.2.2
+digest: sha256:5b55365cdcbb8606ac9ba99269f83e194828480ef872dbc006c9ea60bb30ab1a
+generated: "2020-12-13T18:58:33.270318+01:00"
diff --git a/charts/gitea/Chart.yaml b/charts/gitea/Chart.yaml
index 65da1102fd766e2e713ec0c3e33300080b37c9c8..19113e231dbd50a80fe2fc3ce7c78de9c7e113bd 100644
--- a/charts/gitea/Chart.yaml
+++ b/charts/gitea/Chart.yaml
@@ -8,21 +8,21 @@ maintainers:
- name: groundhog2k
# This is the chart version
-version: 0.2.0
+version: 0.2.1
# This is the version number of the application being deployed.
appVersion: "1.13.0"
dependencies:
- name: mariadb
- version: 0.2.0
+ version: 0.2.2
repository: "https://groundhog2k.github.io/helm-charts"
condition: mariadb.enabled
- name: postgres
- version: 0.2.0
+ version: 0.2.3
repository: "https://groundhog2k.github.io/helm-charts"
condition: postgres.enabled
- name: redis
- version: 0.2.0
+ version: 0.2.2
repository: "https://groundhog2k.github.io/helm-charts"
condition: redis.enabled
diff --git a/charts/gitea/README.md b/charts/gitea/README.md
index 7d4341589f03ee73e5baeb174504622093454a0c..028b1a1731c141752985321438fb1420c9095bab 100644
--- a/charts/gitea/README.md
+++ b/charts/gitea/README.md
@@ -1,6 +1,6 @@
# Gitea
-  
+  
A Helm chart for Gitea on Kubernetes
@@ -15,7 +15,7 @@ $ helm install my-release groundhog2k/gitea
This chart uses the original [Gitea from Docker](https://hub.docker.com/r/gitea/gitea) to deploy Gitea in Kubernetes.
-It fully supports deployment of arm64v8 and amd64 multi-architecture docker image. Just set the `nodeSelector` value to `kubernetes.io/arch: "arm64"` (default is `"amd64"`)
+It fully supports deployment of the multi-architecture docker image.
## Prerequisites
@@ -43,9 +43,9 @@ $ helm uninstall my-release
| Repository | Name | Version |
|------------|------|---------|
-| @groundhog2k | mariadb | 0.2.0 |
-| @groundhog2k | postgres | 0.2.0 |
-| @groundhog2k | redis | 0.2.0 |
+| @groundhog2k | mariadb | 0.2.2 |
+| @groundhog2k | postgres | 0.2.3 |
+| @groundhog2k | redis | 0.2.2 |
## Common parameters
@@ -65,11 +65,12 @@ $ helm uninstall my-release
| livenessProbe | object | `see values.yaml` | Liveness probe configuration |
| readinessProbe | object | `see values.yaml` | Readiness probe configuration |
| resources | object | `{}` | Resource limits and requests |
-| nodeSelector."kubernetes.io/arch" | string | `"amd64"` | Deployment node selector |
+| nodeSelector | object | `{}` | Deployment node selector |
| podAnnotations | object | `{}` | Additional pod annotations |
| podSecurityContext | object | `see values.yaml` | Pod security context |
| securityContext | object | `see values.yaml` | Container security context |
| env | list | `[]` | Additional container environmment variables |
+| args | list | `[]` | Arguments for the container entrypoint process |
| serviceAccount.create | bool | `false` | Enable service account creation |
| serviceAccount.name | string | `""` | Optional name of the service account |
| serviceAccount.annotations | object | `{}` | Additional service account annotations |
@@ -85,6 +86,8 @@ $ helm uninstall my-release
|-----|------|---------|-------------|
| services.http.type | string | `"ClusterIP"` | Service type |
| services.http.port | int | `80` | Gitea HTTP service port |
+| services.http.nodePort | int | `nil` | Gitea HTTP NodePort (if type NodePort is used) |
+| services.http.clusterIP | int | `nil` | Gitea HTTP ClusterIP (if type LoadBalancer is used) |
| services.ssh.type | string | `"ClusterIP"` | Service type |
| services.ssh.port | int | `22` | Gitea SSH service port |
| services.ssh.nodePort | int | `nil` | Gitea SSH NodePort (if type NodePort is used) |
@@ -142,6 +145,6 @@ $ helm uninstall my-release
|-----|------|---------|-------------|
| storage | object | `{}` | Gitea data storage |
| storage.accessModes[0] | string | `"ReadWriteOnce"` | Storage access mode |
-| storage.persistentVolumeClaimName | string | `""` | PVC name when existing storage volume should be used |
-| storage.requestedSize | string | `""` | Size for new PVC, when no existing PVC is used |
-| storage.className | string | `""` | Storage class name |
+| storage.persistentVolumeClaimName | string | `nil` | PVC name when existing storage volume should be used |
+| storage.requestedSize | string | `nil` | Size for new PVC, when no existing PVC is used |
+| storage.className | string | `nil` | Storage class name |
diff --git a/charts/gitea/charts/mariadb-0.2.0.tgz b/charts/gitea/charts/mariadb-0.2.0.tgz
deleted file mode 100644
index 1f8bed147c8db14c89e4dad9b39a250210a10a1c..0000000000000000000000000000000000000000
Binary files a/charts/gitea/charts/mariadb-0.2.0.tgz and /dev/null differ
diff --git a/charts/gitea/charts/mariadb-0.2.2.tgz b/charts/gitea/charts/mariadb-0.2.2.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..a6ff94ea3d778099e3c13c57749481292dee4a69
Binary files /dev/null and b/charts/gitea/charts/mariadb-0.2.2.tgz differ
diff --git a/charts/gitea/charts/postgres-0.2.0.tgz b/charts/gitea/charts/postgres-0.2.0.tgz
deleted file mode 100644
index ccce0d3997efb7a31825fd3000bf796a32ca13b1..0000000000000000000000000000000000000000
Binary files a/charts/gitea/charts/postgres-0.2.0.tgz and /dev/null differ
diff --git a/charts/gitea/charts/postgres-0.2.3.tgz b/charts/gitea/charts/postgres-0.2.3.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..1783107f72fd9c78f58787afe4018f3d95bd2cb9
Binary files /dev/null and b/charts/gitea/charts/postgres-0.2.3.tgz differ
diff --git a/charts/gitea/charts/redis-0.2.0.tgz b/charts/gitea/charts/redis-0.2.0.tgz
deleted file mode 100644
index 094ca1b3065ffd59004c08a9912ea7390a170508..0000000000000000000000000000000000000000
Binary files a/charts/gitea/charts/redis-0.2.0.tgz and /dev/null differ
diff --git a/charts/gitea/charts/redis-0.2.2.tgz b/charts/gitea/charts/redis-0.2.2.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..7b0a71405cfcdac1376d0a4ba171c90f57aab984
Binary files /dev/null and b/charts/gitea/charts/redis-0.2.2.tgz differ
diff --git a/charts/gitea/templates/deployment.yaml b/charts/gitea/templates/deployment.yaml
index ca5dae68362e9f28ed52dba5e9ed70c557978fe1..6d5bdbd73a25318c07959ca85005061e47ea1967 100644
--- a/charts/gitea/templates/deployment.yaml
+++ b/charts/gitea/templates/deployment.yaml
@@ -23,12 +23,16 @@ spec:
{{- toYaml . | nindent 8 }}
{{- end }}
serviceAccountName: {{ include "gitea.serviceAccountName" . }}
+ {{- with .Values.podSecurityContext }}
securityContext:
- {{- toYaml .Values.podSecurityContext | nindent 8 }}
+ {{- toYaml . | nindent 8 }}
+ {{- end }}
initContainers:
- name: init
+ {{- with .Values.securityContext }}
securityContext:
- {{- toYaml .Values.securityContext | nindent 12 }}
+ {{- toYaml . | nindent 12 }}
+ {{- end }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
command: [ "/scripts/init.sh" ]
volumeMounts:
@@ -39,9 +43,11 @@ spec:
- name: gitea-vol
mountPath: /data
containers:
- - name: {{ .Chart.Name }}
+ - name: {{ .Chart.Name }}^
+ {{- with .Values.securityContext }}
securityContext:
- {{- toYaml .Values.securityContext | nindent 12 }}
+ {{- toYaml . | nindent 12 }}
+ {{- end }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
command: [ "/app/gitea/gitea" ]
@@ -82,8 +88,16 @@ spec:
periodSeconds: {{ .periodSeconds }}
{{- end }}
{{- end }}
+ {{- with .Values.resources }}
resources:
- {{- toYaml .Values.resources | nindent 12 }}
+ {{- toYaml . | nindent 12 }}
+ {{- end }}
+ {{- if .Values.args }}
+ args:
+ {{- range .Values.args }}
+ - {{ . }}
+ {{- end }}
+ {{- end }}
volumeMounts:
- name: run
mountPath: /var/run
diff --git a/charts/gitea/templates/services.yaml b/charts/gitea/templates/services.yaml
index 227d0fe945a79a755d730bd5292131497a439458..0f92c8a843da816dfc63b17bfe3df88bbf0d8908 100644
--- a/charts/gitea/templates/services.yaml
+++ b/charts/gitea/templates/services.yaml
@@ -11,6 +11,12 @@ spec:
targetPort: http
protocol: TCP
name: http
+ {{- if and (eq .Values.services.http.type "NodePort") (.Values.services.http.nodePort) }}
+ nodePort: {{ .Values.services.http.nodePort }}
+ {{- end }}
+ {{- if and (eq .Values.services.http.type "LoadBalancer") (.Values.services.http.clusterIP) }}
+ clusterIP: {{ .Values.services.http.clusterIP }}
+ {{- end }}
selector:
{{- include "gitea.selectorLabels" . | nindent 4 }}
---
diff --git a/charts/gitea/values.yaml b/charts/gitea/values.yaml
index 5c0455e6ebe6f3925d9354d8f7836a42b0c65138..1aa53cfea222cd6393185debb730304efcfa24a8 100644
--- a/charts/gitea/values.yaml
+++ b/charts/gitea/values.yaml
@@ -46,11 +46,13 @@ services:
http:
type: ClusterIP
port: 80
+ nodePort: {}
+ clusterIP: {}
ssh:
type: ClusterIP
port: 22
- # nodePort:
- # clusterIP:
+ nodePort: {}
+ clusterIP: {}
## Ingress configuration
ingress:
@@ -102,10 +104,8 @@ readinessProbe:
successThreshold: 1
periodSeconds: 10
-## Default node type for the image
-## use arm64 for the arm64 image
-nodeSelector:
- kubernetes.io/arch: amd64
+## Additional node selector
+nodeSelector: {}
tolerations: []
@@ -119,6 +119,9 @@ containerSshPort: 8022
## Additional environment variables
env: []
+## Arguments for the container entrypoint process
+args: []
+
## Additional Gitea settings defined in this chart
settings:
## Delay after installation before adminstrative user gets created (Database must be ready and connected)
@@ -151,6 +154,7 @@ gitea:
LFS_START_SERVER: "true"
LFS_CONTENT_PATH: "/data/gitea/lfs"
OFFLINE_MODE: "false"
+ # LFS JWT secret or random value
# LFS_JWT_SECRET:
SSH_ROOT_PATH: "/data/ssh"
@@ -206,13 +210,13 @@ gitea:
## Gitea storage parameters
storage:
## Set persistentVolumenClaimName to reference an existing PVC
- # persistentVolumeClaimName: <own-pvc-name>
+ persistentVolumeClaimName: {}
## Alternative set requestedSize to define a size for a dynmaically created PVC
- # requestedSize: <volume-size>
+ requestedSize: {}
## the storage class name
- # className:
+ className: {}
## Default access mode (ReadWriteOnce)
accessModes:
@@ -245,13 +249,13 @@ mariadb:
# Storage parameters
storage:
## Set persistentVolumenClaimName to reference an existing PVC
- # persistentVolumeClaimName: <own-pvc-name>
+ persistentVolumeClaimName: {}
## Alternative set requestedSize to define a size for a dynmaically created PVC
- # requestedSize: <volume-size>
+ requestedSize: {}
## the storage class name
- # className:
+ className: {}
## PostgreSQL configuration
postgres:
@@ -276,13 +280,13 @@ postgres:
# Storage parameters
storage:
## Set persistentVolumenClaimName to reference an existing PVC
- # persistentVolumeClaimName: <own-pvc-name>
+ persistentVolumeClaimName: {}
## Alternative set requestedSize to define a size for a dynmaically created PVC
- # requestedSize: <volume-size>
+ requestedSize: {}
## the storage class name
- # className:
+ className: {}
## Redis configuration
redis:
@@ -292,10 +296,10 @@ redis:
# Storage parameters
storage:
## Set persistentVolumenClaimName to reference an existing PVC
- # persistentVolumeClaimName: <own-pvc-name>
+ persistentVolumeClaimName: {}
## Alternative set requestedSize to define a size for a dynmaically created PVC
- # requestedSize: <volume-size>
+ requestedSize: {}
## the storage class name
- # className:
+ className: {}