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

Release version 1.0.0

Browse Source
This commit is contained in:
Lars
2023-09-12 15:45:08 +02:00
parent 2604afabb5
commit 0c992a6d46
14 changed files with 445 additions and 418 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -1,2 +1,3 @@
example.yaml example.yaml
example*.yaml example*.yaml
example*.yml

2
.gitlab-ci.yml
View File

@@ -1,5 +1,5 @@
variables: variables:
HELM_CHART_VERSION: "99.6.30" HELM_CHART_VERSION: "1.0.0"
stages: stages:
- deploy - deploy

17
Chart/templates/_helpers.tpl
View File

@@ -3,13 +3,17 @@ Define the application name and fullname
*/}} */}}
{{- define "..name" -}} {{- define "..name" -}}
{{- .Values.site.domain | trunc 63 | replace "." "-" | trimSuffix "-" }} {{- .Values.site.name | trunc 63 }}
{{- end }} {{- end }}
{{- define "..fullname" -}} {{- define "..fullname" -}}
{{ include "..name" . }} {{ include "..name" . }}
{{- end }} {{- end }}
{{- define "..domains" }}
{{- if .Values.site.additionalDomains }}{{ .Values.site.additionalDomains | toYaml }}{{- end }}
- {{ .Values.site.domain | replace "www." "" }}
{{- end }}
{{- define "..resourcelimits" -}} {{- define "..resourcelimits" -}}
resources: resources:
@@ -38,7 +42,12 @@ app.kubernetes.io/name: {{ include "..name" . }}
app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }}
cloudyne.systems/customer: {{ .Values.customer.legalName | replace " " "-" | trunc 63 | trimSuffix "-" }} cloudyne.systems/customer: {{ .Values.customer.legalName | replace " " "-" | replace "," "" | trunc 63 | trimSuffix "-" | quote }}
cloudyne.systems/customer-legal-id: {{ .Values.customer.legalId }} cloudyne.systems/customer-legal-id: '{{ .Values.customer.legalId }}'
cloudyne.systems/site: {{ .Values.site.domain }} cloudyne.systems/site: {{ .Values.site.domain | quote }}
{{- end }}
{{- define "..selector-labels" -}}
cloudyne.systems/customer: {{ .Values.customer.legalName | replace " " "-" | replace "," "" | trunc 63 | trimSuffix "-" | quote }}
cloudyne.systems/customer-legal-id: '{{ .Values.customer.legalId }}'
cloudyne.systems/site: {{ .Values.site.domain | quote }}
{{- end }} {{- end }}

11
Chart/templates/certificate.yaml
View File

@@ -10,13 +10,4 @@ spec:
kind: ClusterIssuer kind: ClusterIssuer
secretName: {{ include "..fullname" . }}-cert-secret secretName: {{ include "..fullname" . }}-cert-secret
commonName: {{ .Values.site.url }} commonName: {{ .Values.site.url }}
dnsNames: dnsNames: {{ include "..domains" . | nindent 8 }}
- {{ .Values.site.domain | replace "www." "" }}
- www.{{ .Values.site.domain | replace "www." "" }}
- {{ .Values.site.domain | replace "www." "" | replace "." "-" }}.eu.cust.azurecd.net
- www.{{ .Values.site.domain | replace "www." "" | replace "." "-" }}.eu.cust.azurecd.net
{{- if .Values.site.additionalIngressDomains }}
{{- range .Values.site.additionalIngressDomains }}
- {{ . }}
{{- end }}
{{- end }}

129
Chart/templates/configmap.yaml
View File

