Calico migration bug fixes

This commit is contained in:
Stefan Reimer 2020-07-07 13:50:08 +01:00
parent 5dd801bbda
commit 06c295b4f4
4 changed files with 9 additions and 8 deletions

View File

@ -2,7 +2,7 @@ apiVersion: v2
name: kubezero-calico
description: KubeZero Umbrella Chart for Calico
type: application
version: 0.1.1
version: 0.1.3
home: https://kubezero.com
icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
keywords:

View File

@ -2,7 +2,7 @@ kubezero-calico
===============
KubeZero Umbrella Chart for Calico
Current chart version is `0.1.0`
Current chart version is `0.1.3`
Source code can be found [here](https://kubezero.com)

View File

@ -1,6 +1,6 @@
# {{ .Values.calico.network }}
{{- if .Values.calico.enabled }}
{{- if .Values.calico.network }}
{{- if .Values.calico.values.network }}
{{ template "kubezero-app.app" dict "root" . "name" "calico" "type" "helm" "retain" true }}
{{- else }}
{{ template "kubezero-app.app" dict "root" . "name" "calico" "type" "kustomize" "retain" true }}

View File

@ -5,11 +5,12 @@ kubezero:
{{- end }}
calico:
enabled: {{ .Values.calico.enabled }}
{{- if .Values.calico.network }}
network: {{ .Values.calico.network }}
{{- end }}
migration: {{ .Values.calico.migration }}
prometheus: {{ .Values.prometheus.enabled }}
values:
migration: {{ .Values.calico.migration }}
prometheus: {{ .Values.prometheus.enabled }}
{{- if .Values.calico.network }}
network: {{ .Values.calico.network }}
{{- end }}
cert-manager:
enabled: {{ index .Values "cert-manager" "enabled" }}
values: