This commit is contained in:
kjeld Schouten-Lebbing
2022-03-26 11:12:13 +01:00
parent d49f6d71ce
commit be0470844f
9 changed files with 133 additions and 9 deletions

View File

@@ -34,7 +34,6 @@ jobs:
- name: Run chart-releaser
uses: helm/chart-releaser-action@v1.3.0
with:
charts_dir: charts/*
charts_repo_url: https://library-charts.truecharts.org
env:
CR_TOKEN: "${{ secrets.BOT_TOKEN }}"

View File

@@ -1,6 +1,78 @@
# Changelog<br>
<a name="common-9.1.14"></a>
### [common-9.1.14](https://github.com/truecharts/apps/compare/common-9.1.13...common-9.1.14) (2022-03-26)
#### Chore
* update docker general non-major
#### Fix
* try to fix "did not find expected "-" indicator ([#2275](https://github.com/truecharts/apps/issues/2275))
<a name="common-9.1.13"></a>
### [common-9.1.13](https://github.com/truecharts/apps/compare/common-9.1.12...common-9.1.13) (2022-03-24)
#### Chore
* update docker general non-major
<a name="common-9.1.12"></a>
### [common-9.1.12](https://github.com/truecharts/apps/compare/common-9.1.11...common-9.1.12) (2022-03-24)
#### Fix
* Add mariadbImage to values.yaml ([#2272](https://github.com/truecharts/apps/issues/2272))
<a name="common-9.1.11"></a>
### [common-9.1.11](https://github.com/truecharts/apps/compare/common-9.1.10...common-9.1.11) (2022-03-24)
#### Fix
* typo in mariadb repo ([#2271](https://github.com/truecharts/apps/issues/2271))
<a name="common-9.1.10"></a>
### [common-9.1.10](https://github.com/truecharts/apps/compare/common-9.1.9...common-9.1.10) (2022-03-24)
#### Chore
* update docker general non-major ([#2259](https://github.com/truecharts/apps/issues/2259))
* update docker general non-major
<a name="common-9.1.9"></a>
### [common-9.1.9](https://github.com/truecharts/apps/compare/common-9.1.8...common-9.1.9) (2022-03-20)
#### Fix
* Wait for init ([#2226](https://github.com/truecharts/apps/issues/2226))
<a name="common-9.1.8"></a>
### [common-9.1.8](https://github.com/truecharts/apps/compare/common-9.1.6...common-9.1.8) (2022-03-20)
#### Chore
* update docker general non-major
#### Fix
* add url without ql as some app does not like it ([#2231](https://github.com/truecharts/apps/issues/2231))
<a name="common-9.1.6"></a>
### [common-9.1.6](https://github.com/truecharts/apps/compare/common-9.1.5...common-9.1.6) (2022-03-17)

View File

@@ -15,4 +15,4 @@ maintainers:
name: common
sources: null
type: library
version: 9.1.6
version: 9.1.14

View File

@@ -21,7 +21,7 @@ WARNING: THIS CHART IS NOT MEANT TO BE INSTALLED DIRECTLY
## Support
- Please check our [quick-start guides](https://truecharts.org/manual/Quick-Start%20Guides/01-Open-Apps/) first.
- Please check our [quick-start guides](https://truecharts.org/manual/Quick-Start%20Guides/01-Adding-TrueCharts/) first.
- See the [Wiki](https://truecharts.org)
- Check our [Discord](https://discord.gg/tVsPTHWTtr)
- Open a [issue](https://github.com/truecharts/apps/issues/new/choose)

View File

@@ -48,13 +48,13 @@ This chart is used by a lot of our Apps to provide sane defaults and logic.
| alpineImage | object | See below | alpine specific configuration |
| alpineImage.pullPolicy | string | `"IfNotPresent"` | Specify the Alpine image pull policy |
| alpineImage.repository | string | `"ghcr.io/truecharts/alpine"` | Specify the Alpine image |
| alpineImage.tag | string | `"v3.14.2@sha256:4095394abbae907e94b1f2fd2e2de6c4f201a5b9704573243ca8eb16db8cdb7c"` | Specify the Alpine image tag |
| alpineImage.tag | string | `"v3.15.2@sha256:29ed3480a0ee43f7af681fed5d4fc215516abf1c41eade6938b26d8c9c2c7583"` | Specify the Alpine image tag |
| args | list | `[]` | Override the args for the default container |
| autoscaling | object | <disabled> | Add a Horizontal Pod Autoscaler |
| codeserverImage | object | See below | codeserver specific configuration |
| codeserverImage.pullPolicy | string | `"IfNotPresent"` | Specify the code-server image pull policy |
| codeserverImage.repository | string | `"ghcr.io/truecharts/code-server"` | Specify the code-server image |
| codeserverImage.tag | string | `"v4.1.0@sha256:f96a1fab826dda8f8e0c2050baafe2572c13b2502ac80c412e9bed2171f9869e"` | Specify the code-server image tag |
| codeserverImage.tag | string | `"v4.2.0@sha256:82e2d802e59b26954096529aa08e83bebd2004da664fee9ab6c911e4f5ab6c48"` | Specify the code-server image tag |
| command | list | `[]` | Override the command(s) for the default container |
| configmap | object | See below | Configure configMaps for the chart here. Additional configMaps can be added by adding a dictionary key similar to the 'config' object. |
| configmap.config.annotations | object | `{}` | Annotations to add to the configMap |
@@ -117,6 +117,10 @@ This chart is used by a lot of our Apps to provide sane defaults and logic.
| lifecycle | object | `{}` | Configure the lifecycle for the main container |
| mariadb | object | See below | mariadb dependency configuration |
| mariadb.url | object | `{}` | can be used to make an easy accessable note which URLS to use to access the DB. |
| mariadbImage | object | See below | mariadb specific configuration |
| mariadbImage.pullPolicy | string | `"IfNotPresent"` | Specify the mariadb image pull policy |
| mariadbImage.repository | string | `"ghcr.io/truecharts/mariadb"` | Specify the mariadb image |
| mariadbImage.tag | string | `"v10.7.3@sha256:63743b10ac562b8f63abd3dfa246298c6678cfeb9e7559c65265f5066385fcf6"` | Specify the mariadb image tag |
| netshootImage | object | See below | netshoot specific configuration |
| netshootImage.pullPolicy | string | `"Always"` | Specify the netshoot image pull policy |
| netshootImage.repository | string | `"ghcr.io/truecharts/netshoot"` | Specify the netshoot image |
@@ -203,7 +207,7 @@ This chart is used by a lot of our Apps to provide sane defaults and logic.
| postgresqlImage | object | See below | postgresql specific configuration |
| postgresqlImage.pullPolicy | string | `"IfNotPresent"` | Specify the postgresql image pull policy |
| postgresqlImage.repository | string | `"ghcr.io/truecharts/postgresql"` | Specify the postgresql image |
| postgresqlImage.tag | string | `"v14.2.0@sha256:35f3249e070949e6b694346fb7395b47fcfdf604d138aadfbab42619406110cf"` | Specify the postgresql image tag |
| postgresqlImage.tag | string | `"v14.2.0@sha256:1461d3ab670fcc41923c92f330c932082f6653e031eefd1cc12123adb120f0c3"` | Specify the postgresql image tag |
| priorityClassName | string | `nil` | Custom priority class for different treatment by the scheduler |
| probes | object | See below | [[ref]](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/) |
| probes.liveness | object | See below | Liveness probe configuration |

View File

@@ -53,6 +53,7 @@ initContainers:
{{- include "common.controller.autopermissions" . | nindent 2 }}
{{- include "common.controller.hostpatch" . | nindent 2 }}
{{- include "common.dependencies.postgresql.init" . | nindent 2 }}
{{- include "common.dependencies.mariadb.init" . | nindent 2 }}
{{- if .Release.IsInstall }}
{{- if .Values.installContainers }}
{{- $installContainers := list }}

View File

@@ -0,0 +1,37 @@
{{/*
This template ensures pods with postgresql dependency have a delayed start
*/}}
{{- define "common.dependencies.mariadb.init" -}}
{{- if .Values.mariadb.enabled }}
- name: mariadb-init
image: "{{ .Values.mariadbImage.repository}}:{{ .Values.mariadbImage.tag }}"
env:
- name: MARIADB_HOST
valueFrom:
secretKeyRef:
name: mariadbcreds
key: plainhost
- name: MARIADB_ROOT_PASSWORD
valueFrom:
secretKeyRef:
name: mariadbcreds
key: mariadb-root-password
securityContext:
capabilities:
drop:
- ALL
resources:
{{- with .Values.resources }}
{{- toYaml . | nindent 4 }}
{{- end }}
command: ["bash", "-ec"]
args:
- >
until
mysqladmin -uroot -h"${MARIADB_HOST}" -p"${MARIADB_ROOT_PASSWORD}" ping \
&& mysqladmin -uroot -h"${MARIADB_HOST}" -p"${MARIADB_ROOT_PASSWORD}" status;
do sleep 2;
done
imagePullPolicy: IfNotPresent
{{- end }}
{{- end -}}

