Skip to content

Commit 4c9b099

Browse files
authored
Merge pull request #5333 from GeorgianaTurcsanyi/update_kind_deploy_docs
update documentation on deploying OVN K8s with KIND
2 parents 7f18fb5 + 10f14ed commit 4c9b099

File tree

2 files changed

+14
-11
lines changed

2 files changed

+14
-11
lines changed

contrib/kind.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -459,8 +459,8 @@ print_params() {
459459

460460
install_jinjanator_renderer() {
461461
# ensure jinjanator renderer installed
462-
pip install wheel --user
463-
pip freeze | grep jinjanator || pip install jinjanator[yaml] --user
462+
pipx install jinjanator[yaml]
463+
pipx ensurepath --force >/dev/null
464464
export PATH=~/.local/bin:$PATH
465465
}
466466

@@ -499,11 +499,11 @@ check_dependencies() {
499499
fi
500500

501501
if ! command_exists jinjanate ; then
502-
if ! command_exists pip ; then
503-
echo "Dependency not met: 'jinjanator' not installed and cannot install with 'pip'"
502+
if ! command_exists pipx ; then
503+
echo "Dependency not met: 'jinjanator' not installed and cannot install with 'pipx'"
504504
exit 1
505505
fi
506-
echo "'jinjanate' not found, installing with 'pip'"
506+
echo "'jinjanate' not found, installing with 'pipx'"
507507
install_jinjanator_renderer
508508
fi
509509

docs/installation/launching-ovn-kubernetes-on-kind.md

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,19 @@ KIND (Kubernetes in Docker) deployment of OVN kubernetes is a fast and easy mean
1414
sudo firewall-cmd --permanent --add-port=11337/tcp; sudo firewall-cmd --reload
1515
```
1616
- [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/)
17-
- Python and pip
17+
- Python 3 and [pipx](https://pipx.pypa.io/stable/installation/)
1818
- jq
1919
- openssl
2020
- openvswitch
21-
22-
**NOTE :** In certain operating systems such as CentOS 8.x, pip2 and pip3 binaries are installed instead of pip. In such situations create a softlink for "pip" that points to "pip2".
21+
- Go 1.23.0 or above
22+
- For podman users: skopeo
2323
2424
For OVN kubernetes KIND deployment, use the `kind.sh` script.
2525
2626
First Download and build the OVN-Kubernetes repo:
2727
28-
```
29-
git clone github.com/ovn-org/ovn-kubernetes;
28+
```shell
29+
git clone https://github.com/ovn-kubernetes/ovn-kubernetes.git
3030
cd ovn-kubernetes
3131
```
3232
The `kind.sh` script builds OVN-Kubernetes into a container image. To verify
@@ -79,13 +79,16 @@ To deploy KIND however, you need to start it as root and then copy root's kube c
7979
```
8080
$ pushd contrib
8181
$ sudo ./kind.sh -ep podman
82+
$ mkdir -p ~/.kube
8283
$ sudo cp /root/ovn.conf ~/.kube/kind-config
8384
$ sudo chown $(id -u):$(id -g) ~/.kube/kind-config
8485
$ export KUBECONFIG=~/.kube/kind-config
8586
$ popd
8687
```
8788

88-
This will launch a KIND deployment. By default the cluster is named `ovn`.
89+
**NOTE:** If you installed go via the official path on Linux and have encountered the "go: command not found" issue, you can preserve your environment when doing sudo: `sudo --preserve-env=PATH ./kind.sh -ep podman`
90+
91+
This will launch a KIND deployment. By default, the cluster is named `ovn`.
8992

9093
```
9194
$ kubectl get nodes

0 commit comments

Comments
 (0)