@@ -5,35 +5,46 @@ metadata:
labels: labels:
{{- include "..labels" . | nindent 8 }} {{- include "..labels" . | nindent 8 }}
data: data:
{{- if eq (.Values.email.smtpServer | default "smtp2go" ) "smtp2go" }} {{- if .Values.email.smtpHost }}
SMTP_PORT: '2525' SMTP_HOST: {{ .Values.email.smtpHost }}
{{- else }} {{- end }}
SMTP_PORT: '587' {{- if .Values.email.smtpPort }}
SMTP_PORT: {{ .Values.email.smtpPort | quote }}
{{- end }}
{{- if .Values.email.smtpAuth }}
SMTP_AUTH: 'True'
{{- if .Values.email.smtpUser }}
SMTP_USER: {{ .Values.email.smtpUser }}
{{- end }}
{{- if .Values.email.smtpPassword }}
SMTP_PASSWORD: {{ .Values.email.smtpPassword }}
{{- end }}
{{- end }}
{{- if .Values.email.smtpStarttls }}
SMTP_STARTTLS: 'True' SMTP_STARTTLS: 'True'
{{- end }} {{- end }}
SMTP_AUTH: 'true' {{- if .Values.email.defaultSender }}
SMTP_FROM: 'customer-noreply@v3.nu' SMTP_FROM: {{ .Values.email.defaultSender }}
{{- if .Values.email }} {{- end }}
{{- if .Values.email.forceFromEmail }} {{- if .Values.email.defaultSenderName }}
SMTP_FORCE_FROM: {{ .Values.email.forceFromEmail }} SMTP_FROM_NAME: {{ .Values.email.defaultSenderName }}
{{- end }} {{- end }}
{{- if .Values.email.domains }} {{- if .Values.email.forceSender }}
SMTP_FORCE_FROM: {{ .Values.email.forceSender }}
{{- end }}
{{- if .Values.email.domains }}
SMTP_ALLOWONLY_DOMAINS: {{ .Values.email.domains | join "," }} SMTP_ALLOWONLY_DOMAINS: {{ .Values.email.domains | join "," }}
{{- end }} {{- end }}
{{- if .Values.email.allowedEmails }} {{- if .Values.email.allowedEmails }}
SMTP_ALLOWONLY_EMAILS: {{ .Values.email.allowedEmails | join "," }} SMTP_ALLOWONLY_EMAILS: {{ .Values.email.allowedEmails | join "," }}
{{- end }} {{- end }}
{{- else }} WP_HOME: "https://{{ .Values.site.domain | replace "http://" "" | replace "https://" "" }}"
SMTP_FORCE_FROM: "customer-noreply@v3.nu"
SMTP_FROM_NAME: "V3 Customer Mailer" {{- if .Values.site.additionalEnv }}
{{- end }} {{- range $k, $v := .Values.site.additionalEnv }}
WP_ENV: "{{ .Values.site.environment | default "production" }}"
WP_HOME: "https://{{ ( .Values.site.redirectDomain | default ( .Values.site.domain )) | replace "https://" "" | replace "http://" "" }}"
{{- if .Values.site.additionalEnv }}
{{- range $k, $v := .Values.site.additionalEnv }}
{{ $k }}: {{ $v }} {{ $k }}: {{ $v }}
{{- end }} {{- end }}
{{- end }} {{- end }}
--- ---
kind: ConfigMap kind: ConfigMap
apiVersion: v1 apiVersion: v1
@@ -49,13 +60,17 @@ data:
"webserverGroup": "unit", "webserverGroup": "unit",
"applicationDir": "/app", "applicationDir": "/app",
"permissions": "0770", "permissions": "0770",
"updatePermissions": true, "updatePermissions": {{ .Values.init.wp.updatePermissions | default false }},
"importDatabase": {{ .Values.database.import | default false }}, "importDatabase": {{ .Values.init.db.active | default false }},
"databasePath": "{{ .Values.database.importPath | default "" }}", "databasePath": "{{ .Values.init.db.path | default "" }}",
"overwriteDatabase": {{ .Values.database.overwrite | default false }}, "databaseUrl": "{{ .Values.init.db.url | default "" }}",
"importContent": {{ .Values.init.content.active | default false }},
"contentPath": "{{ .Values.init.content.path | default "" }}",
"contentUrl": "{{ .Values.init.content.url | default "" }}",
"overwriteDatabase": {{ .Values.init.db.overwrite | default false }},
"generateSalts": true, "generateSalts": true,
"activateTheme": "{{ .Values.site.theme | default .Values.site.name }}", "activateTheme": "{{ .Values.init.wp.theme | default .Values.site.name }}",
"convertUploadsToWebp": {{ .Values.site.enableWebpConversion | default false }}, "convertUploadsToWebp": {{ .Values.init.content.webpConverter | default false }},
"convertMissingOnly": true "convertMissingOnly": true
} }
@@ -133,7 +148,7 @@ data:
] ]
} }
}, },
{{- if eq .Values.site.enableWebpRoute "true" }} {{- if (.Values.site.webpRoute | default "true") }}
{ {
"match": { "match": {
"uri": [ "uri": [
@@ -175,25 +190,30 @@ data:
}, },
"options": { "options": {
"user": { "user": {
"display_errors": "{{ .Values.site.displayErrors | default "0" }}", {{- if and .Values.php .Values.php.additionalValues }}
"log_errors": "{{ .Values.site.logErrors | default "1" }}" {{- range $k, $v := .Values.php.additionalValues }}
"{{ $k }}": "{{ $v }}",
{{- end }}
{{- end }}
"display_errors": "{{ .Values.php.displayErrors | default "Off" }}",
"log_errors": "{{ .Values.php.logErrors | default "On" }}"
}, },
"admin": { "admin": {
"expose_php": "Off", "expose_php": "Off",
"short_open_tag": "Off", "short_open_tag": "Off",
"disable_functions": "exec,passthru,shell_exec,system,proc_open,popen,show_source", "disable_functions": "exec,passthru,shell_exec,system,proc_open,popen,show_source",
"log_errors": "On", "log_errors": "{{ .Values.php.logErrors | default "On" }}",
{{- if and .Values.advanced .Values.advanced.php .Values.advanced.php.additionalAdminValues }} {{- if and .Values.php .Values.php.additionalAdminValues }}
{{- range $k, $v := .Values.advanced.php.additionalAdminValues }} {{- range $k, $v := .Values.php.additionalAdminValues }}
"{{ $k }}": "{{ $v }}", "{{ $k }}": "{{ $v }}",
{{- end }} {{- end }}
{{- else }} {{- else }}
"memory_limit": "{{ .Values.site.resources.php.memory | default "512M" }}", "memory_limit": "{{ .Values.site.resources.php.memory | default "512M" }}",
"upload_max_filesize": "{{ .Values.site.resources.php.upload | default "512M" }}", "upload_max_filesize": "{{ .Values.site.resources.php.upload | default "512M" }}",
"post_max_size": "{{ .Values.site.resources.php.post | default "512M" }}", "post_max_size": "{{ .Values.site.resources.php.post | default "512M" }}",
"max_execution_time": "{{ .Values.site.resources.php.executionTime | default "300" }}", "max_execution_time": "{{ .Values.site.resources.php.executionTime | default "300" }}",
"max_input_time": "{{ .Values.site.resources.php.inputTime | default "300" }}", "max_input_time": "{{ .Values.site.resources.php.inputTime | default "300" }}",
{{- end }} {{- end }}
"date.timezone": "{{ .Values.customer.timezone | default "Europe/Stockholm" }}" "date.timezone": "{{ .Values.customer.timezone | default "Europe/Stockholm" }}"
} }
}, },
@@ -209,3 +229,20 @@ data:
} }
} }
} }
{{- if .Values.storage.configMap }}
{{- range .Values.storage.configMap }}
{{- if eq .type "configmap" }}
---
kind: ConfigMap
apiVersion: v1
metadata:
name: {{ include "..fullname" $ }}-cm-{{ .name }}
labels:
{{- include "..labels" $ | nindent 8 }}
data:
{{- range $k, $v := .files }}
{{ $v.name }}: {{ $v.content | toYaml | indent 4}}
{{- end }}
{{- end }}
{{- end }}
{{- end }}