View File

@@ -28,6 +28,7 @@ data:
postgresql-postgres-password: {{ $pgPass | b64enc | quote }}
{{- end }}
url: {{ ( printf "postgresql://%v:%v@%v-postgresql:5432/%v" .Values.postgresql.postgresqlUsername $dbPass .Release.Name .Values.postgresql.postgresqlDatabase ) | b64enc | quote }}
url-noql: {{ ( printf "postgres://%v:%v@%v-postgresql:5432/%v" .Values.postgresql.postgresqlUsername $dbPass .Release.Name .Values.postgresql.postgresqlDatabase ) | b64enc | quote }}
urlnossl: {{ ( printf "postgresql://%v:%v@%v-postgresql:5432/%v?sslmode=disable" .Values.postgresql.postgresqlUsername $dbPass .Release.Name .Values.postgresql.postgresqlDatabase ) | b64enc | quote }}
plainporthost: {{ ( printf "%v-%v" .Release.Name "postgresql" ) | b64enc | quote }}
plainhost: {{ ( printf "%v-%v" .Release.Name "postgresql" ) | b64enc | quote }}
@@ -40,6 +41,7 @@ type: Opaque
{{- $_ := set .Values.postgresql.url "plainport" ( ( printf "%v-%v:5432" .Release.Name "postgresql" ) | quote ) }}
{{- $_ := set .Values.postgresql.url "plainporthost" ( ( printf "%v-%v:5432" .Release.Name "postgresql" ) | quote ) }}
{{- $_ := set .Values.postgresql.url "complete" ( ( printf "postgresql://%v:%v@%v-postgresql:5432/%v" .Values.postgresql.postgresqlUsername $dbPass .Release.Name .Values.postgresql.postgresqlDatabase ) | quote ) }}
{{- $_ := set .Values.postgresql.url "complete-noql" ( ( printf "postgres://%v:%v@%v-postgresql:5432/%v" .Values.postgresql.postgresqlUsername $dbPass .Release.Name .Values.postgresql.postgresqlDatabase ) | quote ) }}
{{- $_ := set .Values.postgresql.url "jdbc" ( ( printf "jdbc:postgresql://%v-postgresql:5432/%v" .Release.Name .Values.postgresql.postgresqlDatabase ) | quote ) }}
{{- end }}

