From 25821c5f0749a9908a5cb84fb1f4465c4bc20fc9 Mon Sep 17 00:00:00 2001 From: ks-ci-bot Date: Fri, 1 Nov 2024 04:27:26 +0000 Subject: [PATCH] update ks-core helm chart --- src/test/ks-core/Chart.yaml | 4 ++-- src/test/ks-core/templates/extension-museum.yaml | 2 +- src/test/ks-core/templates/kubesphere-config.yaml | 2 +- src/test/ks-core/templates/redis.yaml | 2 ++ src/test/ks-core/values.yaml | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/test/ks-core/Chart.yaml b/src/test/ks-core/Chart.yaml index 2eb0efbb..3ef8f06c 100644 --- a/src/test/ks-core/Chart.yaml +++ b/src/test/ks-core/Chart.yaml @@ -7,12 +7,12 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.1.3 +version: 1.1.2 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: "v4.1.2" +appVersion: "v4.1.1" dependencies: - name: redis-ha diff --git a/src/test/ks-core/templates/extension-museum.yaml b/src/test/ks-core/templates/extension-museum.yaml index 82aca08c..b6c2a5c6 100644 --- a/src/test/ks-core/templates/extension-museum.yaml +++ b/src/test/ks-core/templates/extension-museum.yaml @@ -1,4 +1,4 @@ -{{- if .Values.ksExtensionRepository.enabled }} +{{- if and (eq (include "role" .) "host") .Values.ksExtensionRepository.enabled }} {{- $ca := genCA "self-signed-ca" 3650 }} {{- $cn := printf "%s-extensions-museum" .Release.Name }} diff --git a/src/test/ks-core/templates/kubesphere-config.yaml b/src/test/ks-core/templates/kubesphere-config.yaml index e29deace..6342daac 100644 --- a/src/test/ks-core/templates/kubesphere-config.yaml +++ b/src/test/ks-core/templates/kubesphere-config.yaml @@ -73,7 +73,7 @@ data: telemetry: ksCloudURL: "https://kubesphere.cloud" {{- end }} - {{- if .Values.ha.enabled -}} + {{- if and (eq (include "role" .) "host") .Values.ha.enabled -}} {{- if .Values.ha.cache }} cache: {{- toYaml .Values.ha.cache | nindent 6}} {{- else }} diff --git a/src/test/ks-core/templates/redis.yaml b/src/test/ks-core/templates/redis.yaml index a77753aa..942ed4f5 100644 --- a/src/test/ks-core/templates/redis.yaml +++ b/src/test/ks-core/templates/redis.yaml @@ -1,3 +1,4 @@ +{{- if eq (include "role" .) "host" }} {{- if and .Values.ha.enabled (not .Values.ha.cache) }} {{- if lookup "v1" "Secret" "kubesphere-system" "redis-secret" }} {{- lookup "v1" "Secret" "kubesphere-system" "redis-secret" | toYaml }} @@ -146,3 +147,4 @@ spec: {{- end }} {{- end }} +{{- end }} \ No newline at end of file diff --git a/src/test/ks-core/values.yaml b/src/test/ks-core/values.yaml index b23e935b..560e6dde 100644 --- a/src/test/ks-core/values.yaml +++ b/src/test/ks-core/values.yaml @@ -2,7 +2,7 @@ ## @param global.tag Global Docker image tag global: imageRegistry: docker.io - tag: v4.1.2 + tag: v4.1.1 imagePullSecrets: [] ## @param nameOverride String to partially override common.names.fullname