Skip to content

Commit

Permalink
update version to v1.7 in docs
Browse files Browse the repository at this point in the history
  • Loading branch information
hongzhen-ma committed Jun 3, 2021
1 parent eb54dc0 commit 3e259ae
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion dist/images/generate-ssl-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set -euo pipefail
exist=$(kubectl get secret -n kube-system kube-ovn-tls --ignore-not-found)
if [[ $exist == "" ]];then
docker run --rm -v $PWD:/etc/ovn kubeovn/kube-ovn:v1.6.0 bash generate-ssl.sh
docker run --rm -v $PWD:/etc/ovn kubeovn/kube-ovn:v1.7.0 bash generate-ssl.sh
kubectl create secret generic -n kube-system kube-ovn-tls --from-file=cacert=cacert.pem --from-file=cert=ovn-cert.pem --from-file=key=ovn-privkey.pem
rm -rf cacert.pem ovn-cert.pem ovn-privkey.pem ovn-req.pem
fi
2 changes: 1 addition & 1 deletion dist/images/ovn-ic-db-docker.sh
Original file line number Diff line number Diff line change
@@ -1 +1 @@
docker run -d --network=host -v /etc/ovn/:/etc/ovn -v /var/run/ovn:/var/run/ovn -v /var/log/ovn:/var/log/ovn kubeovn/kube-ovn:v1.6.0 bash start-ic-db.sh
docker run -d --network=host -v /etc/ovn/:/etc/ovn -v /var/run/ovn:/var/run/ovn -v /var/log/ovn:/var/log/ovn kubeovn/kube-ovn:v1.7.0 bash start-ic-db.sh
2 changes: 1 addition & 1 deletion docs/dpdk.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ dpdk-hugepage-dir=/dev/hugepages
## To Install

1. Download the installation script:
`wget https://raw.githubusercontent.com/alauda/kube-ovn/release-1.6/dist/images/install.sh`
`wget https://raw.githubusercontent.com/alauda/kube-ovn/release-1.7/dist/images/install.sh`

2. Use vim to edit the script variables to meet your requirement
```bash
Expand Down
14 changes: 7 additions & 7 deletions docs/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ Kube-OVN provides a one script install to easily install a high-available, produ
1. Download the stable release installer scripts

For Kubernetes version>=1.16
`wget https://raw.githubusercontent.com/alauda/kube-ovn/release-1.6/dist/images/install.sh`
`wget https://raw.githubusercontent.com/alauda/kube-ovn/release-1.7/dist/images/install.sh`

For Kubernetes version<1.16
`wget https://raw.githubusercontent.com/alauda/kube-ovn/release-1.6/dist/images/install-pre-1.16.sh`
`wget https://raw.githubusercontent.com/alauda/kube-ovn/release-1.7/dist/images/install-pre-1.16.sh`

If you want to try the latest developing Kube-OVN, try the script below
`wget https://raw.githubusercontent.com/alauda/kube-ovn/master/dist/images/install.sh`
Expand Down Expand Up @@ -63,24 +63,24 @@ For Kubernetes version before 1.17 please use the following command to add the n
`kubectl label node <Node on which to deploy OVN DB> kube-ovn/role=master`
2. Install Kube-OVN related CRDs

`kubectl apply -f https://raw.githubusercontent.com/alauda/kube-ovn/release-1.6/yamls/crd.yaml`
`kubectl apply -f https://raw.githubusercontent.com/alauda/kube-ovn/release-1.7/yamls/crd.yaml`
3. Get ovn.yaml and replace `$addresses` in the file with IP address of the node that will host the OVN DB and the OVN Control Plane:

`curl -O https://raw.githubusercontent.com/alauda/kube-ovn/release-1.6/yamls/ovn.yaml`
`curl -O https://raw.githubusercontent.com/alauda/kube-ovn/release-1.7/yamls/ovn.yaml`

`sed -i 's/\$addresses/<Node IP>/g' ovn.yml`
4. Install native OVS and OVN components:

`kubectl apply -f ovn.yaml`
5. Install the Kube-OVN Controller and CNI plugins:

