Make IPPool optional to fix bootstrap issues, doc fixes

charts/kubezero-calico/Chart.yaml

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

charts/kubezero-calico/README.md

@@ -2,7 +2,7 @@ kubezero-calico
 ===============
 KubeZero Umbrella Chart for Calico
 
-Current chart version is `0.1.5`
+Current chart version is `0.1.6`
 
 Source code can be found [here](https://kubezero.com)
 
@@ -34,6 +34,17 @@ The setup is based on the upstream calico-vxlan config from
 
 - Set FELIX log level to warning
 
+## Chart Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| customIPPool | object | `{}` |  |
+| installCRDs | bool | `false` |  |
+| loglevel | string | `"Warning"` |  |
+| migration | bool | `false` |  |
+| mtu | int | `8941` |  |
+| network | string | `"vxlan"` |  |
+| prometheus | bool | `false` |  |
 
 ## Resources
 

charts/kubezero-calico/README.md.gotmpl

@@ -29,6 +29,7 @@ The setup is based on the upstream calico-vxlan config from
 
 - Set FELIX log level to warning
 
+{{ template "chart.valuesSection" . }}
 
 ## Resources
 

charts/kubezero-calico/templates/ippool.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.customIPPool }}
 apiVersion: crd.projectcalico.org/v1
 kind: IPPool
 metadata:
@@ -9,3 +10,4 @@ spec:
   natOutgoing: true
   nodeSelector: all()
   vxlanMode: Always
+{{- end }}

charts/kubezero-calico/values.yaml

@@ -1,7 +1,5 @@
 installCRDs: false
 
-migration: false
-
 network: vxlan
 
 mtu: 8941
@@ -9,3 +7,9 @@ mtu: 8941
 loglevel: Warning
 
 prometheus: false
+
+customIPPool: {}
+
+# Soon to be removed
+migration: false
+

charts/kubezero-istio/README.md

@@ -20,6 +20,7 @@ Source code can be found [here](https://kubezero.com)
 - mapped istio-operator to run on the controller nodes only
 
 
+
 ## Resources
 
 - https://istio.io/latest/docs/setup/install/standalone-operator/

charts/kubezero-istio/README.md.gotmpl

@@ -13,6 +13,7 @@ Installs Istio Operator and KubeZero Istio profile
 ## KubeZero default configuration
 - mapped istio-operator to run on the controller nodes only
 
+{{ template "chart.valuesSection" . }}
 
 ## Resources