ci: add a job to merge and create multi-arch image

This has to be done now that arm64 and amd64 runs as two seperate jobs. Otherwise, whichever finishes the last would override the other one when pushed
ci: correct arm runner label (#1277 )
2025-01-18 19:29:04 +08:00 · 2025-01-18 19:07:45 +08:00 · 2025-01-18 17:57:07 +08:00 · 2025-01-18 17:49:35 +08:00 · 2025-01-18 05:14:33 +08:00 · 2025-01-17 18:32:20 +08:00
6 changed files with 47 additions and 59 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ jobs:
  test:
    name: Lint & Test Build
    if: github.event_name == 'pull_request'
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
    container: node:22-alpine
    steps:
      - name: Checkout
@@ -46,12 +46,17 @@ jobs:
  build_and_push:
    name: Build & Publish Docker Images
    if: github.ref == 'refs/heads/develop' && !contains(github.event.head_commit.message, '[skip ci]')
-    runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        include:
+          - runner: ubuntu-24.04
+            platform: linux/amd64
+          - runner: ubuntu-24.04-arm
+            platform: linux/arm64
+    runs-on: ${{ matrix.runner }}
    steps:
      - name: Checkout
        uses: actions/checkout@v4
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
      - name: Set up Docker Buildx
        uses: docker/setup-buildx-action@v3
      - name: Log in to Docker Hub
@@ -70,24 +75,52 @@ jobs:
          echo "OWNER_LC=${OWNER,,}" >>${GITHUB_ENV}
        env:
          OWNER: ${{ github.repository_owner }}
-      - name: Build and push
+      - name: Build architecture specific images
        uses: docker/build-push-action@v5
        with:
          context: .
          file: ./Dockerfile
-          platforms: linux/amd64,linux/arm64
-          push: true
+          # platforms: linux/amd64,linux/arm64
+          platforms: ${{ matrix.platform }}
+          # dont push until merged
+          push: false
          build-args: |
            COMMIT_TAG=${{ github.sha }}
          tags: |
+            fallenbagel/jellyseerr:develop-${{ matrix.platform }}
+            ghcr.io/${{ env.OWNER_LC }}/jellyseerr:develop-${{ matrix.platform }}
+          cache-from: type=gha,scope=${{ matrix.platform }}
+          cache-to: type=gha,mode=max,scope=${{ matrix.platform }}
+          provenance: false
+
+  create_manifest:
+    name: Create Multi-Architecture Image
+    needs: build_and_push
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Create and Push Multi-Architecture Image
+        uses: docker/build-push-action@v5
+        with:
+          images: |
+            fallenbagel/jellyseerr:develop-linux-amd64
+            fallenbagel/jellyseerr:develop-linux-arm64
+            ghcr.io/${{ github.repository_owner }}/jellyseerr:develop-linux-amd64
+            ghcr.io/${{ github.repository_owner }}/jellyseerr:develop-linux-arm64
+          target: |
            fallenbagel/jellyseerr:develop
-            ghcr.io/${{ env.OWNER_LC }}/jellyseerr:develop
+            ghcr.io/${{ github.repository_owner }}/jellyseerr:develop
+      - name: Inspect Manifest
+        run: |
+          docker buildx imagetools inspect fallenbagel/jellyseerr:develop
+          docker buildx imagetools inspect ghcr.io/${{ github.repository_owner }}/jellyseerr:develop

  discord:
    name: Send Discord Notification
    needs: build_and_push
    if: always() && github.event_name != 'pull_request' && !contains(github.event.head_commit.message, '[skip ci]')
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
    steps:
      - name: Get Build Job Status
        uses: technote-space/workflow-conclusion-action@v3
--- a/charts/jellyseerr-chart/Chart.yaml
+++ b/charts/jellyseerr-chart/Chart.yaml
@@ -3,8 +3,8 @@ kubeVersion: ">=1.23.0-0"
 name: jellyseerr-chart
 description: Jellyseerr helm chart for Kubernetes
 type: application
-version: 1.3.0
-appVersion: "2.2.3"
+version: 2.0.0
+appVersion: "2.3.0"
 maintainers:
  - name: Jellyseerr
    url: https://github.com/Fallenbagel/jellyseerr
--- a/charts/jellyseerr-chart/README.md
+++ b/charts/jellyseerr-chart/README.md
@@ -1,6 +1,6 @@
 # jellyseerr-chart

-![Version: 1.3.0](https://img.shields.io/badge/Version-1.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.2.3](https://img.shields.io/badge/AppVersion-2.2.3-informational?style=flat-square)
+![Version: 2.0.0](https://img.shields.io/badge/Version-2.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.0](https://img.shields.io/badge/AppVersion-2.3.0-informational?style=flat-square)

 Jellyseerr helm chart for Kubernetes

@@ -25,10 +25,6 @@ Kubernetes: `>=1.23.0-0`
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | affinity | object | `{}` |  |
-| autoscaling.enabled | bool | `false` |  |
-| autoscaling.maxReplicas | int | `100` |  |
-| autoscaling.minReplicas | int | `1` |  |
-| autoscaling.targetCPUUtilizationPercentage | int | `80` |  |
 | config | object | `{"persistence":{"accessModes":["ReadWriteOnce"],"annotations":{},"name":"","size":"5Gi","volumeName":""}}` | Creating PVC to store configuration |
 | config.persistence.accessModes | list | `["ReadWriteOnce"]` | Access modes of persistent disk |
 | config.persistence.annotations | object | `{}` | Annotations for PVCs |
@@ -39,7 +35,7 @@ Kubernetes: `>=1.23.0-0`
 | extraEnvFrom | list | `[]` | Environment variables from secrets or configmaps to add to the jellyseerr pods |
 | fullnameOverride | string | `""` |  |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
-| image.registry | string | `"docker.io"` |  |
+| image.registry | string | `"ghcr.io"` |  |
 | image.repository | string | `"fallenbagel/jellyseerr"` |  |
 | image.sha | string | `""` |  |
 | image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion. |
--- a/charts/jellyseerr-chart/templates/deployment.yaml
+++ b/charts/jellyseerr-chart/templates/deployment.yaml
@@ -5,9 +5,7 @@ metadata:
  labels:
    {{- include "jellyseerr.labels" . | nindent 4 }}
 spec:
-  {{- if not .Values.autoscaling.enabled }}
  replicas: {{ .Values.replicaCount }}
-  {{- end }}
  strategy:
    type: {{ .Values.strategy.type }}
  selector:
--- a/charts/jellyseerr-chart/templates/hpa.yaml
+++ b/charts/jellyseerr-chart/templates/hpa.yaml
@@ -1,32 +0,0 @@
-{{- if .Values.autoscaling.enabled }}
-apiVersion: autoscaling/v2
-kind: HorizontalPodAutoscaler
-metadata:
-  name: {{ include "jellyseerr.fullname" . }}
-  labels:
-    {{- include "jellyseerr.labels" . | nindent 4 }}
-spec:
-  scaleTargetRef:
-    apiVersion: apps/v1
-    kind: Deployment
-    name: {{ include "jellyseerr.fullname" . }}
-  minReplicas: {{ .Values.autoscaling.minReplicas }}
-  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
-  metrics:
-    {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
-    - type: Resource
-      resource:
-        name: cpu
-        target:
-          type: Utilization
-          averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
-    {{- end }}
-    {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
-    - type: Resource
-      resource:
-        name: memory
-        target:
-          type: Utilization
-          averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
-    {{- end }}
-{{- end }}
--- a/charts/jellyseerr-chart/values.yaml
+++ b/charts/jellyseerr-chart/values.yaml
@@ -1,7 +1,7 @@
 replicaCount: 1

 image:
-  registry: docker.io
+  registry: ghcr.io
  repository: fallenbagel/jellyseerr
  pullPolicy: IfNotPresent
  # -- Overrides the image tag whose default is the chart appVersion.
@@ -94,13 +94,6 @@ resources: {}
  #   cpu: 100m
  #   memory: 128Mi

-autoscaling:
-  enabled: false
-  minReplicas: 1
-  maxReplicas: 100
-  targetCPUUtilizationPercentage: 80
-  # targetMemoryUtilizationPercentage: 80
-
 nodeSelector: {}

 tolerations: []
Author	SHA1	Message	Date
fallenbagel	f3e8cc3546	ci: add a job to merge and create multi-arch image This has to be done now that arm64 and amd64 runs as two seperate jobs. Otherwise, whichever finishes the last would override the other one when pushed	2025-01-18 19:29:04 +08:00
Fallenbagel	a8f84d4f74	ci: correct arm runner label (#1277 ) The issue was all because of using the wrong label. 18 hours wasted waiting for a non-existent runner to start. It is `ubuntu-24.04-arm` https://github.com/orgs/community/discussions/148648#discussion-7793082	2025-01-18 19:07:45 +08:00
Fallenbagel	88e96fa163	ci: upgrade runner to ubuntu 24.04 to get arm64 runner working (#1276 ) This is another attempt to get arm64 runner working by upgrading the runner to ubuntu-24-04, hoping it works better. Related to #1275	2025-01-18 17:57:07 +08:00
Fallenbagel	2d814c1416	ci: attempt to fix arm64 runners with proper scoped caching (#1275 ) Added platform specific cache scoping and turned off provenance to prevent manifest merging. In addition we are now using ubuntu24.04 in an attempt to get the job to run as ubuntu-22.04 were stalled for more than 18 hours.	2025-01-18 17:49:35 +08:00
Fallenbagel	2f4b848b2c	ci: utilise the linux arm64 hosted runners (#1271 ) * ci: utilise the linux arm64 hosted runners This is an attempt to utilise the linux arm64 hosted runners which should reduce the build times significantly. In addition, this should leverage the github's built-in caching. * ci: fix typo	2025-01-18 05:14:33 +08:00
Ludovic Ortega	0ee3e69a61	feat: upgrade chart to 2.0.0 (#1268 ) - upgrade jellyseerr to 2.3.0 - disable HPA as it's not documented and not useful - migrate container image to ghcr.io registry Signed-off-by: Ludovic Ortega <ludovic.ortega@adminafk.fr>	2025-01-17 18:32:20 +08:00