Merge pull request #25 from hhyasdf/doc-update

chore: update deploy yamls

docs/crd.md

@@ -15,7 +15,7 @@ Network is extremely important if you need an underlay container network, as tak
 is always needed. For Rama, which only provides a vlan type container network for now, a Network usually refers to a
 series of Nodes with the same ASW or TOR.
 
-Here is a yaml of a Network CR for underlay container network :
+Here is a yaml of a Network CR for underlay container network:
 
 ```yaml
 apiVersion: networking.alibaba.com/v1
@@ -107,11 +107,11 @@ spec:
 
     excludeIPs: "192.168.56.103","192.168.56.104"     # Optional. The exclued ips for unusable. 
   config:
-    autoNatOutgoing: false                            # Optional, Overlay Network only. 
+    autoNatOutgoing: false                            # Optional, Overlay Network only, Default is true. 
                                                       # If pods in this sunbet can access to addresses outside 
                                                       # the cluster by NAT.
 
-    private: true                                     # Optional. 
+    private: true                                     # Optional. Default is false.
                                                       # If addresses of the subnet can be allocated to pod
                                                       # without special assignment.
 ```

yamls/overlay-sample.yaml

@@ -0,0 +1,21 @@
+---
+apiVersion: networking.alibaba.com/v1
+kind: Network
+metadata:
+  name: overlay-network
+spec:
+  netID: 4
+  type: Overlay
+  switchID: "virtual-switch"
+
+---
+apiVersion: networking.alibaba.com/v1
+kind: Subnet
+metadata:
+  name: overlay-subnet1
+spec:
+  network: overlay-network
+  range:
+    version: "4"
+    cidr: "10.14.100.0/24"
+    gateway: "10.14.100.1"

yamls/rama-components.yaml

@@ -25,7 +25,7 @@ spec:
       hostPID: true
       initContainers:
         - name: install-cni
-          image: "REGISTRY/rama-daemon:dev"
+          image: "ramanetworking/rama:latest"
           imagePullPolicy: IfNotPresent
           command: ["/rama/install-cni.sh"]
           securityContext:
@@ -38,13 +38,13 @@ spec:
               name: cni-bin
       containers:
         - name: cni-daemon
-          image: "REGISTRY/rama-daemon:dev"
+          image: "ramanetworking/rama:latest"
           imagePullPolicy: IfNotPresent
           command:
             - sh
             - /rama/start-daemon.sh
-          args:
-            - --prefer-interfaces=$NET_INTERFACE1,$NET_INTERFACE2
+#          args:
+#            - --prefer-vlan-interfaces=enp0s8
           securityContext:
             runAsUser: 0
             privileged: true
@@ -155,10 +155,13 @@ spec:
       hostNetwork: true
       containers:
         - name: rama-manager
-          image: "REGISTRY/rama-manager:dev"
+          image: "ramanetworking/rama:latest"
           imagePullPolicy: IfNotPresent
           command:
             - /rama/rama-manager
+          env:
+            - name: DEFAULT_NETWORK_TYPE
+              value: Overlay
       nodeSelector:
         node-role.kubernetes.io/master: ""
 
@@ -182,7 +185,7 @@ spec:
     metadata:
       labels:
         app: rama-webhook
-        webhook.rama.io/ignore: true
+        webhook.rama.io/ignore: "true"
     spec:
       tolerations:
         - operator: Exists
@@ -194,7 +197,7 @@ spec:
       hostNetwork: true
       containers:
         - name: rama-webhook
-          image: "REGISTRY/rama-webhook:dev"
+          image: "ramanetworking/rama:latest"
           imagePullPolicy: IfNotPresent
           command:
             - /rama/rama-webhook

yamls/underlay-sample.yaml

@@ -0,0 +1,24 @@
+---
+apiVersion: networking.alibaba.com/v1
+kind: Network
+metadata:
+  name: underlay-network1
+spec:
+  netID: 0
+  type: Underlay
+  switchID: "physical-switch1"
+  nodeSelector:
+    network: "network1"
+
+---
+apiVersion: networking.alibaba.com/v1
+kind: Subnet
+metadata:
+  name: underlay-subnet1
+spec:
+  network: underlay-network1
+  netID: 0
+  range:
+    version: "4"
+    cidr: "192.168.56.0/24"
+    gateway: "192.168.56.1"