2
Chart/templates/database.yaml
View File

@@ -6,7 +6,7 @@ metadata:
{{- include "..labels" . | nindent 8 }} {{- include "..labels" . | nindent 8 }}
spec: spec:
secretName: {{ include "..fullname" . }}-db-auth secretName: {{ include "..fullname" . }}-db-auth
instance: {{ .Values.database.server | default "kincaid" }} instance: {{ .Values.site.dbInstance | default "kincaid" }}
deletionProtected: yes deletionProtected: yes
backup: backup:
enable: No enable: No

171
Chart/templates/deployment.yaml
View File

@@ -13,119 +13,170 @@ spec:
{{- end }} {{- end }}
selector: selector:
matchLabels: matchLabels:
cloudyne.systems/customer: {{ .Values.customer.legalName | replace " " "-" | lower | trunc 63 }} {{- include "..selector-labels" . | nindent 6 }}
cloudyne.systems/customer-legal-id: {{ .Values.customer.legalId }}
cloudyne.systems/site: {{ .Values.site.domain }}
template: template:
metadata: metadata:
labels: labels:
cloudyne.systems/customer: {{ .Values.customer.legalName | replace " " "-" | lower | trunc 63 }} {{- include "..selector-labels" . | nindent 8 }}
cloudyne.systems/customer-legal-id: {{ .Values.customer.legalId }}
cloudyne.systems/site: {{ .Values.site.domain }}
spec: spec:
securityContext: securityContext:
fsGroup: 101 fsGroup: 101
volumes: volumes:
- name: cloud
persistentVolumeClaim:
claimName: pvc-{{ include "..fullname" . }}
- name: cloud-local
persistentVolumeClaim:
claimName: pvc-{{ include "..fullname" . }}-local
- name: serverconfig - name: serverconfig
configMap: configMap:
name: {{ include "..fullname" . }}-cfg 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: imagePullSecrets:
- name: pull-secret - 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 }}
initContainers: initContainers:
- name: init-storage {{- if and .Values.storage.cloud.active .Values.storage.local.active }}
- name: init-local-storage
securityContext: securityContext:
allowPrivilegeEscalation: false allowPrivilegeEscalation: false
runAsUser: 0 runAsUser: 0
image: cloudyne/ubuntu-ci:latest image: cloudyne/ubuntu-ci:latest
command: ["python3"] command: ["python3"]
args: ["/usr/local/bin/storage-clone", "/full-cloud", "/full-cloud-local"] args: ["/usr/local/bin/storage-clone", "/mnt/cloud", "/mnt/local"]
imagePullPolicy: Always imagePullPolicy: Always
volumeMounts: volumeMounts:
- name: cloud - name: cloud
mountPath: /full-cloud mountPath: /mnt/cloud
- name: cloud-local - name: local
mountPath: /full-cloud-local mountPath: /mnt/local
- name: deploy {{- end }}
- name: init-site
securityContext: securityContext:
allowPrivilegeEscalation: false allowPrivilegeEscalation: false
runAsUser: 0 runAsUser: 0
image: "cloudyne.azurecr.io/buildahome/{{ .Values.site.name | default ( .Values.site.domain | replace "." "-" ) }}:{{ .Values.site.imageTag | default "latest" }}" image: "{{ .Values.site.image }}"
imagePullPolicy: Always imagePullPolicy: Always
volumeMounts: volumeMounts:
- name: cloud
mountPath: /full-cloud
- name: serverconfig - name: serverconfig
mountPath: /init-go/config.json mountPath: /init-go/config.json
subPath: init.json subPath: init.json
{{- if .Values.storage.wpContent }} {{- if .Values.storage.local.active }}
{{- range $v := .Values.storage.wpContent }} {{- range .Values.storage.folders }}
- name: cloud-local - name: local
mountPath: "/app/web/app/{{ $v }}" mountPath: "/app/web/app/{{ . }}"
subPath: "{{ $v }}" subPath: "{{ . }}"
{{- end }} {{- end }}
{{- end }} {{- if .Values.storage.cloud.active }}
{{- if .Values.storage.additionalMounts }} - name: cloud
{{- range $v := .Values.storage.additionalMounts }} mountPath: "/mnt/cloud"
- name: cloud-local {{- end }}
mountPath: {{ $v.localPath }} {{- else }}
subPath: {{ $v.cloudPath }} {{- if .Values.storage.cloud.active }}
{{- range .Values.storage.folders }}
- name: cloud
mountPath: "/app/web/app/{{ . }}"
subPath: "{{ . }}"
{{- end }}
{{- end }}
{{- end }} {{- end }}
{{- end }}
envFrom: envFrom:
- configMapRef: - configMapRef:
name: {{ include "..fullname" . }}-env 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: - secretRef:
name: {{ include "..fullname" . }}-db-auth name: {{ include "..fullname" . }}-db-auth
- secretRef:
name: global-secrets
{{- if eq (.Values.site.container_base | default "debian" ) "debian" }}
command: [ "/init-go/init-go" ]
{{- else }}
command: ["sh"] command: ["sh"]
args: ["-c", "/init-go/init-go"] args: ["-c", "/init-go/init-go"]
{{- end }}
containers: containers:
- name: wordpress - name: wordpress
securityContext: securityContext:
runAsUser: 101 runAsUser: 101
image: "cloudyne.azurecr.io/buildahome/{{ .Values.site.name | default ( .Values.site.domain | replace "." "-" ) }}:{{ .Values.site.imageTag | default "latest" }}" image: "{{ .Values.site.image }}"
imagePullPolicy: Always imagePullPolicy: Always
volumeMounts: volumeMounts:
- name: serverconfig - name: serverconfig
mountPath: /docker-entrypoint.d/unit.json mountPath: /init-go/config.json
subPath: unit.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 - name: cloud
mountPath: /var/cloud mountPath: "/mnt/cloud"
{{- if .Values.storage.wpContent }}
{{- range $v := .Values.storage.wpContent }}
- name: cloud-local
mountPath: "/app/web/app/{{ $v }}"
subPath: "{{ $v }}"
{{- end }} {{- end }}
{{- end }} {{- else }}
{{- if .Values.storage.additionalMounts }} {{- if .Values.storage.cloud.active }}
{{- range $v := .Values.storage.additionalMounts }} {{- range .Values.storage.folders }}
- name: cloud-local - name: cloud
mountPath: {{ $v.localPath }} mountPath: "/app/web/app/{{ . }}"
subPath: {{ $v.cloudPath }} subPath: "{{ . }}"
{{- end }}
{{- end }}
{{- end }} {{- end }}
{{- end }} {{- include "..resourcelimits" . | nindent 10 }}
envFrom: envFrom:
- configMapRef: - configMapRef:
name: {{ include "..fullname" . }}-env 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: - secretRef:
name: {{ include "..fullname" . }}-db-auth name: {{ include "..fullname" . }}-db-auth
- secretRef:
name: global-secrets
{{- include "..resourcelimits" . | nindent 10 }}
ports: ports:
- containerPort: 8080 - containerPort: 8080
name: http name: http
protocol: TCP protocol: TCP

