Skip to content
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.

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

fix(deps)!: upgrade app to Mastodon v4.3.0 #157

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions .github/workflows/test-chart.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ permissions:

jobs:
lint-templates:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -53,7 +53,7 @@ jobs:
# basic configuration can be used to successfully startup mastodon.
#
test-install:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
timeout-minutes: 15

strategy:
Expand All @@ -75,7 +75,7 @@ jobs:
# available for use in the templates, currently we need v3.6.0 or
# higher.
#
- k3s-channel: v1.21
- k3s-channel: v1.28
helm-version: v3.8.0

env:
Expand Down Expand Up @@ -109,7 +109,7 @@ jobs:
run: |
helm install mastodon . \
--values dev-values.yaml \
--timeout 10m
--timeout 15m

# This actions provides a report about the state of the k8s cluster,
# providing logs etc on anything that has failed and workloads marked as
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
charts/
.DS_Store
4 changes: 2 additions & 2 deletions Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ 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: 5.5.2
version: 6.0.0

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
appVersion: "v4.2.13"
appVersion: "v4.3.0"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
appVersion: "v4.3.0"
appVersion: "v4.3.1"

latest


dependencies:
- name: elasticsearch
Expand Down
2 changes: 1 addition & 1 deletion templates/deployment-streaming.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ spec:
securityContext:
{{- toYaml . | nindent 12 }}
{{- end }}
image: "{{ coalesce .Values.mastodon.streaming.image.repository .Values.image.repository }}:{{ coalesce .Values.mastodon.streaming.image.tag .Values.image.tag .Chart.AppVersion }}"
image: "{{ .Values.mastodon.streaming.image.repository }}:{{ coalesce .Values.mastodon.streaming.image.tag .Values.image.tag .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
command:
- node
Expand Down
6 changes: 4 additions & 2 deletions values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -276,8 +276,10 @@ mastodon:
existingSecret:
streaming:
image:
repository:
tag:
# streaming image split in Mastodon v4.3.0
repository: ghcr.io/mastodon/mastodon-streaming
# other options: `latest` for the latest release or `edge` for most recent commit
tag: null
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
tag: null
tag: ""

This gives a specific type, but it will still evaluate as empty/null.

port: 4000
# -- this should be set manually since os.cpus() returns the number of CPUs on
# the node running the pod, which is unrelated to the resources allocated to
Expand Down
Loading