From 41685af3f47299909de954af7f0c299f46091ca4 Mon Sep 17 00:00:00 2001 From: cherrh Date: Tue, 3 Jun 2025 15:20:18 +0200 Subject: [PATCH 1/3] added usage pod annotation for tls-manager job --- charts/portal/templates/jobs/cert-update-job.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/charts/portal/templates/jobs/cert-update-job.yaml b/charts/portal/templates/jobs/cert-update-job.yaml index bc622dab..82cb00b5 100644 --- a/charts/portal/templates/jobs/cert-update-job.yaml +++ b/charts/portal/templates/jobs/cert-update-job.yaml @@ -21,6 +21,10 @@ metadata: spec: backoffLimit: 0 template: + metadata: + {{- if .Values.apim.podAnnotations }} + annotations: {{- toYaml .Values.apim.podAnnotations | nindent 8 }} + {{- end }} spec: serviceAccountName: {{ include "portal.serviceAccountName" . }} restartPolicy: Never From 804e12d286f804e1565ef0ea1bad2a4d49427084 Mon Sep 17 00:00:00 2001 From: cherrh Date: Tue, 3 Jun 2025 15:26:34 +0200 Subject: [PATCH 2/3] bump version --- charts/portal/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/portal/Chart.yaml b/charts/portal/Chart.yaml index d30cb0eb..be39945b 100644 --- a/charts/portal/Chart.yaml +++ b/charts/portal/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "5.3.2" description: CA API Developer Portal name: portal -version: 2.3.14 +version: 2.3.15 type: application home: https://github.com/CAAPIM/apim-charts maintainers: From a7747bd9f4c6a0405d0f2978893231cf97d4fcf7 Mon Sep 17 00:00:00 2001 From: cherrh Date: Tue, 10 Jun 2025 09:23:37 +0200 Subject: [PATCH 3/3] processed review commentary pr #381 --- charts/portal/templates/jobs/cert-update-job.yaml | 4 ++-- charts/portal/values-production.yaml | 1 + charts/portal/values.yaml | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/charts/portal/templates/jobs/cert-update-job.yaml b/charts/portal/templates/jobs/cert-update-job.yaml index 82cb00b5..1fd0da95 100644 --- a/charts/portal/templates/jobs/cert-update-job.yaml +++ b/charts/portal/templates/jobs/cert-update-job.yaml @@ -22,8 +22,8 @@ spec: backoffLimit: 0 template: metadata: - {{- if .Values.apim.podAnnotations }} - annotations: {{- toYaml .Values.apim.podAnnotations | nindent 8 }} + {{- if .Values.jobs.podAnnotations }} + annotations: {{- toYaml .Values.jobs.podAnnotations | nindent 8 }} {{- end }} spec: serviceAccountName: {{ include "portal.serviceAccountName" . }} diff --git a/charts/portal/values-production.yaml b/charts/portal/values-production.yaml index 2ef788ba..329e4805 100644 --- a/charts/portal/values-production.yaml +++ b/charts/portal/values-production.yaml @@ -957,6 +957,7 @@ ingress-nginx: # Settings for portal jobs jobs: + podAnnotations: {} labels: {} # nodeSelector: {} # tolerations: [] diff --git a/charts/portal/values.yaml b/charts/portal/values.yaml index e23fcdb9..6a0f3da7 100644 --- a/charts/portal/values.yaml +++ b/charts/portal/values.yaml @@ -812,6 +812,7 @@ ingress-nginx: # Settings for portal jobs jobs: + podAnnotations: {} labels: {} # nodeSelector: {} # tolerations: []