From 4976fa0801ba98b01ba7682934277fe9dc6106f0 Mon Sep 17 00:00:00 2001 From: CuBiC Date: Fri, 16 Apr 2021 10:58:48 +0200 Subject: [PATCH] [bitwardenrs] Fix Ingress API version (#795) * fix: dot context in template Signed-off-by: Waldemar Faist * docs: regenerate Signed-off-by: Waldemar Faist * build: bump version Signed-off-by: Waldemar Faist --- charts/stable/bitwardenrs/Chart.yaml | 2 +- charts/stable/bitwardenrs/README.md | 2 +- charts/stable/bitwardenrs/templates/ingress.yaml | 11 ++++++----- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/charts/stable/bitwardenrs/Chart.yaml b/charts/stable/bitwardenrs/Chart.yaml index f6b57fbc..1de8b30f 100644 --- a/charts/stable/bitwardenrs/Chart.yaml +++ b/charts/stable/bitwardenrs/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: bitwardenrs description: Unofficial Bitwarden compatible server written in Rust type: application -version: 2.1.7 +version: 2.1.8 appVersion: 1.18.0 keywords: - bitwarden diff --git a/charts/stable/bitwardenrs/README.md b/charts/stable/bitwardenrs/README.md index 6f61e916..bd6b3905 100644 --- a/charts/stable/bitwardenrs/README.md +++ b/charts/stable/bitwardenrs/README.md @@ -1,6 +1,6 @@ # bitwardenrs -![Version: 2.1.5](https://img.shields.io/badge/Version-2.1.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.18.0](https://img.shields.io/badge/AppVersion-1.18.0-informational?style=flat-square) +![Version: 2.1.8](https://img.shields.io/badge/Version-2.1.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.18.0](https://img.shields.io/badge/AppVersion-1.18.0-informational?style=flat-square) Unofficial Bitwarden compatible server written in Rust diff --git a/charts/stable/bitwardenrs/templates/ingress.yaml b/charts/stable/bitwardenrs/templates/ingress.yaml index a9dced91..d8f0566a 100644 --- a/charts/stable/bitwardenrs/templates/ingress.yaml +++ b/charts/stable/bitwardenrs/templates/ingress.yaml @@ -2,9 +2,10 @@ {{- $fullName := include "bitwardenrs.fullname" . -}} {{- $svcPort := .Values.service.port -}} {{- $websockets := .Values.bitwardenrs.websockets -}} -{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- $apiVersion := .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare "<1.14-0" $apiVersion -}} apiVersion: extensions/v1beta1 -{{- else if semverCompare "<1.19-0" .Capabilities.KubeVersion.GitVersion -}} +{{- else if semverCompare "<1.19-0" $apiVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: networking.k8s.io/v1 @@ -36,7 +37,7 @@ spec: paths: {{- range .paths }} - path: {{ . }} - {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }} + {{- if semverCompare ">=1.19-0" $apiVersion }} pathType: Prefix backend: service: @@ -51,7 +52,7 @@ spec: {{- if $websockets.enabled }} - path: {{ . | trimSuffix "/" }}/notifications/hub - {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }} + {{- if semverCompare ">=1.19-0" $apiVersion }} pathType: Prefix backend: service: @@ -63,7 +64,7 @@ spec: serviceName: {{ $fullName }} servicePort: {{ $websockets.port }} - path: {{ . | trimSuffix "/" }}/notifications/hub/negotiate - {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }} + {{- if semverCompare ">=1.19-0" $apiVersion }} pathType: Prefix backend: service: