From 67ead23b453c41d19086dc732aba776ee0b96cbb Mon Sep 17 00:00:00 2001 From: Ludovic Ortega Date: Sat, 16 Nov 2024 17:56:37 +0100 Subject: [PATCH 1/3] feat: support pinning image sha Signed-off-by: Ludovic Ortega --- charts/stirling-pdf/README.md | 3 ++- charts/stirling-pdf/templates/deployment.yaml | 6 +++++- charts/stirling-pdf/values.yaml | 5 +++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/charts/stirling-pdf/README.md b/charts/stirling-pdf/README.md index 9a6b3db..3a56a5d 100644 --- a/charts/stirling-pdf/README.md +++ b/charts/stirling-pdf/README.md @@ -41,7 +41,8 @@ helm repo add stirling-pdf https://stirling-tools.github.io/Stirling-PDF-chart | extraArgs | list | `[]` | | | image.pullPolicy | string | `"IfNotPresent"` | | | image.repository | string | `"frooodle/s-pdf"` | | -| image.tag | string | `nil` | | +| image.sha | string | `""` | | +| image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion. | | ingress | object | `{"annotations":{},"enabled":false,"hosts":[],"ingressClassName":null,"labels":{},"pathType":"ImplementationSpecific"}` | Ingress for load balancer | | ingress.annotations | object | `{}` | Stirling-pdf Ingress annotations | | ingress.hosts | list | `[]` | Must be provided if Ingress is enabled | diff --git a/charts/stirling-pdf/templates/deployment.yaml b/charts/stirling-pdf/templates/deployment.yaml index e642592..ed898e2 100644 --- a/charts/stirling-pdf/templates/deployment.yaml +++ b/charts/stirling-pdf/templates/deployment.yaml @@ -58,7 +58,11 @@ spec: {{- include "stirlingpdf.imagePullSecrets" . | indent 6 }} containers: - name: {{ .Chart.Name }} - image: {{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }} + {{- if .Values.image.sha }} + image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}@sha256:{{ .Values.image.sha }}" + {{- else }} + image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" + {{- end }} imagePullPolicy: {{ .Values.image.pullPolicy }} securityContext: {{- toYaml .Values.containerSecurityContext | nindent 10 }} diff --git a/charts/stirling-pdf/values.yaml b/charts/stirling-pdf/values.yaml index 53526d1..6f1092c 100644 --- a/charts/stirling-pdf/values.yaml +++ b/charts/stirling-pdf/values.yaml @@ -6,8 +6,9 @@ strategy: type: RollingUpdate image: repository: frooodle/s-pdf - # took Chart appVersion by default - tag: ~ + # -- Overrides the image tag whose default is the chart appVersion. + tag: "" + sha: "" pullPolicy: IfNotPresent secret: labels: {} From b57b90dfc14be7247a9c5452d7d644c1de697aa0 Mon Sep 17 00:00:00 2001 From: Ludovic Ortega Date: Sat, 16 Nov 2024 17:57:37 +0100 Subject: [PATCH 2/3] feat: use by default ghcr.io registry for stirling-pdf image to avoid rate limit Signed-off-by: Ludovic Ortega --- charts/stirling-pdf/README.md | 1 + charts/stirling-pdf/templates/deployment.yaml | 4 ++-- charts/stirling-pdf/values.yaml | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/charts/stirling-pdf/README.md b/charts/stirling-pdf/README.md index 3a56a5d..22439a8 100644 --- a/charts/stirling-pdf/README.md +++ b/charts/stirling-pdf/README.md @@ -40,6 +40,7 @@ helm repo add stirling-pdf https://stirling-tools.github.io/Stirling-PDF-chart | envsFrom | list | `[]` | Environment variables from secrets or configmaps to add to the stirling-pdf pods | | extraArgs | list | `[]` | | | image.pullPolicy | string | `"IfNotPresent"` | | +| image.registry | string | `"ghcr.io"` | | | image.repository | string | `"frooodle/s-pdf"` | | | image.sha | string | `""` | | | image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion. | diff --git a/charts/stirling-pdf/templates/deployment.yaml b/charts/stirling-pdf/templates/deployment.yaml index ed898e2..9c85f38 100644 --- a/charts/stirling-pdf/templates/deployment.yaml +++ b/charts/stirling-pdf/templates/deployment.yaml @@ -59,9 +59,9 @@ spec: containers: - name: {{ .Chart.Name }} {{- if .Values.image.sha }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}@sha256:{{ .Values.image.sha }}" + image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}@sha256:{{ .Values.image.sha }}" {{- else }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" + image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" {{- end }} imagePullPolicy: {{ .Values.image.pullPolicy }} securityContext: diff --git a/charts/stirling-pdf/values.yaml b/charts/stirling-pdf/values.yaml index 6f1092c..d8051bc 100644 --- a/charts/stirling-pdf/values.yaml +++ b/charts/stirling-pdf/values.yaml @@ -5,6 +5,7 @@ replicaCount: 1 strategy: type: RollingUpdate image: + registry: ghcr.io repository: frooodle/s-pdf # -- Overrides the image tag whose default is the chart appVersion. tag: "" From 3be99767e1b998413b3b702cf3f11194c61fe366 Mon Sep 17 00:00:00 2001 From: Ludovic Ortega Date: Sat, 16 Nov 2024 20:38:26 +0100 Subject: [PATCH 3/3] feat: upgrade stirling-pdf to 0.33.1 Signed-off-by: Ludovic Ortega --- charts/stirling-pdf/Chart.yaml | 4 ++-- charts/stirling-pdf/README.md | 4 ++-- charts/stirling-pdf/values.yaml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/charts/stirling-pdf/Chart.yaml b/charts/stirling-pdf/Chart.yaml index 52fb043..1822ba9 100644 --- a/charts/stirling-pdf/Chart.yaml +++ b/charts/stirling-pdf/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 0.32.0 +appVersion: 0.33.1 description: locally hosted web application that allows you to perform various operations on PDF files home: https://github.com/Stirling-Tools/Stirling-PDF @@ -13,4 +13,4 @@ maintainers: name: stirling-pdf-chart sources: - https://github.com/Stirling-Tools/Stirling-PDF-chart -version: 1.1.0 +version: 1.2.0 diff --git a/charts/stirling-pdf/README.md b/charts/stirling-pdf/README.md index 22439a8..beb1982 100644 --- a/charts/stirling-pdf/README.md +++ b/charts/stirling-pdf/README.md @@ -1,6 +1,6 @@ # stirling-pdf-chart -![Version: 1.1.0](https://img.shields.io/badge/Version-1.1.0-informational?style=flat-square) ![AppVersion: 0.32.0](https://img.shields.io/badge/AppVersion-0.32.0-informational?style=flat-square) +![Version: 1.2.0](https://img.shields.io/badge/Version-1.2.0-informational?style=flat-square) ![AppVersion: 0.33.1](https://img.shields.io/badge/AppVersion-0.33.1-informational?style=flat-square) locally hosted web application that allows you to perform various operations on PDF files @@ -41,7 +41,7 @@ helm repo add stirling-pdf https://stirling-tools.github.io/Stirling-PDF-chart | extraArgs | list | `[]` | | | image.pullPolicy | string | `"IfNotPresent"` | | | image.registry | string | `"ghcr.io"` | | -| image.repository | string | `"frooodle/s-pdf"` | | +| image.repository | string | `"stirling-tools/stirling-pdf"` | | | image.sha | string | `""` | | | image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion. | | ingress | object | `{"annotations":{},"enabled":false,"hosts":[],"ingressClassName":null,"labels":{},"pathType":"ImplementationSpecific"}` | Ingress for load balancer | diff --git a/charts/stirling-pdf/values.yaml b/charts/stirling-pdf/values.yaml index d8051bc..cd16f75 100644 --- a/charts/stirling-pdf/values.yaml +++ b/charts/stirling-pdf/values.yaml @@ -6,7 +6,7 @@ strategy: type: RollingUpdate image: registry: ghcr.io - repository: frooodle/s-pdf + repository: stirling-tools/stirling-pdf # -- Overrides the image tag whose default is the chart appVersion. tag: "" sha: ""