80
Chart/templates/externalsecret.yaml
View File

@@ -1,72 +1,34 @@
apiVersion: external-secrets.io/v1beta1 {{- if and .Values.secrets .Values.secrets.external }}
kind: ExternalSecret {{- range .Values.secrets.external }}
metadata:
name: {{ include "..fullname" . }}-ex-gl-secret
labels:
{{- include "..labels" . | nindent 8 }}
spec:
refreshInterval: 4h
secretStoreRef:
kind: ClusterSecretStore
name: az-cluster-store
target:
name: global-secrets
creationPolicy: Orphan
template:
metadata:
labels:
app.kubernetes.io/managed-by: External-Secrets
data:
- secretKey: COMPOSER_AUTH
remoteRef:
key: secret/GITLAB-COMPOSER-AUTH
{{- if eq (.Values.email.smtpServer | default "smtp2go" ) "smtp2go" }}
- secretKey: SMTP_USER
remoteRef:
key: secret/SMTP-USER
- secretKey: SMTP_PASS
remoteRef:
key: secret/SMTP-PASSWORD
- secretKey: SMTP_HOST
remoteRef:
key: secret/SMTP-HOST
{{- else }}
- secretKey: SMTP_USER
remoteRef:
key: secret/AWS-SMTP-USER
- secretKey: SMTP_PASS
remoteRef:
key: secret/AWS-SMTP-PASSWORD
- secretKey: SMTP_HOST
remoteRef:
key: secret/AWS-SMTP-HOST
{{- end }}
- secretKey: WPC_REGISTRATION_SECRET
remoteRef:
key: secret/WPC-REGISTRATION-SECRET
--- ---
apiVersion: external-secrets.io/v1beta1 apiVersion: external-secrets.io/v1beta1
kind: ExternalSecret kind: ExternalSecret
metadata: metadata:
name: {{ include "..fullname" . }}-ex-pull-secret name: {{ include "..fullname" $ }}-ext-{{ .name }}
labels: labels:
{{- include "..labels" . | nindent 8 }} {{- include "..labels" $ | nindent 8 }}
spec: spec:
refreshInterval: 4h refreshInterval: {{ .refreshInterval | default "10h" }}
secretStoreRef: secretStoreRef:
{{- if .ref.clusterSecretStore }}
kind: ClusterSecretStore kind: ClusterSecretStore
name: az-cluster-store name: {{ .ref.clusterSecretStore }}
{{- else }}
kind: SecretStore
name: {{ .ref.secretStore }}
namespace: {{ .ref.secretStoreNamespace }}
{{- end }}
target: target:
name: pull-secret name: {{ include "..fullname" $ }}-exts-{{ .name }}
template: template:
metadata: metadata:
labels: labels:
app.kubernetes.io/managed-by: External-Secrets app.kubernetes.io/managed-by: External-Secrets
type: kubernetes.io/dockerconfigjson data:
data: {{- range $v := .items }}
.dockerconfigjson: "{{`{{ .dockerconfig | toString }}`}}" - secretKey: {{ $v.target }}
creationPolicy: Orphan remoteRef:
data: key: {{ $v.source }}
- secretKey: dockerconfig {{- end }}
remoteRef: {{- end }}
key: secret/CLDY-CR-PULL-TOKEN {{- end }}

