ZeroDownTime/KubeZero
3
0
Fork 0
Code Issues 1 Pull Requests 26 Packages Projects Releases Wiki Activity

Calico migration bug fixes

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/kubezero-calico/Chart.yaml
View File

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

2
charts/kubezero-calico/README.md
View File

@ -2,7 +2,7 @@ kubezero-calico
=============== ===============
KubeZero Umbrella Chart for 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) Source code can be found [here](https://kubezero.com)

2
charts/kubezero/templates/calico.yaml
View File

@ -1,6 +1,6 @@
# {{ .Values.calico.network }} # {{ .Values.calico.network }}
{{- if .Values.calico.enabled }} {{- 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 }} {{ template "kubezero-app.app" dict "root" . "name" "calico" "type" "helm" "retain" true }}
{{- else }} {{- else }}
{{ template "kubezero-app.app" dict "root" . "name" "calico" "type" "kustomize" "retain" true }} {{ template "kubezero-app.app" dict "root" . "name" "calico" "type" "kustomize" "retain" true }}

11
deploy/templates/values.yaml
View File

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