From 39dbdc7eb9b8bf838b9ea3b792774e66a68b7201 Mon Sep 17 00:00:00 2001 From: Aleksandr Stefurishin Date: Tue, 11 Feb 2025 15:35:38 +0300 Subject: [PATCH] Automated commit. See script in PR (#74) Signed-off-by: Aleksandr Stefurishin --- templates/csi-nfs-scheduler-extender/configmap.yaml | 2 +- templates/csi-nfs-scheduler-extender/deployment.yaml | 2 +- .../kube-scheduler-webhook-configuration.yaml | 2 +- templates/csi-nfs-scheduler-extender/rbac-for-us.yaml | 2 +- templates/csi-nfs-scheduler-extender/secret.yaml | 2 +- templates/csi-nfs-scheduler-extender/service.yaml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/csi-nfs-scheduler-extender/configmap.yaml b/templates/csi-nfs-scheduler-extender/configmap.yaml index 4b26e731..8582a4d1 100644 --- a/templates/csi-nfs-scheduler-extender/configmap.yaml +++ b/templates/csi-nfs-scheduler-extender/configmap.yaml @@ -1,5 +1,5 @@ {{- if .Values.csiNfs.internal.shedulerExtenderEnabled }} -{{- if or (eq "dev" .Values.global.deckhouseVersion) (semverCompare ">=1.64" .Values.global.deckhouseVersion) }} +{{- if or (or (hasPrefix "dev" .Values.global.deckhouseVersion) (hasSuffix "dev" .Values.global.deckhouseVersion)) (semverCompare ">=1.64" .Values.global.deckhouseVersion) }} --- apiVersion: v1 kind: ConfigMap diff --git a/templates/csi-nfs-scheduler-extender/deployment.yaml b/templates/csi-nfs-scheduler-extender/deployment.yaml index 9a069d2e..f458cbe2 100644 --- a/templates/csi-nfs-scheduler-extender/deployment.yaml +++ b/templates/csi-nfs-scheduler-extender/deployment.yaml @@ -9,7 +9,7 @@ memory: 25Mi {{- end }} {{- if .Values.csiNfs.internal.shedulerExtenderEnabled }} -{{- if or (eq "dev" .Values.global.deckhouseVersion) (semverCompare ">=1.64" .Values.global.deckhouseVersion) }} +{{- if or (or (hasPrefix "dev" .Values.global.deckhouseVersion) (hasSuffix "dev" .Values.global.deckhouseVersion)) (semverCompare ">=1.64" .Values.global.deckhouseVersion) }} {{- $kubeVersion := semver .Values.global.discovery.kubernetesVersion -}} {{- if (.Values.global.enabledModules | has "vertical-pod-autoscaler-crd") }} diff --git a/templates/csi-nfs-scheduler-extender/kube-scheduler-webhook-configuration.yaml b/templates/csi-nfs-scheduler-extender/kube-scheduler-webhook-configuration.yaml index 99a65f4a..e36491f7 100644 --- a/templates/csi-nfs-scheduler-extender/kube-scheduler-webhook-configuration.yaml +++ b/templates/csi-nfs-scheduler-extender/kube-scheduler-webhook-configuration.yaml @@ -1,5 +1,5 @@ {{- if .Values.csiNfs.internal.shedulerExtenderEnabled }} -{{- if or (eq "dev" .Values.global.deckhouseVersion) (semverCompare ">=1.64" .Values.global.deckhouseVersion) }} +{{- if or (or (hasPrefix "dev" .Values.global.deckhouseVersion) (hasSuffix "dev" .Values.global.deckhouseVersion)) (semverCompare ">=1.64" .Values.global.deckhouseVersion) }} apiVersion: deckhouse.io/v1alpha1 kind: KubeSchedulerWebhookConfiguration metadata: diff --git a/templates/csi-nfs-scheduler-extender/rbac-for-us.yaml b/templates/csi-nfs-scheduler-extender/rbac-for-us.yaml index 6f234cd0..93d4f4f7 100644 --- a/templates/csi-nfs-scheduler-extender/rbac-for-us.yaml +++ b/templates/csi-nfs-scheduler-extender/rbac-for-us.yaml @@ -1,5 +1,5 @@ {{- if .Values.csiNfs.internal.shedulerExtenderEnabled }} -{{- if or (eq "dev" .Values.global.deckhouseVersion) (semverCompare ">=1.64" .Values.global.deckhouseVersion) }} +{{- if or (or (hasPrefix "dev" .Values.global.deckhouseVersion) (hasSuffix "dev" .Values.global.deckhouseVersion)) (semverCompare ">=1.64" .Values.global.deckhouseVersion) }} --- apiVersion: v1 kind: ServiceAccount diff --git a/templates/csi-nfs-scheduler-extender/secret.yaml b/templates/csi-nfs-scheduler-extender/secret.yaml index 960bc9fa..d1a40a70 100644 --- a/templates/csi-nfs-scheduler-extender/secret.yaml +++ b/templates/csi-nfs-scheduler-extender/secret.yaml @@ -1,5 +1,5 @@ {{- if .Values.csiNfs.internal.shedulerExtenderEnabled }} -{{- if or (eq "dev" .Values.global.deckhouseVersion) (semverCompare ">=1.64" .Values.global.deckhouseVersion) }} +{{- if or (or (hasPrefix "dev" .Values.global.deckhouseVersion) (hasSuffix "dev" .Values.global.deckhouseVersion)) (semverCompare ">=1.64" .Values.global.deckhouseVersion) }} --- apiVersion: v1 kind: Secret diff --git a/templates/csi-nfs-scheduler-extender/service.yaml b/templates/csi-nfs-scheduler-extender/service.yaml index f3307d4b..9997a7c0 100644 --- a/templates/csi-nfs-scheduler-extender/service.yaml +++ b/templates/csi-nfs-scheduler-extender/service.yaml @@ -1,5 +1,5 @@ {{- if .Values.csiNfs.internal.shedulerExtenderEnabled }} -{{- if or (eq "dev" .Values.global.deckhouseVersion) (semverCompare ">=1.64" .Values.global.deckhouseVersion) }} +{{- if or (or (hasPrefix "dev" .Values.global.deckhouseVersion) (hasSuffix "dev" .Values.global.deckhouseVersion)) (semverCompare ">=1.64" .Values.global.deckhouseVersion) }} --- apiVersion: v1 kind: Service