72
Chart/templates/ingress.yaml
View File

@@ -11,70 +11,18 @@ spec:
ingressClassName: nginx ingressClassName: nginx
tls: tls:
- secretName: {{ include "..fullname" . }}-cert-secret - secretName: {{ include "..fullname" . }}-cert-secret
hosts: hosts: {{ include "..domains" . | nindent 8 }}
- {{ .Values.site.domain | replace "www." "" }}
- www.{{ .Values.site.domain | replace "www." "" }}
- {{ .Values.site.domain | replace "www." "" | replace "." "-" }}.eu.cust.azurecd.net
- www.{{ .Values.site.domain | replace "www." "" | replace "." "-" }}.eu.cust.azurecd.net
{{- if .Values.site.additionalIngressDomains }}
{{- range .Values.site.additionalIngressDomains }}
- {{ . }}
{{- end }}
{{- end }}
rules: rules:
- host: {{ .Values.site.domain | replace "www." "" }} {{- range include "..domains" . | split "\n" }}
- host: {{ . | replace "- " ""}}
http: http:
paths: paths:
- path: / - path: /
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: {{ include "..fullname" . }} name: {{ include "..fullname" $ }}
port: port:
number: 80 number: 80
- host: www.{{ .Values.site.domain | replace "www." "" }}
http:
paths:
- path: /
pathType: Prefix
backend:
service:
name: {{ include "..fullname" . }}
port:
number: 80
- host: {{ .Values.site.domain | replace "www." "" | replace "." "-" }}.eu.cust.azurecd.net
http:
paths:
- path: /
pathType: Prefix
backend:
service:
name: {{ include "..fullname" . }}
port:
number: 80
- host: www.{{ .Values.site.domain | replace "www." "" | replace "." "-" }}.eu.cust.azurecd.net
http:
paths:
- path: /
pathType: Prefix
backend:
service:
name: {{ include "..fullname" . }}
port:
number: 80
{{- if .Values.site.additionalIngressDomains }}
{{- range .Values.site.additionalIngressDomains }}
- host: {{ . }}
http:
paths:
- path: /
pathType: Prefix
backend:
service:
name: {{ include "..fullname" $ }}
port:
number: 80
{{- end }}
{{- end }} {{- end }}

