Merge pull request #174 from small-hack/cloudymax-patch-1

Pass bitnamilegacy registry name to embedded elasticsearch

Author: cloudymax

charts/mastodon/Chart.yaml

@@ -9,7 +9,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 11.2.1
+version: 11.2.2
 
 # renovate: image=ghcr.io/mastodon/mastodon
 appVersion: v4.4.6

charts/mastodon/README.md

@@ -1,6 +1,6 @@
 # mastodon
 
-![Version: 11.2.1](https://img.shields.io/badge/Version-11.2.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v4.4.6](https://img.shields.io/badge/AppVersion-v4.4.6-informational?style=flat-square)
+![Version: 11.2.2](https://img.shields.io/badge/Version-11.2.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v4.4.6](https://img.shields.io/badge/AppVersion-v4.4.6-informational?style=flat-square)
 
 Mastodon is a free, open-source social network server based on ActivityPub.
 
@@ -18,7 +18,7 @@ Mastodon is a free, open-source social network server based on ActivityPub.
 |-----|------|---------|-------------|
 | affinity | object | `{}` | Affinity for all pods unless overwritten |
 | deploymentAnnotations | object | `{}` |  |
-| elasticsearch | object | `{"image":{"repository":"bitnamilegacy/elasticsearch"}}` | https://github.com/bitnami/charts/tree/main/bitnami/elasticsearch#parameters |
+| elasticsearch | object | `{"image":{"repository":"bitnamilegacy/elasticsearch"},"sysctlImage":{"enabled":true,"registry":"docker.io","repository":"bitnamilegacy/os-shell"},"volumePermissions":{"enabled":false,"image":{"registry":"docker.io","repository":"bitnamilegacy/os-shell"}}}` | https://github.com/bitnami/charts/tree/main/bitnami/elasticsearch#parameters |
 | externalAuth.cas.enabled | bool | `false` |  |
 | externalAuth.ldap.enabled | bool | `false` |  |
 | externalAuth.oauth_global.omniauth_only | bool | `false` | Automatically redirect to OIDC, CAS or SAML, and don't use local account authentication when clicking on Sign-In |

charts/mastodon/dev-values.yaml

@@ -349,6 +349,19 @@ elasticsearch:
   # @ignored
   enabled: true
 
+  # - volumePermissions.enabled Enable init container that changes volume permissions in the data directory (for cases where the default k8s `runAsUser` and `fsUser` values do not work)
+  volumePermissions:
+    enabled: false
+    image:
+      registry: docker.io
+      repository: bitnamilegacy/os-shell
+
+  # - sysctlImage.enabled Enable kernel settings modifier image
+  sysctlImage:
+    enabled: true
+    registry: docker.io
+    repository: bitnamilegacy/os-shell
+
 externalDatabase:
   # -- enable to use an external database instead of the included bitnami postgresql subchart
   # if externalDatabase.enabled is true, postgresql.enabled must be false

charts/mastodon/values.yaml

@@ -631,6 +631,19 @@ elasticsearch:
   image:
     repository: bitnamilegacy/elasticsearch
 
+  # - volumePermissions.enabled Enable init container that changes volume permissions in the data directory (for cases where the default k8s `runAsUser` and `fsUser` values do not work)
+  volumePermissions:
+    enabled: false
+    image:
+      registry: docker.io
+      repository: bitnamilegacy/os-shell
+
+  # - sysctlImage.enabled Enable kernel settings modifier image
+  sysctlImage:
+    enabled: true
+    registry: docker.io
+    repository: bitnamilegacy/os-shell
+
 externalDatabase:
   # -- enable to use an external database instead of the included bitnami postgresql subchart
   # if externalDatabase.enabled is true, postgresql.enabled must be false