diff --git a/charts/mastodon/tests/80_subchart_postgresql_test.yaml b/charts/mastodon/tests/80_subchart_postgresql_test.yaml
index 8fd543bfb3725ae51d0304b37745d94d9e490bbc..6c73bcb23cef740eb054248ed5c4e4b6b65984bf 100644
--- a/charts/mastodon/tests/80_subchart_postgresql_test.yaml
+++ b/charts/mastodon/tests/80_subchart_postgresql_test.yaml
@@ -121,7 +121,7 @@ tests:
- contains:
path: spec.template.spec.containers[0].env
content:
- name: POSTGRES_DB
+ name: POSTGRES_DATABASE
value: "mastodon_production"
template: charts/postgresql/templates/primary/statefulset.yaml
- it: should allow to change the database name
@@ -137,6 +137,6 @@ tests:
- contains:
path: spec.template.spec.containers[0].env
content:
- name: POSTGRES_DB
+ name: POSTGRES_DATABASE
value: "test"
template: charts/postgresql/templates/primary/statefulset.yaml
\ No newline at end of file
diff --git a/charts/mastodon/tests/__snapshot__/50_sidekiq_test.yaml.snap b/charts/mastodon/tests/__snapshot__/50_sidekiq_test.yaml.snap
index 20d95c7d9a465222f9396d52f53455daa6c47d05..460425b92ee13ffcff77136f417f46292ea49fd9 100644
--- a/charts/mastodon/tests/__snapshot__/50_sidekiq_test.yaml.snap
+++ b/charts/mastodon/tests/__snapshot__/50_sidekiq_test.yaml.snap
@@ -8,9 +8,6 @@ allows to modify the temporaryVolumeTemplate correctly:
DB_PORT: "5432"
DB_USER: mastodon
DEFAULT_LOCALE: en
- ES_ENABLED: "true"
- ES_HOST: RELEASE-NAME-elasticsearch-master-hl
- ES_PORT: "9200"
LOCAL_DOMAIN: mastodon.local
MALLOC_ARENA_MAX: "2"
NODE_ENV: production
@@ -62,7 +59,7 @@ allows to modify the temporaryVolumeTemplate correctly:
template:
metadata:
annotations:
- checksum/config-configmap: 6171320454845e8c5c867b5db63251ff95089e25c0200ca8f72d6bb9f6535726
+ checksum/config-configmap: e95945d1de1fe21a68c3dc644c6b93291e3343e19569236e8d7df3e7462b788a
checksum/config-secrets: c0d40e352ffcd2127af550b605bb0464640cd2960d007d940960d3d69d3c6aa4
labels:
app.kubernetes.io/component: sidekiq-scheduler
@@ -160,7 +157,7 @@ allows to modify the temporaryVolumeTemplate correctly:
template:
metadata:
annotations:
- checksum/config-configmap: 6171320454845e8c5c867b5db63251ff95089e25c0200ca8f72d6bb9f6535726
+ checksum/config-configmap: e95945d1de1fe21a68c3dc644c6b93291e3343e19569236e8d7df3e7462b788a
checksum/config-secrets: c0d40e352ffcd2127af550b605bb0464640cd2960d007d940960d3d69d3c6aa4
labels:
app.kubernetes.io/component: sidekiq-default
@@ -303,9 +300,6 @@ renders temporaryVolumeTemplate correctly:
DB_PORT: "5432"
DB_USER: mastodon
DEFAULT_LOCALE: en
- ES_ENABLED: "true"
- ES_HOST: RELEASE-NAME-elasticsearch-master-hl
- ES_PORT: "9200"
LOCAL_DOMAIN: mastodon.local
MALLOC_ARENA_MAX: "2"
NODE_ENV: production
@@ -362,7 +356,7 @@ renders temporaryVolumeTemplate correctly:
template:
metadata:
annotations:
- checksum/config-configmap: b4ff25ac749821c69f078e62cf9ef4b11a561dfe000643b674f0cd4452c29379
+ checksum/config-configmap: e57a3719e3b525e43246b678c8be2067a38efc95b4f24b59725f193ec7674dc5
checksum/config-secrets: 90ba38117b49c3fae15b0af40de2acce58cfa37f2e6e5d981b39815786ab41d3
labels:
app.kubernetes.io/component: sidekiq-scheduler
@@ -444,7 +438,7 @@ renders temporaryVolumeTemplate correctly:
template:
metadata:
annotations:
- checksum/config-configmap: b4ff25ac749821c69f078e62cf9ef4b11a561dfe000643b674f0cd4452c29379
+ checksum/config-configmap: e57a3719e3b525e43246b678c8be2067a38efc95b4f24b59725f193ec7674dc5
checksum/config-secrets: 90ba38117b49c3fae15b0af40de2acce58cfa37f2e6e5d981b39815786ab41d3
labels:
app.kubernetes.io/component: sidekiq-default
@@ -573,9 +567,6 @@ should match basic snapshot:
DB_PORT: "5432"
DB_USER: mastodon
DEFAULT_LOCALE: en
- ES_ENABLED: "true"
- ES_HOST: RELEASE-NAME-elasticsearch-master-hl
- ES_PORT: "9200"
LOCAL_DOMAIN: mastodon.local
MALLOC_ARENA_MAX: "2"
NODE_ENV: production
@@ -622,12 +613,10 @@ should match basic snapshot:
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/name: mastodon
app.kubernetes.io/part-of: rails
- strategy:
- type: Recreate
template:
metadata:
annotations:
- checksum/config-configmap: 6171320454845e8c5c867b5db63251ff95089e25c0200ca8f72d6bb9f6535726
+ checksum/config-configmap: e95945d1de1fe21a68c3dc644c6b93291e3343e19569236e8d7df3e7462b788a
checksum/config-secrets: c0d40e352ffcd2127af550b605bb0464640cd2960d007d940960d3d69d3c6aa4
labels:
app.kubernetes.io/component: sidekiq-all-queues
@@ -651,9 +640,9 @@ should match basic snapshot:
- -q
- mailers,2
- -q
- - pull
+ - pull,1
- -q
- - scheduler
+ - scheduler,1
env:
- name: DB_PASS
valueFrom:
diff --git a/charts/mastodon/tests/__snapshot__/50_web_test.yaml.snap b/charts/mastodon/tests/__snapshot__/50_web_test.yaml.snap
index 55b5d971dcb6d99fe05cea721f942cda61506f18..cdd668799b912ff468178895e208d82c8e88326c 100644
--- a/charts/mastodon/tests/__snapshot__/50_web_test.yaml.snap
+++ b/charts/mastodon/tests/__snapshot__/50_web_test.yaml.snap
@@ -8,9 +8,6 @@ should allow manipulating the temporaryVolumeTemplate:
DB_PORT: "5432"
DB_USER: mastodon
DEFAULT_LOCALE: en
- ES_ENABLED: "true"
- ES_HOST: RELEASE-NAME-elasticsearch-master-hl
- ES_PORT: "9200"
LOCAL_DOMAIN: mastodon.local
MALLOC_ARENA_MAX: "2"
NODE_ENV: production
@@ -58,7 +55,7 @@ should allow manipulating the temporaryVolumeTemplate:
template:
metadata:
annotations:
- checksum/config-configmap: 6171320454845e8c5c867b5db63251ff95089e25c0200ca8f72d6bb9f6535726
+ checksum/config-configmap: e95945d1de1fe21a68c3dc644c6b93291e3343e19569236e8d7df3e7462b788a
checksum/config-secrets: c0d40e352ffcd2127af550b605bb0464640cd2960d007d940960d3d69d3c6aa4
labels:
app.kubernetes.io/component: web
@@ -252,9 +249,6 @@ should match basic snapshot:
DB_PORT: "5432"
DB_USER: mastodon
DEFAULT_LOCALE: en
- ES_ENABLED: "true"
- ES_HOST: RELEASE-NAME-elasticsearch-master-hl
- ES_PORT: "9200"
LOCAL_DOMAIN: mastodon.local
MALLOC_ARENA_MAX: "2"
NODE_ENV: production
@@ -302,7 +296,7 @@ should match basic snapshot:
template:
metadata:
annotations:
- checksum/config-configmap: 6171320454845e8c5c867b5db63251ff95089e25c0200ca8f72d6bb9f6535726
+ checksum/config-configmap: e95945d1de1fe21a68c3dc644c6b93291e3343e19569236e8d7df3e7462b788a
checksum/config-secrets: c0d40e352ffcd2127af550b605bb0464640cd2960d007d940960d3d69d3c6aa4
labels:
app.kubernetes.io/component: web
diff --git a/charts/mastodon/tests/__snapshot__/80_subchart_redis_test.yaml.snap b/charts/mastodon/tests/__snapshot__/80_subchart_redis_test.yaml.snap
index a84ce1c132fc4d0258ae6ad783329728770c6615..65ccb7988d85afbc8f846ccc1eae6140c5c00f34 100644
--- a/charts/mastodon/tests/__snapshot__/80_subchart_redis_test.yaml.snap
+++ b/charts/mastodon/tests/__snapshot__/80_subchart_redis_test.yaml.snap
@@ -20,12 +20,10 @@ should allow disabling redis auth:
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/name: mastodon
app.kubernetes.io/part-of: rails
- strategy:
- type: Recreate
template:
metadata:
annotations:
- checksum/config-configmap: 6171320454845e8c5c867b5db63251ff95089e25c0200ca8f72d6bb9f6535726
+ checksum/config-configmap: e95945d1de1fe21a68c3dc644c6b93291e3343e19569236e8d7df3e7462b788a
checksum/config-secrets: c0d40e352ffcd2127af550b605bb0464640cd2960d007d940960d3d69d3c6aa4
labels:
app.kubernetes.io/component: sidekiq-all-queues
@@ -49,9 +47,9 @@ should allow disabling redis auth:
- -q
- mailers,2
- -q
- - pull
+ - pull,1
- -q
- - scheduler
+ - scheduler,1
env:
- name: DB_PASS
valueFrom:
@@ -120,7 +118,7 @@ should allow disabling redis auth:
template:
metadata:
annotations:
- checksum/config-configmap: 6171320454845e8c5c867b5db63251ff95089e25c0200ca8f72d6bb9f6535726
+ checksum/config-configmap: e95945d1de1fe21a68c3dc644c6b93291e3343e19569236e8d7df3e7462b788a
checksum/config-secrets: c0d40e352ffcd2127af550b605bb0464640cd2960d007d940960d3d69d3c6aa4
labels:
app.kubernetes.io/component: streaming
@@ -195,7 +193,7 @@ should allow disabling redis auth:
template:
metadata:
annotations:
- checksum/config-configmap: 6171320454845e8c5c867b5db63251ff95089e25c0200ca8f72d6bb9f6535726
+ checksum/config-configmap: e95945d1de1fe21a68c3dc644c6b93291e3343e19569236e8d7df3e7462b788a
checksum/config-secrets: c0d40e352ffcd2127af550b605bb0464640cd2960d007d940960d3d69d3c6aa4
labels:
app.kubernetes.io/component: web
diff --git a/charts/mastodon/tests/__snapshot__/98_snapshot_test.yaml.snap b/charts/mastodon/tests/__snapshot__/98_snapshot_test.yaml.snap
index 36f8da48736df9ed7eea2837cabcbaf631ea2728..cb1f906cfa70e7e190cea0c0396699b6f2b48ad5 100644
--- a/charts/mastodon/tests/__snapshot__/98_snapshot_test.yaml.snap
+++ b/charts/mastodon/tests/__snapshot__/98_snapshot_test.yaml.snap
@@ -8,9 +8,6 @@ should match basic snapshot:
DB_PORT: "5432"
DB_USER: mastodon
DEFAULT_LOCALE: en
- ES_ENABLED: "true"
- ES_HOST: RELEASE-NAME-elasticsearch-master-hl
- ES_PORT: "9200"
LOCAL_DOMAIN: mastodon.local
MALLOC_ARENA_MAX: "2"
NODE_ENV: production
@@ -137,12 +134,10 @@ should match basic snapshot:
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/name: mastodon
app.kubernetes.io/part-of: rails
- strategy:
- type: Recreate
template:
metadata:
annotations:
- checksum/config-configmap: 6171320454845e8c5c867b5db63251ff95089e25c0200ca8f72d6bb9f6535726
+ checksum/config-configmap: e95945d1de1fe21a68c3dc644c6b93291e3343e19569236e8d7df3e7462b788a
checksum/config-secrets: c0d40e352ffcd2127af550b605bb0464640cd2960d007d940960d3d69d3c6aa4
labels:
app.kubernetes.io/component: sidekiq-all-queues
@@ -166,9 +161,9 @@ should match basic snapshot:
- -q
- mailers,2
- -q
- - pull
+ - pull,1
- -q
- - scheduler
+ - scheduler,1
env:
- name: DB_PASS
valueFrom:
@@ -242,7 +237,7 @@ should match basic snapshot:
template:
metadata:
annotations:
- checksum/config-configmap: 6171320454845e8c5c867b5db63251ff95089e25c0200ca8f72d6bb9f6535726
+ checksum/config-configmap: e95945d1de1fe21a68c3dc644c6b93291e3343e19569236e8d7df3e7462b788a
checksum/config-secrets: c0d40e352ffcd2127af550b605bb0464640cd2960d007d940960d3d69d3c6aa4
labels:
app.kubernetes.io/component: streaming
@@ -322,7 +317,7 @@ should match basic snapshot:
template:
metadata:
annotations:
- checksum/config-configmap: 6171320454845e8c5c867b5db63251ff95089e25c0200ca8f72d6bb9f6535726
+ checksum/config-configmap: e95945d1de1fe21a68c3dc644c6b93291e3343e19569236e8d7df3e7462b788a
checksum/config-secrets: c0d40e352ffcd2127af550b605bb0464640cd2960d007d940960d3d69d3c6aa4
labels:
app.kubernetes.io/component: web
@@ -513,78 +508,6 @@ should match basic snapshot:
persistentVolumeClaim:
claimName: RELEASE-NAME-mastodon-system
8: |
- apiVersion: batch/v1
- kind: Job
- metadata:
- annotations:
- helm.sh/hook: post-install
- helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
- helm.sh/hook-weight: "-1"
- labels:
- app.kubernetes.io/instance: RELEASE-NAME
- app.kubernetes.io/managed-by: Helm
- app.kubernetes.io/name: mastodon
- app.kubernetes.io/version: 4.5.6
- helm.sh/chart: mastodon-1.2.3
- name: RELEASE-NAME-mastodon-chewy-upgrade
- spec:
- template:
- metadata:
- name: RELEASE-NAME-mastodon-chewy-upgrade
- spec:
- containers:
- - command:
- - bundle
- - exec
- - rake
- - chewy:upgrade
- env:
- - name: DB_PASS
- valueFrom:
- secretKeyRef:
- key: password
- name: RELEASE-NAME-postgresql
- - name: REDIS_PASSWORD
- valueFrom:
- secretKeyRef:
- key: redis-password
- name: RELEASE-NAME-redis
- - name: PORT
- value: "3000"
- envFrom:
- - configMapRef:
- name: RELEASE-NAME-mastodon-env
- - secretRef:
- name: RELEASE-NAME-mastodon
- image: ghcr.io/mastodon/mastodon:4.5.6
- imagePullPolicy: IfNotPresent
- name: RELEASE-NAME-mastodon-chewy-setup
- securityContext:
- allowPrivilegeEscalation: false
- capabilities:
- drop:
- - ALL
- volumeMounts:
- - mountPath: /opt/mastodon/public/assets
- name: assets
- - mountPath: /opt/mastodon/public/system
- name: system
- restartPolicy: Never
- securityContext:
- fsGroup: 991
- runAsGroup: 991
- runAsNonRoot: true
- runAsUser: 991
- seccompProfile:
- type: RuntimeDefault
- volumes:
- - name: assets
- persistentVolumeClaim:
- claimName: RELEASE-NAME-mastodon-assets
- - name: system
- persistentVolumeClaim:
- claimName: RELEASE-NAME-mastodon-system
- 9: |
apiVersion: batch/v1
kind: Job
metadata:
@@ -661,7 +584,7 @@ should match basic snapshot:
- name: system
persistentVolumeClaim:
claimName: RELEASE-NAME-mastodon-system
- 10: |
+ 9: |
apiVersion: batch/v1
kind: Job
metadata:
@@ -733,7 +656,7 @@ should match basic snapshot:
- name: system
persistentVolumeClaim:
claimName: RELEASE-NAME-mastodon-system
- 11: |
+ 10: |
apiVersion: batch/v1
kind: Job
metadata:
@@ -807,7 +730,7 @@ should match basic snapshot:
- name: system
persistentVolumeClaim:
claimName: RELEASE-NAME-mastodon-system
- 12: |
+ 11: |
apiVersion: policy/v1
kind: PodDisruptionBudget
metadata:
@@ -828,7 +751,7 @@ should match basic snapshot:
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/name: mastodon
app.kubernetes.io/part-of: rails
- 13: |
+ 12: |
apiVersion: policy/v1
kind: PodDisruptionBudget
metadata:
@@ -847,7 +770,7 @@ should match basic snapshot:
app.kubernetes.io/component: streaming
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/name: mastodon
- 14: |
+ 13: |
apiVersion: policy/v1
kind: PodDisruptionBudget
metadata:
@@ -868,7 +791,7 @@ should match basic snapshot:
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/name: mastodon
app.kubernetes.io/part-of: rails
- 15: |
+ 14: |
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
@@ -886,7 +809,7 @@ should match basic snapshot:
requests:
storage: 10Gi
storageClassName: null
- 16: |
+ 15: |
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
@@ -904,7 +827,7 @@ should match basic snapshot:
requests:
storage: 100Gi
storageClassName: null
- 17: |
+ 16: |
apiVersion: v1
data:
OTP_SECRET: ZHVtbXktb3RwX3NlY3JldA==
@@ -921,18 +844,7 @@ should match basic snapshot:
helm.sh/chart: mastodon-1.2.3
name: RELEASE-NAME-mastodon
type: Opaque
- 18: |
- apiVersion: v1
- kind: ServiceAccount
- metadata:
- labels:
- app.kubernetes.io/instance: RELEASE-NAME
- app.kubernetes.io/managed-by: Helm
- app.kubernetes.io/name: mastodon
- app.kubernetes.io/version: 4.5.6
- helm.sh/chart: mastodon-1.2.3
- name: RELEASE-NAME-mastodon
- 19: |
+ 17: |
apiVersion: v1
kind: Service
metadata:
@@ -954,7 +866,7 @@ should match basic snapshot:
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/name: mastodon
type: ClusterIP
- 20: |
+ 18: |
apiVersion: v1
kind: Service
metadata:
@@ -976,6 +888,17 @@ should match basic snapshot:
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/name: mastodon
type: ClusterIP
+ 19: |
+ apiVersion: v1
+ kind: ServiceAccount
+ metadata:
+ labels:
+ app.kubernetes.io/instance: RELEASE-NAME
+ app.kubernetes.io/managed-by: Helm
+ app.kubernetes.io/name: mastodon
+ app.kubernetes.io/version: 4.5.6
+ helm.sh/chart: mastodon-1.2.3
+ name: RELEASE-NAME-mastodon
should match basic snapshot without dependencies:
1: |
apiVersion: v1
@@ -1111,8 +1034,6 @@ should match basic snapshot without dependencies:
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/name: mastodon
app.kubernetes.io/part-of: rails
- strategy:
- type: Recreate
template:
metadata:
annotations:
@@ -1140,9 +1061,9 @@ should match basic snapshot without dependencies:
- -q
- mailers,2
- -q
- - pull
+ - pull,1
- -q
- - scheduler
+ - scheduler,1
env:
- name: DB_PASS
valueFrom:
@@ -1825,17 +1746,6 @@ should match basic snapshot without dependencies:
name: RELEASE-NAME-mastodon
type: Opaque
17: |
- apiVersion: v1
- kind: ServiceAccount
- metadata:
- labels:
- app.kubernetes.io/instance: RELEASE-NAME
- app.kubernetes.io/managed-by: Helm
- app.kubernetes.io/name: mastodon
- app.kubernetes.io/version: 4.5.6
- helm.sh/chart: mastodon-1.2.3
- name: RELEASE-NAME-mastodon
- 18: |
apiVersion: v1
kind: Service
metadata:
@@ -1857,7 +1767,7 @@ should match basic snapshot without dependencies:
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/name: mastodon
type: ClusterIP
- 19: |
+ 18: |
apiVersion: v1
kind: Service
metadata:
@@ -1879,3 +1789,14 @@ should match basic snapshot without dependencies:
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/name: mastodon
type: ClusterIP
+ 19: |
+ apiVersion: v1
+ kind: ServiceAccount
+ metadata:
+ labels:
+ app.kubernetes.io/instance: RELEASE-NAME
+ app.kubernetes.io/managed-by: Helm
+ app.kubernetes.io/name: mastodon
+ app.kubernetes.io/version: 4.5.6
+ helm.sh/chart: mastodon-1.2.3
+ name: RELEASE-NAME-mastodon