Skip to content

fix: add meilisearch and notes ingress #164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
MoisesGSalas wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix: add meilisearch and notes ingress #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
tutor~=19.0
tutor-mfe~=19.0
tutor-forum~=19.0
tutor-minio~=19.0
setuptools
git+https://github.com/edunext/tutor-contrib-s3@sumac
2 changes: 2 additions & 0 deletions drydock/patches/kustomization-resources
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
- plugins/drydock/k8s/ingress/lms.yml
- plugins/drydock/k8s/ingress/cms.yml
- plugins/drydock/k8s/ingress/mfe.yml
- plugins/drydock/k8s/ingress/meilisearch.yml
- plugins/drydock/k8s/ingress/notes.yml
- plugins/drydock/k8s/ingress/extra-hosts.yml
- plugins/drydock/k8s/ingress/static-cache.yml
{%- endif %}
Expand Down
34 changes: 34 additions & 0 deletions drydock/templates/drydock/k8s/ingress/meilisearch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{%- if RUN_MEILISEARCH %}
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: meilisearch
namespace: {{ K8S_NAMESPACE }}
{%- if DRYDOCK_AUTO_TLS and not DRYDOCK_CUSTOM_CERTS %}
annotations:
cert-manager.io/issuer: letsencrypt
{%- endif %}
spec:
ingressClassName: nginx
rules:
- host: {{ MEILISEARCH_HOST }}
http:
paths:
- pathType: Prefix
path: "/"
backend:
service:
name: {% if DRYDOCK_BYPASS_CADDY -%}meilisearch{% else -%}caddy{% endif %}
port:
number: {% if DRYDOCK_BYPASS_CADDY -%}7700{% else -%}80{% endif %}
{%- if DRYDOCK_AUTO_TLS or DRYDOCK_CUSTOM_CERTS %}
tls:
- hosts:
- {{ MEILISEARCH_HOST }}
{%- if DRYDOCK_CUSTOM_CERTS %}
secretName: {{ DRYDOCK_CUSTOM_CERTS["secret_name"]|default("custom-tls-certs") }}
{%- else %}
secretName: meilisearch-host-tls
{%- endif %}
{%- endif %}
{%- endif %}
34 changes: 34 additions & 0 deletions drydock/templates/drydock/k8s/ingress/notes.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{%- if 'notes' in PLUGINS %}
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: notes
namespace: {{ K8S_NAMESPACE }}
{%- if DRYDOCK_AUTO_TLS and not DRYDOCK_CUSTOM_CERTS %}
annotations:
cert-manager.io/issuer: letsencrypt
{%- endif %}
spec:
ingressClassName: nginx
rules:
- host: {{ NOTES_HOST }}
http:
paths:
- pathType: Prefix
path: "/"
backend:
service:
name: {% if DRYDOCK_BYPASS_CADDY -%}notes{% else -%}caddy{% endif %}
port:
number: {% if DRYDOCK_BYPASS_CADDY -%}7700{% else -%}80{% endif %}
{%- if DRYDOCK_AUTO_TLS or DRYDOCK_CUSTOM_CERTS %}
tls:
- hosts:
- {{ NOTES_HOST }}
{%- if DRYDOCK_CUSTOM_CERTS %}
secretName: {{ DRYDOCK_CUSTOM_CERTS["secret_name"]|default("custom-tls-certs") }}
{%- else %}
secretName: notes-host-tls
{%- endif %}
{%- endif %}
{%- endif %}
Loading