From 8daa4370e5bbc68cdc5cfd96bde02712a7622729 Mon Sep 17 00:00:00 2001 From: niedbalski <821670+niedbalski@users.noreply.github.com> Date: Tue, 5 Nov 2024 13:50:51 +0000 Subject: [PATCH] ci: update Core Operator chart from latest version internally Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- charts/core-crd/Chart.yaml | 4 +- charts/core-crd/values.yaml | 2 +- charts/core-instance/Chart.yaml | 4 +- charts/core-instance/values.yaml | 4 +- charts/core-operator/Chart.yaml | 4 +- charts/core-operator/templates/manager.yaml | 15 +++++ charts/core-operator/tests/manager_test.yaml | 63 ++++++++++++++++++++ charts/core-operator/values.yaml | 3 +- 8 files changed, 89 insertions(+), 10 deletions(-) diff --git a/charts/core-crd/Chart.yaml b/charts/core-crd/Chart.yaml index 594bf75..329a8d0 100644 --- a/charts/core-crd/Chart.yaml +++ b/charts/core-crd/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: core-crd description: A Helm chart for Kubernetes type: application -version: 3.5.0 -appVersion: "v3.5.0" +version: 3.7.0 +appVersion: "v3.7.0" maintainers: - name: Calyptia email: hello@calyptia.com diff --git a/charts/core-crd/values.yaml b/charts/core-crd/values.yaml index 5b96dfd..d5482ae 100644 --- a/charts/core-crd/values.yaml +++ b/charts/core-crd/values.yaml @@ -9,7 +9,7 @@ images: fluentBit: registry: ghcr.io repository: calyptia/core/calyptia-fluent-bit - tag: 24.10.2 + tag: 24.10.4 pullSecrets: [] ingestCheck: registry: ghcr.io diff --git a/charts/core-instance/Chart.yaml b/charts/core-instance/Chart.yaml index 0c38d06..e4ca95e 100644 --- a/charts/core-instance/Chart.yaml +++ b/charts/core-instance/Chart.yaml @@ -4,8 +4,8 @@ description: Calyptia Core Instance chart home: https://calyptia.com/products/core/ icon: https://storage.googleapis.com/calyptia_public_resources_bucket/logo-darkmode.svg type: application -version: 3.5.0 -appVersion: "v3.5.0" +version: 3.7.0 +appVersion: "v3.7.0" maintainers: - name: Calyptia email: hello@calyptia.com diff --git a/charts/core-instance/values.yaml b/charts/core-instance/values.yaml index a2d6bf8..00773e5 100644 --- a/charts/core-instance/values.yaml +++ b/charts/core-instance/values.yaml @@ -22,12 +22,12 @@ images: fromCloud: registry: ghcr.io repository: calyptia/core-operator/sync-from-cloud - tag: 3.5.0 + tag: 3.7.0 pullSecrets: [] toCloud: registry: ghcr.io repository: calyptia/core-operator/sync-to-cloud - tag: 3.5.0 + tag: 3.7.0 pullSecrets: [] hotReload: registry: ghcr.io diff --git a/charts/core-operator/Chart.yaml b/charts/core-operator/Chart.yaml index 7f627ce..2e3878f 100644 --- a/charts/core-operator/Chart.yaml +++ b/charts/core-operator/Chart.yaml @@ -4,8 +4,8 @@ description: Calyptia Core Operator chart home: https://calyptia.com/products/core/ icon: https://storage.googleapis.com/calyptia_public_resources_bucket/logo-darkmode.svg type: application -version: 3.5.0 -appVersion: "v3.5.0" +version: 3.7.0 +appVersion: "v3.7.0" maintainers: - name: Calyptia email: hello@calyptia.com diff --git a/charts/core-operator/templates/manager.yaml b/charts/core-operator/templates/manager.yaml index 1e18122..b5e1346 100644 --- a/charts/core-operator/templates/manager.yaml +++ b/charts/core-operator/templates/manager.yaml @@ -74,6 +74,21 @@ spec: serviceAccount: {{ template "operator.serviceAccountName" . }} {{- include "operator.imagePullSecrets" . | nindent 6 }} terminationGracePeriodSeconds: 10 + {{- if .Values.calyptiaTolerations }} + tolerations: + {{- $tolerations := .Values.calyptiaTolerations | split "," }} + {{- range $toleration := $tolerations }} + {{- $tolerationParts := split ":" $toleration }} + {{- $keyValue := split "=" (index $tolerationParts._0) }} + - key: "{{ $keyValue._0 }}" + operator: "{{ $keyValue._1 }}" + value: "{{ index $tolerationParts._1 }}" + effect: "{{ index $tolerationParts._2 }}" + {{- if gt (len $tolerationParts) 3 }} + tolerationSeconds: {{ index $tolerationParts._3 }} + {{- end }} + {{- end }} + {{- end }} volumes: {{- if .Values.extraVolumes }} {{- include "common.tplvalues.render" (dict "value" .Values.extraVolumes "context" $) | nindent 8 }} diff --git a/charts/core-operator/tests/manager_test.yaml b/charts/core-operator/tests/manager_test.yaml index e5a85af..b2e3575 100644 --- a/charts/core-operator/tests/manager_test.yaml +++ b/charts/core-operator/tests/manager_test.yaml @@ -24,3 +24,66 @@ tests: - equal: path: metadata.namespace value: test + - it: checks tolerations key + set: + calyptiaTolerations: "key1=Equal:value1:Execute:3600" + asserts: + - equal: + path: spec.template.spec.tolerations[0].key + value: "key1" + - it: checks tolerations effect + set: + calyptiaTolerations: "key1=Equal:value1:Execute:3600" + asserts: + - equal: + path: spec.template.spec.tolerations[0].effect + value: "Execute" + - it: checks tolerations operator + set: + calyptiaTolerations: "key1=Equal:value1:Execute:3600" + asserts: + - equal: + path: spec.template.spec.tolerations[0].operator + value: "Equal" + - it: checks tolerations tolerationSeconds + set: + calyptiaTolerations: "key1=Equal:value1:Execute:3600" + asserts: + - equal: + path: spec.template.spec.tolerations[0].tolerationSeconds + value: 3600 + - it: checks tolerations key + set: + calyptiaTolerations: "key1=Equal:value1:Execute:3600,key2=Equal:value1:Execute:3600" + asserts: + - equal: + path: spec.template.spec.tolerations[1].key + value: "key2" + - it: checks tolerations effect + set: + calyptiaTolerations: "key1=Equal:value1:Execute:3600,key2=Equal:value1:Execute:3600" + asserts: + - equal: + path: spec.template.spec.tolerations[1].effect + value: "Execute" + - it: checks tolerations operator + set: + calyptiaTolerations: "key1=Equal:value1:Execute:3600,key2=Equal:value1:Execute:3600" + asserts: + - equal: + path: spec.template.spec.tolerations[1].operator + value: "Equal" + - it: checks tolerations tolerationSeconds + set: + calyptiaTolerations: "key1=Equal:value1:Execute:3600,key2=Equal:value1:Execute:3605" + asserts: + - equal: + path: spec.template.spec.tolerations[1].tolerationSeconds + value: 3605 + - it: checks tolerations exists + set: + calyptiaTolerations: "=Exists::" + asserts: + - equal: + path: spec.template.spec.tolerations[0].operator + value: "Exists" diff --git a/charts/core-operator/values.yaml b/charts/core-operator/values.yaml index f80a0df..e11a86f 100644 --- a/charts/core-operator/values.yaml +++ b/charts/core-operator/values.yaml @@ -4,7 +4,7 @@ images: operator: registry: ghcr.io repository: calyptia/core-operator - tag: 3.5.0 + tag: 3.7.0 pullSecrets: [] hotReload: registry: ghcr.io @@ -18,6 +18,7 @@ podLabels: {} nameOverride: "" fullnameOverride: "" namespaceOverride: "" +calyptiaTolerations: "" serviceAccount: create: true name: ""