helm/wordyne
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Quoted bools, removed quota

Browse Source
This commit is contained in:
Lars Scheibling
2023-03-19 20:20:41 +00:00
parent e8095a7674
commit 9f91f4efe5
17 changed files with 48 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
chart/templates/NOTES.txt Normal file
View File

@@ -0,0 +1,11 @@
You have successfully installed your new website {{ .Values.site.url }}
Ingress Domains:
- {{ .Values.site.url | replace "www." "" }}
- www.{{ .Values.site.url | replace "www." "" }}
- {{ .Values.site.url | replace "www." "" | replace "." "-" }}.eu.cust.azurecd.net
- www.{{ .Values.site.url | replace "www." "" | replace "." "-" }}.eu.cust.azurecd.net
{{- if .Values.site.additionalIngressNames }}
{{- range .Values.site.additionalIngressNames }}
- {{ . }}
{{- end }}
{{- end }}

14
chart/templates/configmap.yaml
View File

@@ -5,29 +5,29 @@ metadata:
labels:
{{- include "..labels" . | nindent 8 }}
data:
SMTP_PORT: 2525
SMTP_AUTH: "true"
SMTP_PORT: '2525'
SMTP_AUTH: 'true'
SMTP_FORCE_FROM: "noreply@customer.v3.nu"
SMTP_FROM_NAME: "Gunnar Nilsson Maskin AB"
SMTP_FROM_NAME: "V3 Customer Mailer"
WP_ENV: "production"
WP_HOME: {{ .Values.site.url }}
WP_SITEURL: {{ .Values.site.url }}/wp
{{- if and .Values.site.init .Values.site.init.composerPackage }}
RUN_COMPOSER: "true"
RUN_COMPOSER: 'true'
INSTALL_SITE: {{ .Values.site.init.composerPackage }}
SET_THEME: {{ .Values.site.init.themeName | default "" }}
{{- end }}
{{- if and .Values.site.init .Values.site.init.content .Values.site.init.content.import }}
RUN_IMPORTS: "true"
RUN_IMPORTS: 'true'
IMPORT_CONTENT: {{ .Values.site.init.content.url }}
{{- end }}
{{- if and .Values.site.init .Values.site.init.database .Values.site.init.database.import }}
RUN_DATABASEIMPORTS: "true"
RUN_DATABASEIMPORTS: 'true'
IMPORT_DATABASE: {{ .Values.site.init.database.url }}
FORCE_IMPORT_DB: {{ .Values.site.init.database.force | default "false" }}
FORCE_IMPORT_DB: {{ .Values.site.init.database.force | default "false" | quote }}
{{- end }}
---

4
chart/templates/database.yaml
View File

@@ -7,9 +7,9 @@ metadata:
spec:
secretName: {{ include "..fullname" . }}-db-auth
instance: {{ .Values.global.dbInstance | default "kincaid" }}
deletionProtected: true
deletionProtected: yes
backup:
enable: false
enable: No
cron: "0 0 * * *"
secretsTemplates:
PMA_HOST:{{` "{{ .DatabaseHost }}" `}}

10
chart/templates/deployment.yaml
View File

@@ -1,7 +1,7 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include "..fullname" . }}-cert
name: {{ include "..fullname" . }}
labels:
{{- include "..labels" . | nindent 4 }}
cloudyne.systems/component: site
@@ -44,7 +44,7 @@ spec:
{{- end }}
imagePullPolicy: Always
volumeMounts:
- name: site
- name: local
mountPath: /app
{{- if and .Values.site .Values.site.storage .Values.site.storage.cloud .Values.site.storage.cloud.folders }}
{{- range $v := .Values.site.storage.cloud.folders }}
@@ -58,6 +58,8 @@ spec:
name: {{ include "..fullname" . }}-env
- secretRef:
name: {{ include "..fullname" . }}-db-auth
- secretRef:
name: global-secrets-ext
containers:
- name: wordpress
securityContext:
@@ -69,7 +71,7 @@ spec:
{{- end }}
imagePullPolicy: Always
volumeMounts:
- name: site
- name: local
mountPath: /app
- name: serverconfig
mountPath: /etx/nginx/nginx.conf
@@ -88,6 +90,8 @@ spec:
name: {{ include "..fullname" . }}-env
- secretRef:
name: {{ include "..fullname" . }}-db-auth
- secretRef:
name: global-secrets-ext
resources:
{{- if and .Values.customer .Values.customer.package .Values.customer.package.cpu }}
requests:

30
chart/templates/ingress.yaml
View File

@@ -27,9 +27,9 @@ spec:
pathType: Prefix
backend:
service:
name: {{ include "..fullname" . }}
port:
number: 80
name: {{ include "..fullname" . }}
port:
number: 80
- host: www.{{ .Values.site.url | replace "www." "" }}
http:
paths:
@@ -37,9 +37,9 @@ spec:
pathType: Prefix
backend:
service:
name: {{ include "..fullname" . }}
port:
number: 80
name: {{ include "..fullname" . }}
port:
number: 80
- host: {{ .Values.site.url | replace "www." "" | replace "." "-" }}.eu.cust.azurecd.net
http:
paths:
@@ -47,9 +47,9 @@ spec:
pathType: Prefix
backend:
service:
name: {{ include "..fullname" . }}
port:
number: 80
name: {{ include "..fullname" . }}
port:
number: 80
- host: www.{{ .Values.site.url | replace "www." "" | replace "." "-" }}.eu.cust.azurecd.net
http:
paths:
@@ -57,9 +57,9 @@ spec:
pathType: Prefix
backend:
service:
name: {{ include "..fullname" . }}
port:
number: 80
name: {{ include "..fullname" . }}
port:
number: 80
{{- if .Values.site.additionalIngressNames }}
{{- range .Values.site.additionalIngressNames }}
- host: {{ . }}
@@ -69,8 +69,8 @@ spec:
pathType: Prefix
backend:
service:
name: {{ include "..fullname" . }}
port:
number: 80
name: {{ include "..fullname" . }}
port:
number: 80
{{- end }}
{{- end }}

24
chart/templates/resourcequota.yaml
View File

@@ -1,24 +0,0 @@
apiVersion: v1
kind: ResourceQuota
metadata:
name: {{ include "..fullname" . }}
labels:
{{- include "..labels" . | nindent 4 }}
spec:
hard:
{{- if and .Values.customer .Values.customer.package }}
{{- if .Values.customer.package.cpu }}
requests.cpu: {{ .Values.customer.package.cpu.avg | default "1000m" }}
limits.cpu: {{ .Values.customer.package.cpu.peak | default "1500m"}}
{{- else }}
requests.cpu: 1000m
limits.cpu: 1500m
{{- end }}
{{- if .Values.customer.package.mem }}
requests.memory: {{ .Values.customer.package.mem.avg | default "512Mi" }}
limits.memory: {{ .Values.customer.package.mem.peak | default "1Gi" }}
{{- else }}
requests.memory: 512Mi
limits.memory: 1Gi
{{- end }}
{{- end }}

2
chart/templates/service.yaml
View File

@@ -1,7 +1,7 @@
apiVersion: v1
kind: Service
metadata:
name: {{ include "..fullname" . }}-cert
name: {{ include "..fullname" . }}
labels:
{{- include "..labels" . | nindent 8 }}
cloudyne.systems/component: site