Merge pull request #162 from foundation-model-stack/doc

update documents
foundation-model-stack · Dec 5, 2023 · 0415fbc · 0415fbc
2 parents 4cc4e28 + 48f67e1
commit 0415fbc
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 15 deletions.
diff --git a/config/manifests/bases/multi-nic-cni-operator.clusterserviceversion.template b/config/manifests/bases/multi-nic-cni-operator.clusterserviceversion.template
@@ -131,4 +131,4 @@ spec:
   provider:
     name: Foundation Model Stack
   version: 0.0.0
-  replaces: multi-nic-cni-operator.v1.0.2
+  replaces: multi-nic-cni-operator.v1.2.1
diff --git a/document/docs/release/alpha.md b/document/docs/release/alpha.md
@@ -2,6 +2,38 @@
 
 ![](../img/alpha-release.png)
 
+## v1.2.2
+
+**Improvements:**
+
+* Multi-config IPAM (`multi-config`) 
+
+        ipam: |
+            { 
+            "type": "multi-config",
+            "ipam_type": "whereabouts",
+            "args": {
+                    "eth1": {
+                        "range": "192.168.0.0/18"
+                    },
+                    "eth2": {
+                        "range": "192.168.64.0/18"
+                    }
+                }
+            }
+        
+* Static IP support
+
+        annotations:
+                k8s.v1.cni.cncf.io/networks: |
+                    [{
+                            "name": "multinic-network",
+                            "cni-args": {
+                            "masters": ["eth1", "eth2"]
+                            },
+                            "ips": [ "192.168.0.1/18", "192.168.64.1/18" ]
+                    }]
+
 ## v1.2.1
 
 **Improvements:**
@@ -35,15 +67,16 @@
             metadata:
                 name: node-1
                 labels:
-                  unmanaged: true
-            hostName: node-1
-            interfaces:
-            -   hostIP: ""
-                interfaceName: eth1
-                netAddress: 192.168.0.0/24
-            -   hostIP: ""
-                interfaceName: eth2
-                netAddress: 192.168.1.0/24
+                  multi-nic-unmanaged: "true"
+            spec:
+                hostName: node-1
+                interfaces:
+                -   hostIP: ""
+                    interfaceName: eth1
+                    netAddress: 192.168.0.0/24
+                -   hostIP: ""
+                    interfaceName: eth2
+                    netAddress: 192.168.1.0/24
                 
 * Multi-gateway route configuration support
 

diff --git a/document/docs/release/index.md b/document/docs/release/index.md
@@ -1,8 +1,8 @@
 # Release
 
-Channel|Version|IPVLAN L2/L3|AWS IPVLAN|Mellanox Host Device|IP-less (zero host block)
----|---|---|---|---|---
-[stable (default)](./stable.md)|v1.0.5|&check;|X|X|X
-[beta](./beta.md)|v1.2.0|&check;|&check;|&check;|X
-[alpha](./alpha.md)|v1.2.1|&check;|&check;|&check;|&check;
+Channel|Version|IPVLAN L2/L3|AWS IPVLAN|Mellanox Host Device|IP-less (zero host block)|Multi-config IPAM
+---|---|---|---|---|---|---
+[stable (default)](./stable.md)|v1.0.5|&check;|X|X|X|X
+[beta](./beta.md)|v1.2.0|&check;|&check;|&check;|X|X
+[alpha](./alpha.md)|v1.2.2|&check;|&check;|&check;|&check;|&check;