68
Chart/templates/persistentvolume.yaml
View File

@@ -1,37 +1,39 @@
{{ if .Values.storage.cloud.active }}
apiVersion: v1 apiVersion: v1
kind: PersistentVolume kind: PersistentVolume
metadata: metadata:
name: pv-{{ include "..fullname" . }} name: pv-{{ include "..name" . }}-cloud
labels: labels:
{{- include "..labels" . | nindent 8 }} {{- include "..labels" . | nindent 4 }}
spec: spec:
accessModes: accessModes:
- ReadWriteOnce - ReadWriteOnce
capacity: capacity:
storage: {{ .Values.site.resources.disk | default "5Gi" }} storage: {{ .Values.site.resources.disk }}
csi: csi:
driver: blob.csi.azure.com driver: {{ .Values.storage.cloud.driver | default "blob.csi.azure.com" }}
nodeStageSecretRef: nodeStageSecretRef:
name: cloudyne{{ .Values.storage.class | default "premium01" }}-credentials name: {{ .Values.storage.cloud.account }}-credentials
namespace: blob-csi namespace: blob-csi
volumeAttributes: volumeAttributes:
containername: {{ .Values.storage.container | default ( .Values.site.domain | replace "." "-") }} containername: {{ .Values.storage.cloud.container }}
csi.storage.k8s.io/pv/name: pv-{{ include "..fullname" . }} csi.storage.k8s.io/pv/name: pv-{{ include "..name" . }}-cloud
csi.storage.k8s.io/pvc/namespace: {{ include "..fullname" . }} csi.storage.k8s.io/pvc/namespace: {{ .Release.Namespace }}
secretnamespace: {{ include "..fullname" . }} secretnamespace: {{ .Release.Namespace }}
skuName: {{ .Values.storage.type | default "Premium_LRS" }} skuName: {{ .Values.storage.cloud.sku | default "Premium_LRS" }}
volumeHandle: {{ .Values.storage.class | default "premium01" }}-retain_{{ include "..fullname" . }} volumeHandle: {{ .Values.storage.cloud.class }}_{{ include "..fullname" . }}
mountOptions: mountOptions:
- -o allow_other - -o allow_other
- --file-cache-timeout-in-seconds=120 - --file-cache-timeout-in-seconds=120
- --use-attr-cache=true - --use-attr-cache=true
- --cancel-list-on-mount-seconds=10 - --cancel-list-on-mount-seconds=10
- -o attr_timeout=120 - -o attr_timeout=120
- -o entry_timeout=120 - -o entry_timeout=120
- -o negative_timeout=120 - -o negative_timeout=120
- --log-level=LOG_WARNING - --log-level=LOG_WARNING
- --cache-size-mb=3500 - --cache-size-mb=3500
- -o uid=101 - -o uid=101
persistentVolumeReclaimPolicy: Retain persistentVolumeReclaimPolicy: Retain
storageClassName: {{ .Values.storage.class | default "premium01" }}-retain storageClassName: {{ .Values.storage.cloud.class }}
volumeMode: Filesystem volumeMode: Filesystem
{{- end }}

