diff --git a/.github/workflows/test-chart.yml b/.github/workflows/test-chart.yml index 3e02fc6d..9b87b970 100644 --- a/.github/workflows/test-chart.yml +++ b/.github/workflows/test-chart.yml @@ -17,7 +17,7 @@ permissions: jobs: lint-templates: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v3 @@ -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: @@ -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: @@ -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 diff --git a/.gitignore b/.gitignore index ee3892e8..a5b65d3c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ charts/ +.DS_Store diff --git a/Chart.yaml b/Chart.yaml index 50083302..adbd5dab 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -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" dependencies: - name: elasticsearch diff --git a/templates/deployment-streaming.yaml b/templates/deployment-streaming.yaml index 9f4a6b9c..1139f9d1 100644 --- a/templates/deployment-streaming.yaml +++ b/templates/deployment-streaming.yaml @@ -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 diff --git a/values.yaml b/values.yaml index 1bf977d7..e42b871a 100644 --- a/values.yaml +++ b/values.yaml @@ -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 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