Compare commits

..

47 Commits

Author SHA1 Message Date
d862f7c132 Added helm chart upload 2024-01-06 11:59:34 +01:00
7cbab35102 Merge branch 'dev-newchart' 2024-01-06 11:50:35 +01:00
721dc409ad Update .gitlab-ci.yml 2023-10-30 23:47:38 +01:00
0ada9155eb Parameterize webp conversion 2023-10-30 23:44:39 +01:00
5129be3fc8 Swap imagepullpolicy to always 2023-10-05 18:27:07 +02:00
f70afe5523 Restore webp conversion for init running as job 2023-09-23 18:26:16 +00:00
d6292ca4b0 Fixed labels 2023-09-23 13:41:10 +00:00
c514a76b5e Added restart policy to job 2023-09-23 13:28:50 +00:00
6287a199b8 Added topology key 2023-09-23 13:26:34 +00:00
d884c6cb2b Fixed selector 2023-09-23 13:25:04 +00:00
b7e034847e Fixed topology selector 2023-09-23 13:23:44 +00:00
cbb973550c Added option to run init as a job instead of initContainers 2023-09-23 12:49:56 +00:00
Lars
041946b804 Add customization for proc values 2023-09-13 14:05:07 +02:00
Lars
9793780639 Fix ing, deployment 2023-09-13 13:43:29 +02:00
Lars
a5d7592dc7 IfNotExists => IfNotPResent 2023-09-13 10:56:52 +02:00
Lars
e6b0bb2db2 Updated pull policy for main container since init container pulls image 2023-09-13 10:54:07 +02:00
Lars
e3d4952df6 fixed pointer to addt env 2023-09-13 10:41:57 +02:00
Lars
7bc8d7f084 Update secret type for docker 2023-09-13 10:33:11 +02:00
Lars
06b0355568 Fixed storage provisioner annot 2023-09-13 10:19:53 +02:00
Lars
5f6e0e9e35 Added missing separator to pvc yaml 2023-09-13 10:16:39 +02:00
Lars
8748fa515b Correction to PVC 2023-09-13 10:10:44 +02:00
Lars
fbbeb2e407 Fixed inconsistent pvc names 2023-09-13 10:09:51 +02:00
Lars
d84ebe5751 Added unit json file to mounts 2023-09-13 10:04:13 +02:00
Lars
a062df8654 Fixed issuerRef/kind for cert
Fixed default for additional domains
2023-09-13 09:59:23 +02:00
Lars
900cfed378 Moved data for externalsecret to correct indentation 2023-09-13 09:50:00 +02:00
Lars
cb2b3a2c3a Fixed cert choices 2023-09-12 16:17:14 +02:00
Lars
0c992a6d46 Release version 1.0.0 2023-09-12 15:45:08 +02:00
2604afabb5 Added /var/cloud as default mount 2023-09-08 09:34:28 +02:00
10c0b70359 Deactivated WPCReg Job 2023-09-05 17:27:11 +02:00
9abb6ce3cb Remove autoregister by default 2023-07-19 09:17:49 +02:00
ea197d2006 Fixed port, added starttls 2023-07-19 00:29:37 +02:00
c735392ee5 Updated email port for amazon SES 2023-07-18 23:51:56 +02:00
63f651d622 Add processes to unit 2023-07-18 23:39:38 +02:00
81a2fb2c7f Moved 302 section before wildcard section 2023-07-18 23:29:52 +02:00
8d8630b0c5 Added redirect for login page 2023-07-18 23:27:15 +02:00
a7c67e138c Fixed wrong name for field 2023-07-17 23:45:03 +02:00
8cda255fae Added choice for SMTP server 2023-07-17 23:33:32 +02:00
fa6f0ff85a Changed to command + args 2023-07-10 18:56:09 +02:00
c23ff885f2 == to eq 2023-07-10 18:48:17 +02:00
d252b09a5d Added conditional for init container command 2023-07-10 18:46:33 +02:00
04b1992002 Bugfix 2023-06-29 22:28:15 +02:00
57f012a639 Fixed bug 2023-06-29 22:24:42 +02:00
d952476420 Dynamic provisioning for PVC 2023-06-29 22:23:33 +02:00
3fd277dd88 Updated persistent volume 2023-06-29 22:17:44 +02:00
1f86724ba5 Bump version 2023-06-29 22:09:40 +02:00
47168eb6dc Fixed include 2023-06-29 22:07:54 +02:00
87384c8b63 Added local disk 2023-06-29 22:04:37 +02:00
4 changed files with 8 additions and 140 deletions

View File

@@ -1,12 +1,12 @@
name: Upload Helm Chart
run-name: Uploading helm chart
on: [push]
on: [release]
jobs:
Explore-Gitea-Actions:
runs-on: shell
env:
HELM_CHART_VERSION: "1.0.24"
HELM_CHART_VERSION: "${{ github.event.release_name }}"
steps:
- uses: actions/checkout@v2
- name: Set up Helm
@@ -15,10 +15,9 @@ jobs:
version: 'v3.0.0'
- run: 'sed -i "s/version:.*/version: \"${HELM_CHART_VERSION}\"/" ./Chart/Chart.yaml'
- run: helm package ./Chart
- run: echo ${{ secrets.GITEA_TOKEN }} > /tmp/gitea-token
- name: Upload Helm Chart
run: |
curl --request POST \
--user ${{ secrets.HELM_PKG_UPLOAD_USER }}:${{ secrets.HELM_PKG_UPLOAD_PASS }} \
--form "chart=@wordyne-${HELM_CHART_VERSION}.tgz" \
https://git.cloudyne.io/api/packages/helm/helm/api/charts
https://git.cloudyne.io/api/packages/helm/helm/api/charts

