Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update ks-core helm chart from master #426

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/test/ks-core/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/test/ks-core/templates/extension-museum.yaml
Original file line number Diff line number Diff line change
@@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion src/test/ks-core/templates/kubesphere-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 2 additions & 0 deletions src/test/ks-core/templates/redis.yaml
Original file line number Diff line number Diff line change
@@ -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 }}
Expand Down Expand Up @@ -146,3 +147,4 @@ spec:
{{- end }}

{{- end }}
{{- end }}
2 changes: 1 addition & 1 deletion src/test/ks-core/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading