feat(rearch): Simplify values and utilize helpers.tpl more (#145)

* feat(rearch): Simplify values and utilize helpers.tpl more

* feat(rearch): Simplify values and utilize helpers.tpl more

* feat(diagram): Update the Diagram

* feat(rearch): Simplify values and utilize helpers.tpl more

.github/workflows/release.yml

@@ -3,7 +3,7 @@ name: Release Charts
 on:
   push:
     branches:
-      - master
+      - main
 
 # Environment variables available to all jobs and steps in this workflow
 env:
@@ -61,7 +61,7 @@ jobs:
 
       - name: Test Drupal Helm Chart
         run: |
-          cd drupal
+          cd charts/drupal
           helm install drupal -f values.yaml . --timeout=600s
 
       - name: Configure Git
@@ -81,7 +81,7 @@ jobs:
       - name: Run chart-releaser
         uses: helm/[email protected]
         with:
-          charts_dir: .
+          charts_dir: ./charts
         env:
           CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           CR_SKIP_EXISTING: 'true'

.github/workflows/test.yml

@@ -2,7 +2,7 @@ name: Test Helm Charts
 on:
   pull_request:
     branches:
-      - master
+      - main
 
 # Environment variables available to all jobs and steps in this workflow
 env:
@@ -56,5 +56,5 @@ jobs:
 
     - name: Test Drupal Helm Chart
       run: |
-        cd drupal
+        cd charts/drupal
         helm install drupal -f values.yaml . --timeout=600s

.gitignore

@@ -1,2 +1,6 @@
 packages
 index.yaml
+
+tpl/
+values-*.yaml
+!values-example-*.yaml

CHANGELOG.md

@@ -1,3 +1,31 @@
+## 1.0.0-beta1
+
+- Breaking Changes
+  - Drupal 7 Chart has been removed
+  - The _helpers.tpl has been leveraged more to reduce duplication
+  - Switches to leverage an unprivileged nginx execution
+- Regular Changes
+  - Varnish chart now exists inside this repository
+  - All charts have been moved under the charts folder
+  - Network Policies have been added
+  - Chart has been tested against an OpenShift deployment model
+
+Upgrade Path:
+
+> The best way for this is to simply run helm template, store the rendered manifests in git
+> then run helm template again on the main branch of the repo and compare the output.
+
+```sh
+git checkout --branch master https://github.com/drupalwxt/helm-drupal
+cd helm-drupal/drupal
+helm template . -f values-override.yaml --output-dir ../tpl/override
+cd ../tpl/override && git init && git add . &&  git commit -m "feat(initial): Initial commit"
+cd ../../
+git checkout main
+cd charts/drupal
+helm template . -f values-override.yaml --output-dir ../tpl/override
+```
+
 ## 0.20.1-beta3
 
 - Enable all of the WxT extension modules for default site install (drupal.extensions.enabled)

LICENSE.md

@@ -1,6 +1,6 @@
 ## MIT License
 
-Copyright (c) 2022 Drupal WxT
+Copyright (c) 2023 Drupal WxT
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -8,18 +8,18 @@ This chart will deploy a highly available and performant enterprise Drupal site
 - MySQL configured with ProxySQL
 - PostgreSQL configured with PGBouncer
 - Redis
+- Solr
 - Varnish
 
 Please consult our **Architectural Diagram** for a recommended setup on Azure:
 
-- **[Architectural Diagram][architectural_diagram]**
+- **[Architectural Diagram][diagram]**
 
 ## Individual Charts
 
 Further documentation can be found at the individual chart level:
 
-- **[Drupal 9][drupal9]**
-- **[Drupal 7][drupal7]**
+- **[Drupal 9/10][drupal]**
 
 ## Development
 
@@ -29,8 +29,7 @@ You can consult the `values.yaml` file for the full range of options available t
 
 > **Note:** We try out best to follow `https://semver.org` so that it's clear patch, minor and major releases for breaking changes.
 
-[architectural_diagram]: https://github.com/drupalwxt/helm-drupal/blob/master/docs/diagram-drupal.pdf
-[drupal7]: drupal7/README.md
-[drupal9]: drupal/README.md
+[diagram]: https://github.com/drupalwxt/helm-drupal/blob/master/docs/diagram-drupal.pdf
+[drupal]: drupal/README.md
 [helm]: https://helm.sh/
 [wxt]: https://drupalwxt.github.io

drupal/.helmignore → charts/drupal/.helmignore

@@ -2,6 +2,7 @@
 # This supports shell glob matching, relative path matching, and
 # negation (prefixed with !). Only one pattern per line.
 .DS_Store
+
 # Common VCS dirs
 .git/
 .gitignore
@@ -10,11 +11,13 @@
 .hg/
 .hgignore
 .svn/
+
 # Common backup files
 *.swp
 *.bak
 *.tmp
 *~
+
 # Various IDEs
 .project
 .idea/

drupal7/Chart.lock → charts/drupal/Chart.lock

@@ -8,8 +8,8 @@ dependencies:
 - name: redis
   repository: https://charts.bitnami.com/bitnami
   version: 16.13.2
-- name: varnish
-  repository: https://statcan.github.io/charts
-  version: 0.2.2
-digest: sha256:eff9b22832514728f66d261ff5cac8a31b399b52171bf06c821fdf5fca3f7fb3
-generated: "2023-01-16T08:45:02.67443-05:00"
+- name: solr
+  repository: https://charts.bitnami.com/bitnami
+  version: 7.5.1
+digest: sha256:e15fab8d13baf578d5c6a36fa9a9cc1d852be8de47ed68064852c56e1512fc6b
+generated: "2023-12-02T22:05:14.382491-05:00"

drupal/Chart.yaml → charts/drupal/Chart.yaml

@@ -1,9 +1,9 @@
 name: drupal
 apiVersion: v2
 type: application
-version: 0.20.1-beta8
+version: 1.0.0-beta1
 appVersion: 5.0.1
-description: Drupal 8/9 variant of the Web Experience Toolkit (WxT).
+description: Drupal 9/10 variant of the Web Experience Toolkit (WxT).
 keywords:
 - drupal
 - cms
@@ -35,7 +35,7 @@ dependencies:
     version: 16.13.2
     repository: https://charts.bitnami.com/bitnami
     condition: redis.enabled
-  - name: varnish
-    version: 0.2.2
-    repository: https://statcan.github.io/charts
-    condition: varnish.enabled
+  - name: solr
+    version: 7.5.1
+    repository: https://charts.bitnami.com/bitnami
+    condition: solr.enabled

drupal/README.md.gotmpl → charts/drupal/README.md.gotmpl

@@ -16,8 +16,8 @@
 
 ## Prerequisites
 
-- Kubernetes 1.7+
-- Helm v3.0.0+
+- Kubernetes 1.21+
+- Helm v3.10.0+
 
 ## Installing the Chart
 
@@ -36,8 +36,7 @@ Optionally you can git clone the helm chart and select the appropriate values fi
 ```sh
 git clone https://github.com/drupalwxt/helm-drupal
 cd helm-drupal/drupal
-cp values-azurefile.yaml values-override.yaml
-helm install --name drupal -f values-override.yaml
+helm install --name drupal -f values-<override>.yaml
 ```
 
 ## Ingress
@@ -140,7 +139,6 @@ helm install --name drupal -f values-override.yaml
   {{- end }}
 {{- end }}
 
-
 ## Redis
 
 | Key | Type | Default | Description |

drupal/conf/nginx.conf → charts/drupal/conf/nginx.conf

@@ -1,6 +1,5 @@
 error_log /proc/self/fd/2;
-pid /var/run/nginx.pid;
-user root;
+pid /tmp/nginx.pid;
 worker_processes auto;
 worker_rlimit_nofile 500000;
 
@@ -30,8 +29,8 @@ http {
   include /etc/nginx/mime.types;
   index index.html index.htm;
   keepalive_timeout 240;
-  proxy_cache_path /var/cache/nginx levels=1:2 keys_zone=one:8m max_size=3000m inactive=600m;
-  proxy_temp_path /var/tmp;
+  proxy_cache_path /tmp/cache_temp levels=1:2 keys_zone=one:8m max_size=3000m inactive=600m;
+  proxy_temp_path /tmp/proxy_temp;
   sendfile on;
   server_tokens off;
   tcp_nopush on;
@@ -42,10 +41,10 @@ http {
 
   server {
       #IPv4
-      listen 80;
+      listen 8080;
 
       #IPv6
-      listen [::]:80;
+      listen [::]:8080;
 
       # Filesystem root of the site and index with fallback.
 {{- if not (eq .Values.drupal.siteRoot "/") }}