View File

@@ -44,7 +44,7 @@ codeserverImage:
# -- Specify the code-server image
repository: ghcr.io/truecharts/code-server
# -- Specify the code-server image tag
tag: v4.1.0@sha256:f96a1fab826dda8f8e0c2050baafe2572c13b2502ac80c412e9bed2171f9869e
tag: v4.2.0@sha256:82e2d802e59b26954096529aa08e83bebd2004da664fee9ab6c911e4f5ab6c48
# -- Specify the code-server image pull policy
pullPolicy: IfNotPresent
@@ -54,7 +54,7 @@ alpineImage:
# -- Specify the Alpine image
repository: ghcr.io/truecharts/alpine
# -- Specify the Alpine image tag
tag: v3.14.2@sha256:4095394abbae907e94b1f2fd2e2de6c4f201a5b9704573243ca8eb16db8cdb7c
tag: v3.15.2@sha256:29ed3480a0ee43f7af681fed5d4fc215516abf1c41eade6938b26d8c9c2c7583
# -- Specify the Alpine image pull policy
pullPolicy: IfNotPresent
@@ -64,10 +64,19 @@ postgresqlImage:
# -- Specify the postgresql image
repository: ghcr.io/truecharts/postgresql
# -- Specify the postgresql image tag
tag: v14.2.0@sha256:35f3249e070949e6b694346fb7395b47fcfdf604d138aadfbab42619406110cf
tag: v14.2.0@sha256:1461d3ab670fcc41923c92f330c932082f6653e031eefd1cc12123adb120f0c3
# -- Specify the postgresql image pull policy
pullPolicy: IfNotPresent
# -- mariadb specific configuration
# @default -- See below
mariadbImage:
# -- Specify the mariadb image
repository: ghcr.io/truecharts/mariadb
# -- Specify the mariadb image tag
tag: v10.7.3@sha256:63743b10ac562b8f63abd3dfa246298c6678cfeb9e7559c65265f5066385fcf6
# -- Specify the mariadb image pull policy
pullPolicy: IfNotPresent
global:
# -- Set an override for the prefix of the fullname