4
.gitignore vendored
View File

@@ -1,2 +1,4 @@
example.yaml
example*.yaml
example*.yaml
example*.yml
test-*.yaml

View File

@@ -1,5 +1,5 @@
variables:
HELM_CHART_VERSION: "0.6.13"
HELM_CHART_VERSION: "1.0.24"
stages:
- deploy
@@ -9,9 +9,7 @@ default:
name: cloudyne/kubectl-helm:latest
entrypoint: [""]
tags:
- build01
- helm
- chartbuild
- shell
deploy:
stage: deploy

View File

@@ -1,131 +0,0 @@
{{- if .Values.init.asJob }}
apiVersion: batch/v1
kind: Job
metadata:
name: {{ include "..fullname" . }}-initializer
labels:
{{- include "..labels" . | nindent 4 }}
cloudyne.systems/component: site-init
spec:
backoffLimit: 2
template:
spec:
restartPolicy: "OnFailure"
affinity: {{ include "..affinity-labels" . | nindent 8 }}
securityContext:
fsGroup: 101
volumes:
- name: serverconfig
configMap:
name: {{ include "..fullname" . }}-cfg
{{- if and .Values.secrets .Values.secrets.external }}
{{- range .Values.secrets.external }}
{{- if eq .type "file" }}
- name: {{ .name }}
secret:
secretName: {{- include "..fullname" $ }}-exts-{{ .name }}
{{- end }}
{{- end }}
{{- end }}
{{- if .Values.storage.kubernetes }}
{{- range .Values.storage.kubernetes }}
- name: {{ .name }}
{{- if eq .type "secret" }}
secret:
secretName: "{{- include "..fullname" $ }}-sec-{{ .name }}"
{{- end }}
{{- if eq .type "configmap" }}
configMap:
name: "{{- include "..fullname" $ }}-sec-{{ .name }}"
{{- end }}
{{- end }}
{{- end }}
{{- if .Values.storage.cloud.active }}
- name: cloud
persistentVolumeClaim:
claimName: pvc-{{- include "..name" . }}-cloud
{{- end }}
{{- if .Values.storage.local.active }}
- name: local
persistentVolumeClaim:
claimName: pvc-{{- include "..name" . }}-local
{{- end }}
{{- if and .Values.secrets .Values.secrets.external }}
{{- range .Values.secrets.external }}
{{- if eq .type "docker" }}
imagePullSecrets:
- name: "{{- include "..fullname" $ }}-exts-{{ .name }}"
{{- end }}
{{- end }}
{{- end }}
{{- if .Values.storage.kubernetes }}
{{- range .Values.storage.kubernetes }}
{{- if eq .type "docker" }}
imagePullSecrets:
- name: "{{- include "..fullname" $ }}-sec-{{ .name }}"
{{- end }}
{{- end }}
{{- end }}
{{- if and .Values.storage.cloud.active .Values.storage.local.active .Values.storage.local.cloneCloud }}
initContainers:
- name: init-local-storage
securityContext:
allowPrivilegeEscalation: false
runAsUser: 0
image: cloudyne/ubuntu-ci:latest
command: ["python3"]
args: ["/usr/local/bin/storage-clone", "/mnt/cloud", "/mnt/local"]
imagePullPolicy: IfNotPresent
volumeMounts:
- name: cloud
mountPath: /mnt/cloud
- name: local
mountPath: /mnt/local
{{- end }}
containers:
- name: init-site
securityContext:
allowPrivilegeEscalation: false
runAsUser: 0
image: "{{ .Values.site.image }}"
imagePullPolicy: IfNotPresent
volumeMounts:
- name: serverconfig
mountPath: /init-go/config.json
subPath: init.json
{{- if .Values.storage.local.active }}
{{- range .Values.storage.folders }}
- name: local
mountPath: "/app/web/app/{{ . }}"
subPath: "{{ . }}"
{{- end }}
{{- if .Values.storage.cloud.active }}
- name: cloud
mountPath: "/mnt/cloud"
{{- end }}
{{- else }}
{{- if .Values.storage.cloud.active }}
{{- range .Values.storage.folders }}
- name: cloud
mountPath: "/app/web/app/{{ . }}"
subPath: "{{ . }}"
{{- end }}
{{- end }}
{{- end }}
envFrom:
- configMapRef:
name: {{ include "..fullname" . }}-env
{{- if and .Values.secrets .Values.secrets.external }}
{{- range .Values.secrets.external }}
{{- if eq .type "env" }}
- secretRef:
name: "{{- include "..fullname" $ }}-exts-{{ .name }}"
{{- end }}
{{- end }}
{{- end }}
- secretRef:
name: {{ include "..fullname" . }}-db-auth
command: ["sh"]
args: ["-c", "/init-go/init-go"]
{{- end }}