From 28f159c641d8eb3467712de4eb9285e89d80280d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20Wanzenb=C3=B6ck?= Date: Tue, 2 Jul 2024 09:46:39 +0200 Subject: [PATCH] linstor-affinity-controller: upstream release 1.0.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Moritz Wanzenböck --- charts/linstor-affinity-controller/Chart.yaml | 4 ++-- charts/linstor-affinity-controller/README.md | 2 +- .../templates/_helpers.tpl | 13 ------------- .../templates/deployment.yaml | 1 - charts/linstor-affinity-controller/values.yaml | 2 +- 5 files changed, 4 insertions(+), 18 deletions(-) diff --git a/charts/linstor-affinity-controller/Chart.yaml b/charts/linstor-affinity-controller/Chart.yaml index a26c9ff..6ac0ff2 100644 --- a/charts/linstor-affinity-controller/Chart.yaml +++ b/charts/linstor-affinity-controller/Chart.yaml @@ -14,5 +14,5 @@ home: https://github.com/piraeusdatastore/helm-charts sources: - https://github.com/piraeusdatastore/linstor-affinity-controller -version: 1.3.1 -appVersion: "v1.0.1" +version: 1.3.2 +appVersion: "v1.0.2" diff --git a/charts/linstor-affinity-controller/README.md b/charts/linstor-affinity-controller/README.md index d3e872c..2771e21 100644 --- a/charts/linstor-affinity-controller/README.md +++ b/charts/linstor-affinity-controller/README.md @@ -46,7 +46,7 @@ The following options can be set on the chart: | `options.leaderElection` | Enable leader election to coordinate betwen multiple replicas. | `true` | | `options.reconcileRate` | Set the reconcile rate, i.e. how often the cluster state will be checked and updated | `15s` | | `options.resyncRate` | How often the controller will resync it's internal cache of Kubernetes resources | `15m` | -| `options.propertyNamespace` | Namespace used by LINSTOR CSI to search for node labels. | `Aux` (auto-detected when using Piraeus-Operator) | +| `options.propertyNamespace` | Namespace used by LINSTOR CSI to search for node labels. | `""` (auto-detected based on existing node labels on startup) | | `linstor.endpoint` | URL of the LINSTOR Controller API. | `""` (auto-detected when using Piraeus-Operator) | | `linstor.clientSecret` | TLS secret to use to authenticate with the LINSTOR API | `""` (auto-detected when using Piraeus-Operator) | | `image.repository` | Repository to pull the linstor-affinity-controller image from. | `quay.io/piraeusdatastore/linstor-affinity-controller` | diff --git a/charts/linstor-affinity-controller/templates/_helpers.tpl b/charts/linstor-affinity-controller/templates/_helpers.tpl index 695bd5d..4860163 100644 --- a/charts/linstor-affinity-controller/templates/_helpers.tpl +++ b/charts/linstor-affinity-controller/templates/_helpers.tpl @@ -61,19 +61,6 @@ Create the name of the service account to use {{- end }} {{- end }} -{{/* -Default argument for property namespaces, if not set -*/}} -{{- define "linstor-affinity-controller.defaultPropertyNamespace" -}} -{{- if not (hasKey .Values.options "propertyNamespace") }} -{{- if .Capabilities.APIVersions.Has "piraeus.io/v1/LinstorCluster" }} -- --property-namespace=Aux/topology -{{- else if or (.Capabilities.APIVersions.Has "piraeus.linbit.com/v1/LinstorController") (.Capabilities.APIVersions.Has "linstor.linbit.com/v1/LinstorController") }} -- --property-namespace=Aux -{{- end }} -{{- end }} -{{- end }} - {{/* Find the linstor client secret containing TLS certificates */}} diff --git a/charts/linstor-affinity-controller/templates/deployment.yaml b/charts/linstor-affinity-controller/templates/deployment.yaml index fd9b811..9592181 100644 --- a/charts/linstor-affinity-controller/templates/deployment.yaml +++ b/charts/linstor-affinity-controller/templates/deployment.yaml @@ -31,7 +31,6 @@ spec: - name: {{ .Chart.Name }} args: - /linstor-affinity-controller - {{- include "linstor-affinity-controller.defaultPropertyNamespace" . | nindent 12 }} {{- range $opt, $val := .Values.options }} - --{{ $opt | kebabcase }}={{ $val }} {{- end }} diff --git a/charts/linstor-affinity-controller/values.yaml b/charts/linstor-affinity-controller/values.yaml index 1f6f563..af6969a 100644 --- a/charts/linstor-affinity-controller/values.yaml +++ b/charts/linstor-affinity-controller/values.yaml @@ -17,7 +17,7 @@ fullnameOverride: "" options: v: 1 leaderElection: true - #propertyNamespace: Aux + #propertyNamespace: "" #reconcileRate: 15s #resyncRate: 15m