X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=deploy%2Fcluster%2Fvalues.yaml;h=2581a39eb7b6fe42b73a3552987dbead95c3af75;hb=8449ef6adc2f9a44780eac1e959b61d331e8c066;hp=5b0f8c4b51c4a53295a4f25a5db569b7ff1f8f88;hpb=7f5b95aaf15bca22ac6506ac5e1b5db0d0437222;p=icn.git

diff --git a/deploy/cluster/values.yaml b/deploy/cluster/values.yaml
index 5b0f8c4..2581a39 100644
--- a/deploy/cluster/values.yaml
+++ b/deploy/cluster/values.yaml
@@ -1,12 +1,10 @@
 # clusterName is the name of the cluster.
 clusterName: cluster-1
 
-# clusterLabels is a dictionary of labels.  The provider and site
-# labels are shown as examples only; additional labels may be
-# provided.
+# clusterLabels is a dictionary of labels.  The provider label is
+# shown as an example only; additional labels may be provided.
 clusterLabels:
   provider: icn
-  site: test-site
 
 # numControlPlaneMachines is the number of control plane nodes.
 numControlPlaneMachines: 1
@@ -44,14 +42,43 @@ controlPlanePrefix: 24
 #  matchLabels:
 #    machine: machine-2
 
-# networks can be used when DHCP is present and the network
-# configuration of each machine may be provided with a template
-# containing the names of the baremetal and provisioning interfaces.
-#networks:
+# ipPools are used to provide addresses to the networks value.
+#ipPools:
 #  baremetal:
-#    interface: ens6
-#  provisioning:
-#    interface: ens5
+#    # start is the beginning of the address range in the pool.
+#    start: 192.168.151.10
+#    # end is the end of the address range in the pool.
+#    end: 192.168.151.20
+#    # prefix is the network prefix of addresses in the range.
+#    prefix: 24
+#    # gateway is optional.
+#    #gateway: 192.168.151.1
+#    # preAllocations are optional.  Note that if the pool overlaps
+#    # with the gateway, then a pre-allocation is required.
+#    #preAllocations:
+#    #  controlPlane: 192.168.151.254
+
+# networks is used when the network configuration of each machine may
+# be provided with a template containing the names of the baremetal
+# and provisioning interfaces.
+#networkData:
+#  links:
+#    ethernets:
+#      baremetal:
+#        interface: ens6
+#      provisioning:
+#        interface: ens5
+#  networks:
+#    ipv4DHCP:
+#      provisioning: {}
+#    ipv4:
+#      baremetal:
+#        # link is optional and defaults to the network name.
+#        #link: baremetal
+#        fromIPPool: baremetal
+#  services:
+#    dns:
+#    - 8.8.8.8
 
 # userData is used to provide cloud-init data for machines in the
 # cluster.  See
@@ -75,17 +102,31 @@ flux:
   branch: master
   # path is the repository to the resources to be applied to the
   # cluster.
-  path: ./deploy/site/e2etest
+  path: ./deploy/site/cluster-icn
+  # decryptionSecret is the SOPS secret key used by Flux to decrypt
+  # any SOPS-encrypted data stored in the resources at path.
+  #decryptionSecret: |
+  #  -----BEGIN PGP PRIVATE KEY BLOCK-----
+  #  ...
 
 # containerRuntime may be containerd or docker.
 containerRuntime: containerd
 
-# podCidr is the POD CIDR.
-podCidr: 10.244.64.0/18
+# ipam may be ipv4, dualstack, or ipv6.  This configures IP address
+# allocation in the cluster to use IPv4 only, dual stack, or IPv6
+# only.
+ipam: ipv4
+
+# podCidr is the Pod CIDR.
+podCidrBlocks:
+- 10.244.64.0/18
+
+# serviceCidr is the Service CIDR.
+serviceCidrBlocks:
+- 10.244.0.0/18
 
-# cni is the cluster CNI.  The only currently supported CNI is
-# flannel.
-cni: flannel
+# cni is the cluster CNI.  Supported CNIs include calico and flannel.
+cni: calico
 
 # All the version info is captured in one block here.  Care must
 # be taken to ensure that the OS, Kubernetes, and CRI (containerd
@@ -106,3 +147,10 @@ kubeVersion: 1.21.6-00
 containerdVersion: 1.4.11-1
 # dockerVersion is the version of docker installed.
 dockerVersion: 5:20.10.10~3-0~ubuntu-focal
+# dockerRegistryMirrors are optional mirrors for docker.io, in priority order
+#dockerRegistryMirrors: ["https://myregistry.com:5000"]
+# preKubeadmCommands execute on the provisioned machine before the
+# container runtime or K8s is configured
+#preKubeadmCommands:
+#- apt-get update -y
+#- apt-get install -y unzip