[stable/fairwinds-insights] Fix cronjobs (#1370)

* Fix cronjobs * Update Chart.yaml * Update CHANGELOG.md * Delete stable/fairwinds-insights/templates/trial-end-downgrade-cronjob.yaml * Update values.yaml * helm-docs * change trial-end docs
FairwindsOps · Nov 14, 2023 · 4958fda · 4958fda
1 parent 0310353
commit 4958fda
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 48 deletions.
diff --git a/stable/fairwinds-insights/CHANGELOG.md b/stable/fairwinds-insights/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 1.0.1
+* Fix for multiple CronJobs
+
 ## 1.0.0
 * Refactor logic for creating and modifying CronJobs
 

diff --git a/stable/fairwinds-insights/Chart.yaml b/stable/fairwinds-insights/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "14.7"
 description: A Helm chart to run the Fairwinds Insights server
 name: fairwinds-insights
-version: 1.0.0
+version: 1.0.1
 kubeVersion: ">= 1.22.0-0"
 maintainers:
   - name: rbren

diff --git a/stable/fairwinds-insights/README.md b/stable/fairwinds-insights/README.md
@@ -52,6 +52,7 @@ See [insights.docs.fairwinds.com](https://insights.docs.fairwinds.com/technical-
 | cronjobs.resources-recommendations | object | `{"command":"resources_recommendations","resources":{"limits":{"cpu":1,"memory":"3Gi"},"requests":{"cpu":1,"memory":"3Gi"}},"schedule":"0 2 * * *"}` | Options for the resources recommendations job |
 | cronjobs.saml | object | `{"command":"refresh_saml_metadata","schedule":"0 * * * *"}` | Options for the SAML sync job |
 | cronjobs.slack-channels | object | `{"command":"slack_channels_local_refresher","schedule":"0/15 * * * *"}` | Options for the slack channels job. |
+| cronjobs.trial-end | object | `{"command":"trial_end_downgrade","schedule":""}` | Options for the trial-end job. |
 | selfHostedSecret | string | `nil` |  |
 | additionalEnvironmentVariables | object | `{}` | Additional Environment Variables to set on the Fairwinds Insights pods. |
 | rbac.serviceAccount.annotations | object | `{}` | Annotations to add to the service account |

diff --git a/stable/fairwinds-insights/templates/_helpers.tpl b/stable/fairwinds-insights/templates/_helpers.tpl
@@ -13,13 +13,13 @@ If release name contains chart name it will be used as a full name.
 */}}
 {{- define "fairwinds-insights.fullname" -}}
 {{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 27 | trimSuffix "-" -}}
+{{- .Values.fullnameOverride | trunc 20 | trimSuffix "-" -}}
 {{- else -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
 {{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 27 | trimSuffix "-" -}}
+{{- .Release.Name | trunc 20 | trimSuffix "-" -}}
 {{- else -}}
-{{- printf "%s" .Release.Name | trunc 27 | trimSuffix "-" -}}
+{{- printf "%s" .Release.Name | trunc 20 | trimSuffix "-" -}}
 {{- end -}}
 {{- end -}}
 {{- end -}}

diff --git a/stable/fairwinds-insights/templates/cronjobs.yaml b/stable/fairwinds-insights/templates/cronjobs.yaml
@@ -3,7 +3,7 @@
 apiVersion: batch/v1
 kind: CronJob
 metadata:
-  name: {{ include "fairwinds-insights.fullname" $ }}-cronjob-{{ $name }}
+  name: {{ include "fairwinds-insights.fullname" $ }}-cj-{{ $name }}
   labels:
     {{- include "fairwinds-insights.labels" $ | nindent 4 }}
     app.kubernetes.io/component: cronjob-{{ $name }}
@@ -45,5 +45,6 @@ spec:
                 secretName: github-secrets
                 optional: true
           {{- end }}
+---
 {{ end }}
 {{ end }}
diff --git a/stable/fairwinds-insights/templates/trial-end-downgrade-cronjob.yaml b/stable/fairwinds-insights/templates/trial-end-downgrade-cronjob.yaml
diff --git a/stable/fairwinds-insights/values.yaml b/stable/fairwinds-insights/values.yaml
@@ -184,6 +184,11 @@ cronjobs:
     command: slack_channels_local_refresher
     schedule: "0/15 * * * *"
 
+  # -- Options for the trial-end job.
+  trial-end:
+    command: trial_end_downgrade
+    schedule: ""
+
 selfHostedSecret:
 
 # -- Additional Environment Variables to set on the Fairwinds Insights pods.