`kubectl apply -f https://raw.githubusercontent.com/alauda/kube-ovn/release-1.6/yamls/kube-ovn.yaml`
`kubectl apply -f https://raw.githubusercontent.com/alauda/kube-ovn/release-1.7/yamls/kube-ovn.yaml`

That's all! You can now create some pods and test connectivity.

For high-available ovn db, see [high available](high-available.md)

If you want to enable IPv6 on default subnet and node subnet, please apply https://raw.githubusercontent.com/alauda/kube-ovn/release-1.6/yamls/kube-ovn-ipv6.yaml on Step 3.
If you want to enable IPv6 on default subnet and node subnet, please apply https://raw.githubusercontent.com/alauda/kube-ovn/release-1.7/yamls/kube-ovn-ipv6.yaml on Step 3.

## More Configuration

Expand Down Expand Up @@ -192,7 +192,7 @@ kubectl create -n kube-system configmap admin-conf --from-file=admin.conf
1. Remove Kubernetes resources:
```bash
wget https://raw.githubusercontent.com/alauda/kube-ovn/release-1.6/dist/images/cleanup.sh
wget https://raw.githubusercontent.com/alauda/kube-ovn/release-1.7/dist/images/cleanup.sh
bash cleanup.sh
```
Expand Down
2 changes: 1 addition & 1 deletion docs/ipv6.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

Through Kube-OVN does support both protocol subnets coexist in a cluster, Kubernetes control plan now only support one protocol. So you will lost some ability like probe and service discovery if you use a protocol other than the kubernetes control plan. We recommend you use only one same ip protocol that same with kubernetes control plan.

To enable IPv6 support you need to modify the installation yaml to specify the default subnet and node subnet cidrBlock and gateway with a ipv6 format. You can apply this [v6 version yaml](https://raw.githubusercontent.com/alauda/kube-ovn/release-1.6/yamls/kube-ovn-ipv6.yaml) at [installation step 3](install.md#to-install) for a quick start.
To enable IPv6 support you need to modify the installation yaml to specify the default subnet and node subnet cidrBlock and gateway with a ipv6 format. You can apply this [v6 version yaml](https://raw.githubusercontent.com/alauda/kube-ovn/release-1.7/yamls/kube-ovn-ipv6.yaml) at [installation step 3](install.md#to-install) for a quick start.
2 changes: 1 addition & 1 deletion docs/kubectl-plugin.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ To enable kubectl plugin, kubectl version of 1.12 or later is recommended. You c

1. Get the `kubectl-ko` file
```bash
wget https://raw.githubusercontent.com/alauda/kube-ovn/release-1.6/dist/images/kubectl-ko
wget https://raw.githubusercontent.com/alauda/kube-ovn/release-1.7/dist/images/kubectl-ko
```

2. Move the file to one of $PATH directories
Expand Down
4 changes: 2 additions & 2 deletions docs/vlan.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ You can have a subnet A using Geneve encapsulation and subnet B using Vlan tag.

1. Get the installation script

`wget https://raw.githubusercontent.com/alauda/kube-ovn/release-1.6/dist/images/install.sh`
`wget https://raw.githubusercontent.com/alauda/kube-ovn/release-1.7/dist/images/install.sh`

2. Edit the `install.sh`, modify `NETWORK_TYPE` to `vlan`, `VLAN_INTERFACE_NAME` to related host interface.
> NOTE: if your nodes have different nic name for vlan device you could use regex for VLAN_INTERFACE_NAME or label those nodes with
Expand Down Expand Up @@ -81,7 +81,7 @@ kubectl run samplepod --image=nginx --namespace=product

1. Get the installation script

`wget https://raw.githubusercontent.com/alauda/kube-ovn/release-1.6/dist/images/install.sh`
`wget https://raw.githubusercontent.com/alauda/kube-ovn/release-1.7/dist/images/install.sh`

2. Edit the `install.sh`, modify `NETWORK_TYPE` to `hybrid`, `VLAN_INTERFACE_NAME` to related host interface.
> NOTE: if your nodes have different nic name for vlan device you could use regex for VLAN_INTERFACE_NAME or label those nodes with
Expand Down

0 comments on commit 3e259ae

Please sign in to comment.