55
Chart/templates/persistentvolumeclaim.yaml
View File

@@ -1,37 +1,36 @@
--- {{- if .Values.storage.cloud.active }}
apiVersion: v1 apiVersion: v1
kind: PersistentVolumeClaim kind: PersistentVolumeClaim
metadata: metadata:
annotations: name: pvc-{{ include "..name" . }}-cloud
volume.beta.kubernetes.io/storage-provisioner: blob.csi.azure.com labels:
volume.kubernetes.io/storage-provisioner: blob.csi.azure.com {{- include "..labels" . | nindent 4 }}
labels: annotations:
{{- include "..labels" . | nindent 8 }} volume.beta.kubernetes.io/storage-class: {{ .Values.storage.cloud.driver }}
name: pvc-{{ include "..fullname" . }} volume.kubernetes.io/storage-class: {{ .Values.storage.cloud.driver }}
spec: spec:
volumeMode: Filesystem volumeMode: Filesystem
volumeName: pv-{{ include "..fullname" . }} volumeName: pv-{{ include "..name" . }}-cloud
accessModes: accessModes:
- ReadWriteOnce - ReadWriteOnce
resources: resources:
requests: requests:
storage: {{ .Values.site.resources.disk | default "5Gi" }} storage: {{ .Values.site.resources.disk }}
storageClassName: {{ .Values.storage.cloud.class }}
{{- if and .Values.storage .Values.storage.class }}
storageClassName: {{ .Values.storage.class | default "premium01" }}-retain
{{- end }} {{- end }}
--- {{- if .Values.storage.local.active }}
apiVersion: v1 apiVersion: v1
kind: PersistentVolumeClaim kind: PersistentVolumeClaim
metadata: metadata:
labels: name: pvc-{{ include "..name" . }}-local
{{- include "..labels" . | nindent 8 }} labels:
name: pvc-{{ include "..fullname" . }}-local {{- include "..labels" . | nindent 4 }}
spec: spec:
volumeMode: Filesystem volumeMode: Filesystem
accessModes: accessModes:
- ReadWriteOnce - ReadWriteOnce
resources: resources:
requests: requests:
storage: {{ .Values.site.resources.disk | default "5Gi" }} storage: {{ .Values.site.resources.disk }}
storageClassName: "longhorn" storageClassName: {{ .Values.storage.local.class }}
{{- end }}

17
Chart/templates/secret.yaml Normal file
View File

@@ -0,0 +1,17 @@
{{- if .Values.storage.kubernetes }}
{{- range .Values.storage.kubernetes }}
{{- if eq .type "secret" }}
---
kind: Secret
apiVersion: v1
metadata:
name: {{ include "..fullname" $ }}-sec-{{ .name }}
labels:
{{- include "..labels" $ | nindent 8 }}
stringData:
{{- range $k, $v := .files }}
{{ $v.name }}: {{ $v.content | toYaml | indent 4}}
{{- end }}
{{- end }}
{{- end }}
{{- end }}

4
Chart/templates/service.yaml
View File

@@ -10,7 +10,5 @@ spec:
port: 80 port: 80
targetPort: 8080 targetPort: 8080
selector: selector:
cloudyne.systems/customer: {{ .Values.customer.legalName | replace " " "-" | lower | trunc 63 }} {{- include "..selector-labels" . | nindent 4 }}
cloudyne.systems/customer-legal-id: {{ .Values.customer.legalId }}
cloudyne.systems/site: {{ .Values.site.domain }}
type: ClusterIP type: ClusterIP

226
Chart/values.yaml
View File

