From d54bb7e9c6843cf81023ab371b7e6e664d4fdc04 Mon Sep 17 00:00:00 2001 From: Joe Banks Date: Mon, 15 Apr 2024 17:57:25 +0100 Subject: Move Prestashop to Prestashop namespace --- kubernetes/namespaces/default/prestashop/README.md | 12 ------ .../namespaces/default/prestashop/ingress.yaml | 37 ---------------- .../namespaces/default/prestashop/values.yaml | 49 ---------------------- kubernetes/namespaces/prestashop/README.md | 12 ++++++ kubernetes/namespaces/prestashop/ingress.yaml | 39 +++++++++++++++++ kubernetes/namespaces/prestashop/values.yaml | 49 ++++++++++++++++++++++ 6 files changed, 100 insertions(+), 98 deletions(-) delete mode 100644 kubernetes/namespaces/default/prestashop/README.md delete mode 100644 kubernetes/namespaces/default/prestashop/ingress.yaml delete mode 100644 kubernetes/namespaces/default/prestashop/values.yaml create mode 100644 kubernetes/namespaces/prestashop/README.md create mode 100644 kubernetes/namespaces/prestashop/ingress.yaml create mode 100644 kubernetes/namespaces/prestashop/values.yaml (limited to 'kubernetes/namespaces') diff --git a/kubernetes/namespaces/default/prestashop/README.md b/kubernetes/namespaces/default/prestashop/README.md deleted file mode 100644 index 183f87c..0000000 --- a/kubernetes/namespaces/default/prestashop/README.md +++ /dev/null @@ -1,12 +0,0 @@ -# Prestashop - -This folder contains the ingress and values.yaml file for the deployment of Prestashop, used for our merch store. It additionally deploys MariaDB, used for data storage. - -## Deployment - -``` -$ helm repo add bitnami https://charts.bitnami.com/bitnami -$ helm install prestashop bitnami/prestashop -f prestashop/values.yaml --set prestashopPassword=,mariadb.auth.rootPassword=,smtpPassword= -``` - -The Helm chart can be located [here](https://github.com/bitnami/charts/tree/master/bitnami/prestashop), including all available parameters. diff --git a/kubernetes/namespaces/default/prestashop/ingress.yaml b/kubernetes/namespaces/default/prestashop/ingress.yaml deleted file mode 100644 index 2df402e..0000000 --- a/kubernetes/namespaces/default/prestashop/ingress.yaml +++ /dev/null @@ -1,37 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: merch-svc -spec: - selector: - app.kubernetes.io/instance: prestashop-v2 - app.kubernetes.io/name: prestashop - ports: - - protocol: TCP - port: 80 - targetPort: 8080 ---- -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - annotations: - nginx.ingress.kubernetes.io/auth-tls-verify-client: "on" - nginx.ingress.kubernetes.io/auth-tls-secret: "kube-system/mtls-client-crt-bundle" - nginx.ingress.kubernetes.io/auth-tls-error-page: "https://www.youtube.com/watch?v=dQw4w9WgXcQ" - name: merch -spec: - tls: - - hosts: - - "*.pythondiscord.com" - secretName: pythondiscord.com-tls - rules: - - host: merch.pythondiscord.com - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: merch-svc - port: - number: 80 diff --git a/kubernetes/namespaces/default/prestashop/values.yaml b/kubernetes/namespaces/default/prestashop/values.yaml deleted file mode 100644 index 865393a..0000000 --- a/kubernetes/namespaces/default/prestashop/values.yaml +++ /dev/null @@ -1,49 +0,0 @@ -prestashopHost: merch.pythondiscord.com - -prestashopUsername: merch@pythondiscord.com -prestashopPassword: -prestashopEmail: merch@pythondiscord.com -prestashopFirstName: Joe -prestashopLastName: Banks - -allowEmptyPassword: false - -smtpHost: smtp.mailgun.org -smtpPort: 587 -smtpUser: merch@pythondiscord.com -smtpProtocol: tls - -podAnnotations: - prometheus.io/scrape: "false" - -mariadb: - primary: - persistence: - enabled: true - storageClass: linode-block-storage-retain - size: 10Gi - -containerPorts: - http: 8080 - https: 8443 - -updateStrategy: - type: Recreate - -service: - type: ClusterIP - -ingress: - enabled: false - -persistence: - enabled: true - storageClass: "linode-block-storage-retain" - - size: 10Gi - -metrics: - enabled: false - - podAnnotations: - prometheus.io/scrape: "false" diff --git a/kubernetes/namespaces/prestashop/README.md b/kubernetes/namespaces/prestashop/README.md new file mode 100644 index 0000000..183f87c --- /dev/null +++ b/kubernetes/namespaces/prestashop/README.md @@ -0,0 +1,12 @@ +# Prestashop + +This folder contains the ingress and values.yaml file for the deployment of Prestashop, used for our merch store. It additionally deploys MariaDB, used for data storage. + +## Deployment + +``` +$ helm repo add bitnami https://charts.bitnami.com/bitnami +$ helm install prestashop bitnami/prestashop -f prestashop/values.yaml --set prestashopPassword=,mariadb.auth.rootPassword=,smtpPassword= +``` + +The Helm chart can be located [here](https://github.com/bitnami/charts/tree/master/bitnami/prestashop), including all available parameters. diff --git a/kubernetes/namespaces/prestashop/ingress.yaml b/kubernetes/namespaces/prestashop/ingress.yaml new file mode 100644 index 0000000..815f571 --- /dev/null +++ b/kubernetes/namespaces/prestashop/ingress.yaml @@ -0,0 +1,39 @@ +apiVersion: v1 +kind: Service +metadata: + name: merch-svc + namespace: prestashop +spec: + selector: + app.kubernetes.io/instance: prestashop + app.kubernetes.io/name: prestashop + ports: + - protocol: TCP + port: 80 + targetPort: 8080 +--- +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + annotations: + nginx.ingress.kubernetes.io/auth-tls-verify-client: "on" + nginx.ingress.kubernetes.io/auth-tls-secret: "kube-system/mtls-client-crt-bundle" + nginx.ingress.kubernetes.io/auth-tls-error-page: "https://www.youtube.com/watch?v=dQw4w9WgXcQ" + name: merch + namespace: prestashop +spec: + tls: + - hosts: + - "*.pythondiscord.com" + secretName: pythondiscord.com-tls + rules: + - host: merch.pythondiscord.com + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: merch-svc + port: + number: 80 diff --git a/kubernetes/namespaces/prestashop/values.yaml b/kubernetes/namespaces/prestashop/values.yaml new file mode 100644 index 0000000..865393a --- /dev/null +++ b/kubernetes/namespaces/prestashop/values.yaml @@ -0,0 +1,49 @@ +prestashopHost: merch.pythondiscord.com + +prestashopUsername: merch@pythondiscord.com +prestashopPassword: +prestashopEmail: merch@pythondiscord.com +prestashopFirstName: Joe +prestashopLastName: Banks + +allowEmptyPassword: false + +smtpHost: smtp.mailgun.org +smtpPort: 587 +smtpUser: merch@pythondiscord.com +smtpProtocol: tls + +podAnnotations: + prometheus.io/scrape: "false" + +mariadb: + primary: + persistence: + enabled: true + storageClass: linode-block-storage-retain + size: 10Gi + +containerPorts: + http: 8080 + https: 8443 + +updateStrategy: + type: Recreate + +service: + type: ClusterIP + +ingress: + enabled: false + +persistence: + enabled: true + storageClass: "linode-block-storage-retain" + + size: 10Gi + +metrics: + enabled: false + + podAnnotations: + prometheus.io/scrape: "false" -- cgit v1.2.3