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.

Sign up for GitHub

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

Jump to bottom

fixed broken tolerations field when using empty array #153

Merged
merged 1 commit into from
Aug 27, 2024
Merged

fixed broken tolerations field when using empty array #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion charts/ocean-kubernetes-controller/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: ocean-kubernetes-controller
description: A Helm chart for Ocean Kubernetes Controller
type: application
version: 0.1.53
version: 0.1.54
appVersion: 2.0.65
kubeVersion: ">=1.20.0-0"
maintainers:
Expand Down
2 changes: 1 addition & 1 deletion charts/ocean-kubernetes-controller/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# ocean-kubernetes-controller

![Version: 0.1.53](https://img.shields.io/badge/Version-0.1.53-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.65](https://img.shields.io/badge/AppVersion-2.0.65-informational?style=flat-square)
![Version: 0.1.54](https://img.shields.io/badge/Version-0.1.54-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.65](https://img.shields.io/badge/AppVersion-2.0.65-informational?style=flat-square)

A Helm chart for Ocean Kubernetes Controller.

Expand Down
13 changes: 1 addition & 12 deletions charts/ocean-kubernetes-controller/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,17 +199,6 @@ Controller affinity
{{- end }}
{{- end }}

{{/*
Controller tolerations
*/}}
{{- define "ocean-kubernetes-controller.tolerations" -}}
{{- if kindIs "invalid" .Values.tolerations -}}
{{- include "ocean-kubernetes-controller.defaultTolerations" . }}
{{- else }}
{{- .Values.tolerations | toYaml -}}
{{- end }}
{{- end }}

{{/*
Controller topology spread constraints
*/}}
Expand Down Expand Up @@ -352,4 +341,4 @@ or if another log shipping destination host is specified.
true
{{- end }}
{{- end }}
{{- end }}
{{- end }}
9 changes: 8 additions & 1 deletion charts/ocean-kubernetes-controller/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,14 @@ spec:
{{- end }}
affinity:
{{- include "ocean-kubernetes-controller.affinity" . | nindent 8 }}
{{- if kindIs "invalid" .Values.tolerations }}
tolerations:
{{- include "ocean-kubernetes-controller.tolerations" . | nindent 6 }}
{{- include "ocean-kubernetes-controller.defaultTolerations" . | nindent 6 }}
{{- else }}
{{- with .Values.tolerations }}
tolerations:
{{- . | toYaml | nindent 6 }}
{{- end }}
{{- end }}
topologySpreadConstraints:
{{- include "ocean-kubernetes-controller.topologySpreadConstraints" . | nindent 6 }}
Loading