@@ -1,110 +1,30 @@
customer: customer:
# The (dns-compliant) customer name (Required) # The customer name (DNS-Compliant)
# name: dns-compliant-customer-name name: customerdomain-tld
# The legal name of the customer (Required) # The customer legal name
# legalName: Customer Name Ltd legalName: Customer Name Ltd.
# The legal ID of the customer (Required) # The customer legal ID
# legalId: 112233-4455 legalId: 112233-4455
# The timezone for the customer # The customer timezone
timezone: "Europe/Stockholm" timezone: "Europe/Stockholm"
email:
# Force a given sender email
# forceSender: "example@email.com"
# Set a default sender/display name
# defaultSender: "customer-noreply@v3.nu"
# defaultSenderName: "Customer Name"
# Specify allowed domains/emails to use as senders
# domains:
# - customer.tld
# emails:
# - mail@customer.tld
# Set the SMTP server to use for the site
smtpServer: smtp2go
# Database configuration
database:
# Database server to use
server: kincaid
# Import database from file if not already imported
import: false
importPath: "/full-cloud/import.sql"
overwriteExisting: false
# Storage Settings
storage:
# The storage class used for the cloud part of the storage
# Default: premium01
class: "premium01"
# The storage type to use for the site
# Default: Premium_LRS
type: "Premium_LRS"
# The storage container to use for the site (REQUIRED)
# Default: <domain>-<tld>
# container: "company-tld"
# WP Content Folders
wpContent:
- uploads
- languages
additionalMounts: {}
# - cloudPath: uploads
# localPath: /app/web/app/uploads
site: site:
# container_base: debian name: "customerdomain-tld"
# The name of the repository/composerpackage/dockerimage domain: &mainDomain "customerdomain.tld"
# Default: domain.replace('.', '-') additionalDomains:
# name: "customer-tld" - www.*mainDomain
# Tag of the container to deploy image: "ghcr.io/cloudynes/php-bedrock:8.0-alpine"
# imageTag: "latest"
# The primary domain/TLD where the site will be available env:
# domain: customer.tld WP_ENV: "production"
# The main url (subdomain) for the site webpRoute: true
# Only needed if it differs from the domain dbInstance: ""
# ex.
# redirectDomain: tempdomain.customer.tld
# Additional ingress domains that should all
# point to the same site
# Defaults are:
# - <domain>.<tld>
# - www.<domain>.<tld>
# - <domain>-<tld>.eu.cust.azurecd.net
# - www-<domain>-<tld>.eu.cust.azurecd.net
additionalIngressDomains: []
# PHP Version
phpVersion: "8.0"
# Set environment (production/test/staging)
# Default: production
environment: production
# Additional env vars
# additionalEnv:
# MY_ENV_VAR: "value"
additionalEnv: {}
# Enable the route for trying .webp files before images
enableWebpRoute: "true"
# Enable the automatic conversion of WebP images
enableWebpConversion: "true"
# The resource limits for the site
resources: resources:
replicas: 1 replicas: 1
php: php:
@@ -121,17 +41,109 @@ site:
peak: 512Mi peak: 512Mi
disk: 5Gi disk: 5Gi
# Log Errors secrets:
logErrors: "1" external: []
# - name: "ex-gl-secret"
# type: "env"
# ref:
# secretStore: ""
# clusterSecretStore: "az-cluster-store"
# target: "global-secrets"
# items:
# - source: secret/SMTP-USER
# target: SMTP_USER
# - source: secret/SMTP-PASSWORD
# target: SMTP_PASS
# - source: secret/SMTP-HOST
# target: SMTP_HOST
# - name: "ex-pull-secret"
# type: "docker"
# ref:
# secretStore: ""
# secretStoreNamespace: ""
# clusterSecretStore: "az-cluster-store"
# target: "pull-secret"
# items:
# - source: secret/PULL-TOKEN
# target: dockerconfig
# Display Errors
displayErrors: "0"
# Auto Registration storage:
autoRegisterEnabled: "false" kubernetes:
# advanced: - name: "pull-secret"
# php: type: "secret"
# displayErrors: "0" files:
# logErrors: "1" - name: .dockerconfigjson
# additionalAdminValues: {} content: |
{"auths":{"ghcr.io":{"username":"ghcr.io","password":"ghcr.io","auth":"ghcr.io"}}}
# - name: "secret01"
# type: "secret"
# files:
# - name: x
# mount: /x.txt
# content: |
# Hello World
# - name: "config01"
# type: configmap
# files:
# - name: x
# mount: /x.txt
# content: |
# test:
# data:
# - x
# - y
# - z
cloud:
active: false
driver: "blob.csi.azure.com"
account: "azstorage11"
sku: "Premium_LRS"
class: "azstorage11class-retain"
container: "customerdomain-tld"
local:
active: true
class: "longhorn"
folders:
- uploads
- languages
init:
wp:
theme: "abctheme"
updatePermissions: true
db:
active: false
overwrite: false
# path: "/full-cloud/init.sql"
# url: "https://url.to/init.sql"
content:
active: false
overwrite: false
webpConverter: false
# path: "/full-cloud/content.zip"
# url: "https://url.to/content.zip"
email:
smtpHost: ""
smtpPort: ""
smtpAuth: false
smtpUser: ""
smtpPassword: ""
smtpStarttls: false
forceSender: ""
defaultSender: ""
defaultSenderName: ""
domains:
- domain
emails:
- email
php:
logErrors: "On"
displayErrors: "Off"
additionalValues: {}
additionalAdminValues: {}