From 098ec4722ca01b97bd1e462f2b55a562202ab7bb Mon Sep 17 00:00:00 2001 From: Moshe Dahan Date: Tue, 4 Jun 2024 15:16:39 +0300 Subject: [PATCH 1/5] add helm check version --- charts/ocean-kubernetes-controller/README.md | 2 ++ .../templates/_helpers.tpl | 11 +++++++++++ .../templates/deployment.yaml | 1 + 3 files changed, 14 insertions(+) diff --git a/charts/ocean-kubernetes-controller/README.md b/charts/ocean-kubernetes-controller/README.md index 2ad4354..d566c49 100644 --- a/charts/ocean-kubernetes-controller/README.md +++ b/charts/ocean-kubernetes-controller/README.md @@ -59,6 +59,8 @@ helm install spot spot/ocean-kubernetes-controller \ Kubernetes: `>=1.20.0-0` +Helm: `>=3.7.0` + | Repository | Name | Version | |------------|------|---------| | https://kubernetes-sigs.github.io/metrics-server | metrics-server | 3.11.0 | diff --git a/charts/ocean-kubernetes-controller/templates/_helpers.tpl b/charts/ocean-kubernetes-controller/templates/_helpers.tpl index 1f3e477..3b40edd 100644 --- a/charts/ocean-kubernetes-controller/templates/_helpers.tpl +++ b/charts/ocean-kubernetes-controller/templates/_helpers.tpl @@ -352,4 +352,15 @@ or if another log shipping destination host is specified. true {{- end }} {{- end }} +{{- end }} + +{{/* +This function validates the Helm version. It checks if the Helm version is 3.7 or higher. +If the Helm version is less than 3.7, it will cause the Helm operation to fail with an error message. +*/}} +{{- define "ocean-kubernetes-controller.validateHelmVersion" -}} +{{- if ge .Capabilities.HelmVersion.Version "3.8.0" }} +{{- else }} +{{- fail "Helm version 3.8.0 or higher is required" }} +{{- end }} {{- end }} \ No newline at end of file diff --git a/charts/ocean-kubernetes-controller/templates/deployment.yaml b/charts/ocean-kubernetes-controller/templates/deployment.yaml index b52127d..9382dbc 100644 --- a/charts/ocean-kubernetes-controller/templates/deployment.yaml +++ b/charts/ocean-kubernetes-controller/templates/deployment.yaml @@ -1,3 +1,4 @@ +{{ include "ocean-kubernetes-controller.validateHelmVersion" . }} {{ include "ocean-kubernetes-controller.deployMetricsServer" . }} apiVersion: apps/v1 kind: Deployment From 80f3701bd9f4ff1331a38dfba1f8f6326758deed Mon Sep 17 00:00:00 2001 From: Moshe Dahan Date: Wed, 5 Jun 2024 16:06:36 +0300 Subject: [PATCH 2/5] fix helm check --- .../templates/_helpers.tpl | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/charts/ocean-kubernetes-controller/templates/_helpers.tpl b/charts/ocean-kubernetes-controller/templates/_helpers.tpl index 3b40edd..8be3be5 100644 --- a/charts/ocean-kubernetes-controller/templates/_helpers.tpl +++ b/charts/ocean-kubernetes-controller/templates/_helpers.tpl @@ -359,8 +359,11 @@ This function validates the Helm version. It checks if the Helm version is 3.7 o If the Helm version is less than 3.7, it will cause the Helm operation to fail with an error message. */}} {{- define "ocean-kubernetes-controller.validateHelmVersion" -}} -{{- if ge .Capabilities.HelmVersion.Version "3.8.0" }} -{{- else }} -{{- fail "Helm version 3.8.0 or higher is required" }} -{{- end }} -{{- end }} \ No newline at end of file +{{- $helmVersion := .Capabilities.HelmVersion.Version }} +{{- if $helmVersion -}} +{{- if semverCompare ">=v3.7.0" (semver .Capabilities.HelmVersion.Version).String -}} +{{- else -}} +{{- fail "Helm version 3.7.0 or higher is required to install this chart" -}} +{{- end -}} +{{- end -}} +{{- end -}} \ No newline at end of file From 75e2ec88f76170b0d37a66797a5d739fde5b430f Mon Sep 17 00:00:00 2001 From: Moshe Dahan Date: Wed, 5 Jun 2024 16:09:54 +0300 Subject: [PATCH 3/5] fix helm param --- charts/ocean-kubernetes-controller/templates/_helpers.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/ocean-kubernetes-controller/templates/_helpers.tpl b/charts/ocean-kubernetes-controller/templates/_helpers.tpl index 8be3be5..b1cb282 100644 --- a/charts/ocean-kubernetes-controller/templates/_helpers.tpl +++ b/charts/ocean-kubernetes-controller/templates/_helpers.tpl @@ -361,7 +361,7 @@ If the Helm version is less than 3.7, it will cause the Helm operation to fail w {{- define "ocean-kubernetes-controller.validateHelmVersion" -}} {{- $helmVersion := .Capabilities.HelmVersion.Version }} {{- if $helmVersion -}} -{{- if semverCompare ">=v3.7.0" (semver .Capabilities.HelmVersion.Version).String -}} +{{- if semverCompare ">=v3.7.0" (semver $helmVersion).String -}} {{- else -}} {{- fail "Helm version 3.7.0 or higher is required to install this chart" -}} {{- end -}} From 4d58f4b3bd44e6430458007bfb9f896b0ab15633 Mon Sep 17 00:00:00 2001 From: Moshe Dahan Date: Wed, 5 Jun 2024 17:05:19 +0300 Subject: [PATCH 4/5] helm version 3.9.0 --- charts/ocean-kubernetes-controller/README.md | 2 +- charts/ocean-kubernetes-controller/templates/_helpers.tpl | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/charts/ocean-kubernetes-controller/README.md b/charts/ocean-kubernetes-controller/README.md index d566c49..517e4f7 100644 --- a/charts/ocean-kubernetes-controller/README.md +++ b/charts/ocean-kubernetes-controller/README.md @@ -59,7 +59,7 @@ helm install spot spot/ocean-kubernetes-controller \ Kubernetes: `>=1.20.0-0` -Helm: `>=3.7.0` +Helm: `>=3.9.0` | Repository | Name | Version | |------------|------|---------| diff --git a/charts/ocean-kubernetes-controller/templates/_helpers.tpl b/charts/ocean-kubernetes-controller/templates/_helpers.tpl index b1cb282..c182bae 100644 --- a/charts/ocean-kubernetes-controller/templates/_helpers.tpl +++ b/charts/ocean-kubernetes-controller/templates/_helpers.tpl @@ -361,9 +361,10 @@ If the Helm version is less than 3.7, it will cause the Helm operation to fail w {{- define "ocean-kubernetes-controller.validateHelmVersion" -}} {{- $helmVersion := .Capabilities.HelmVersion.Version }} {{- if $helmVersion -}} -{{- if semverCompare ">=v3.7.0" (semver $helmVersion).String -}} +{{- if semverCompare ">=v3.9.0" (semver $helmVersion).String -}} {{- else -}} -{{- fail "Helm version 3.7.0 or higher is required to install this chart" -}} +{{- fail "Helm version 3.9.0 or higher is required to install this chart" -}} {{- end -}} +{{- else -}} {{- end -}} {{- end -}} \ No newline at end of file From dede70e2533f75762e40b0f39f7f18b654d3ce0e Mon Sep 17 00:00:00 2001 From: Moshe Dahan Date: Wed, 5 Jun 2024 17:06:22 +0300 Subject: [PATCH 5/5] remove else --- charts/ocean-kubernetes-controller/templates/_helpers.tpl | 1 - 1 file changed, 1 deletion(-) diff --git a/charts/ocean-kubernetes-controller/templates/_helpers.tpl b/charts/ocean-kubernetes-controller/templates/_helpers.tpl index c182bae..754d921 100644 --- a/charts/ocean-kubernetes-controller/templates/_helpers.tpl +++ b/charts/ocean-kubernetes-controller/templates/_helpers.tpl @@ -365,6 +365,5 @@ If the Helm version is less than 3.7, it will cause the Helm operation to fail w {{- else -}} {{- fail "Helm version 3.9.0 or higher is required to install this chart" -}} {{- end -}} -{{- else -}} {{- end -}} {{- end -}} \ No newline at end of file