Update deps and set missing parts
This commit is contained in:
parent
da630dd4cd
commit
6a123d8d92
|
@ -4,14 +4,14 @@ name: mediawiki
|
|||
version: 0.1.0
|
||||
dependencies:
|
||||
- name: mariadb
|
||||
version: ^11.1.6
|
||||
version: ^11.4.3
|
||||
repository: https://charts.bitnami.com/bitnami
|
||||
condition: mariadb.enabled
|
||||
- name: redis
|
||||
version: ^16.1.0
|
||||
version: ^17.4.2
|
||||
repository: https://charts.bitnami.com/bitnami
|
||||
condition: redis.enabled
|
||||
- name: elasticsearch
|
||||
version: ^19.1.10
|
||||
version: ^19.5.8
|
||||
repository: https://charts.bitnami.com/bitnami
|
||||
condition: elasticsearch.enabled
|
3
Todo.md
3
Todo.md
|
@ -1,2 +1 @@
|
|||
- Add elasticsearch things
|
||||
- Make config a configmap
|
||||
- Use https://github.com/bitnami/charts/blob/main/bitnami/elasticsearch/values.yaml#L2188-L2189 to set address?
|
|
@ -5,4 +5,5 @@ metadata:
|
|||
name: {{ include "mediawiki.fullname" . }}
|
||||
data:
|
||||
robots.txt: |
|
||||
Sitemap: {{ if .Values.ingress.tls }}https://{{ else }}http://{{ end }}{{ .Values.ingress.hostname }}/sitemap/sitemap-index-{{ .Values.wiki_id }}.xml
|
||||
Sitemap: {{ if .Values.ingress.tls }}https://{{ else }}http://{{ end }}{{ .Values.ingress.hostname }}/sitemap/sitemap-index-{{ .Values.wiki_id }}.xml
|
||||
LocalSettings.php: {{ .Values.local_settings }}
|
|
@ -79,43 +79,6 @@ spec:
|
|||
---
|
||||
apiVersion: batch/v1
|
||||
kind: CronJob
|
||||
metadata:
|
||||
name: "{{ include "mediawiki.fullname" . }}-local-update"
|
||||
spec:
|
||||
schedule: "@daily"
|
||||
jobTemplate:
|
||||
spec:
|
||||
template:
|
||||
spec:
|
||||
containers:
|
||||
- name: RunJobs
|
||||
image: "{{ .Values.image.repository }}:{{ include "mediawiki.imageTag" . }}"
|
||||
imagePullPolicy: {{ .Values.image.pullPolicy }}
|
||||
command:
|
||||
- /usr/local/bin/php
|
||||
- /var/www/html/extensions/LocalisationUpdate/update.php
|
||||
- --quiet
|
||||
volumeMounts:
|
||||
- mountPath: /var/www/html/images
|
||||
name: image-volume
|
||||
{{- with .Values.extraVolumeMounts }}
|
||||
{{- . | toYaml | nindent 12 }}
|
||||
{{- end }}
|
||||
restartPolicy: OnFailure
|
||||
volumes:
|
||||
{{- if .Values.persistence.enabled }}
|
||||
- name: image-volume
|
||||
persistentVolumeClaim:
|
||||
claimName: {{ .Values.persistence.existingClaim | default (include "mediawiki.fullname" .) }}
|
||||
{{- else }}
|
||||
emptyDir: {}
|
||||
{{- end }}
|
||||
{{- with .Values.extraVolumes }}
|
||||
{{- . | toYaml | nindent 8 }}
|
||||
{{- end }}
|
||||
---
|
||||
apiVersion: batch/v1
|
||||
kind: CronJob
|
||||
metadata:
|
||||
name: "{{ include "mediawiki.fullname" . }}-rebuild-cache"
|
||||
spec:
|
||||
|
|
33
values.yaml
33
values.yaml
|
@ -23,7 +23,11 @@ image:
|
|||
# fullnameOverride: ""
|
||||
|
||||
## This is required for correct setup of sitemaps
|
||||
wiki_id: "miki_en"
|
||||
wiki_id: "example_wiki"
|
||||
|
||||
## LocalSettings.php
|
||||
local_settings: |
|
||||
<?php ... (FILL IN)
|
||||
|
||||
## This configuration is for the internal Redis.
|
||||
##
|
||||
|
@ -74,22 +78,29 @@ persistence:
|
|||
elasticsearch:
|
||||
enabled: true
|
||||
image:
|
||||
# Mediawiki has only support for some versions of Elasticsearch and we need some plugins
|
||||
repository: coreharbor.kubernetes.midnightthoughts.space/mediawiki/elasticsearch
|
||||
tag: latest
|
||||
registry: docker.io
|
||||
repository: bitnami/elasticsearch
|
||||
tag: 7.10.2
|
||||
|
||||
## @param plugins Comma, semi-colon or space separated list of plugins to install at initialization
|
||||
## ref: https://github.com/bitnami/containers/tree/main/bitnami/elasticsearch#environment-variables
|
||||
##
|
||||
plugins: "org.wikimedia.search:extra:7.10.2-wmf4,org.wikimedia.search:extra:7.10.2-wmf4,org.wikimedia.search:extra:7.10.2-wmf4,org.wikimedia.search:extra:7.10.2-wmf4,org.wikimedia.search:extra:7.10.2-wmf4,org.wikimedia.search:extra:7.10.2-wmf4,org.wikimedia.search:extra:7.10.2-wmf4,org.wikimedia.search.highlighter:experimental-highlighter-elasticsearch-plugin:7.10.2"
|
||||
## Since we will have this only for search and per instance we dont need this to be scaled up much. We can easily scale up later as well
|
||||
master:
|
||||
replicaCount: 1
|
||||
data:
|
||||
replicaCount: 1
|
||||
coordinating:
|
||||
replicaCount: 1
|
||||
ingest:
|
||||
replicaCount: 1
|
||||
## We only need it for internal use
|
||||
ingress:
|
||||
enabled: false
|
||||
## Additional volumes to mount into the Wiki
|
||||
##
|
||||
extraVolumes: []
|
||||
# - name: example-volume
|
||||
# flexVolume:
|
||||
# driver: ananace/git-live
|
||||
# options:
|
||||
# repo: https://github.com/company/example-plugin
|
||||
# interval: 1d
|
||||
# readOnly: true
|
||||
extraVolumeMounts: []
|
||||
# - name: example-volume
|
||||
# mountPath: /opt/example-plugin
|
||||
|
|
Loading…
Reference in New Issue