Skip to content

Commit 4a0657f

Browse files
Merge pull request ovn-kubernetes#5003 from flavio-fernandes/fix-doc_release-1.0
[release-1.0] Fix doc: Replace ovn-org with ovn-kubernetes to reflect repo move
2 parents 7bacdd5 + a7a9d82 commit 4a0657f

5 files changed

Lines changed: 20 additions & 20 deletions

File tree

contrib/kind-helm.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ set_default_params() {
2424
export KIND_REMOVE_TAINT=${KIND_REMOVE_TAINT:-true}
2525
export KIND_NUM_WORKER=${KIND_NUM_WORKER:-2}
2626
export KIND_CLUSTER_NAME=${KIND_CLUSTER_NAME:-ovn}
27-
export OVN_IMAGE=${OVN_IMAGE:-'ghcr.io/ovn-org/ovn-kubernetes/ovn-kube-ubuntu:helm'}
27+
export OVN_IMAGE=${OVN_IMAGE:-'ghcr.io/ovn-kubernetes/ovn-kubernetes/ovn-kube-ubuntu:helm'}
2828

2929
# Setup KUBECONFIG patch based on cluster-name
3030
export KUBECONFIG=${KUBECONFIG:-${HOME}/${KIND_CLUSTER_NAME}.conf}

docs/developer-guide/image-build.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@ This file covers the container images available for OVN-Kubernetes and how to bu
44

55
## Images / Packages
66

7-
There are Ubuntu and Fedora-based images available in [GitHub's Registry](https://github.com/orgs/ovn-org/packages?repo_name=ovn-kubernetes). They are automatically generated upon merges via [a workflow](https://github.com/ovn-org/ovn-kubernetes/blob/9f1f3f2866fc566ffbe582ae9adf77d60d838484/.github/workflows/docker.yml#L5).
7+
There are Ubuntu and Fedora-based images available in [GitHub's Registry](https://github.com/orgs/ovn-kubernetes/packages?repo_name=ovn-kubernetes). They are automatically generated upon merges via [a workflow](https://github.com/ovn-kubernetes/ovn-kubernetes/blob/master/.github/workflows/docker.yml).
88
Prior to release-1.0, they were called ovn-kube-f (for the Fedora-based image) and ovnkube-u (for the Ubuntu-based image). From release 1.0 and beyond, these have been renamed to ovn-kube-fedora and ovn-kube-ubuntu, respectively.
99

1010
Therefore, use the following images and tags to obtain these images:
1111

12-
- ghcr.io/ovn-org/ovn-kubernetes/ovn-kube-fedora:master
13-
- ghcr.io/ovn-org/ovn-kubernetes/ovn-kube-fedora:release-1.0
12+
- ghcr.io/ovn-kubernetes/ovn-kubernetes/ovn-kube-fedora:master
13+
- ghcr.io/ovn-kubernetes/ovn-kubernetes/ovn-kube-fedora:release-1.0
1414

15-
- ghcr.io/ovn-org/ovn-kubernetes/ovn-kube-ubuntu:master
16-
- ghcr.io/ovn-org/ovn-kubernetes/ovn-kube-ubuntu:release-1.0
15+
- ghcr.io/ovn-kubernetes/ovn-kubernetes/ovn-kube-ubuntu:master
16+
- ghcr.io/ovn-kubernetes/ovn-kubernetes/ovn-kube-ubuntu:release-1.0
1717

1818
## Building Images
1919

20-
To build images locally, use the following [Makefile](https://github.com/ovn-org/ovn-kubernetes/blob/master/dist/images/Makefile) and their respective Dockerfiles from the [dist/images](https://github.com/ovn-org/ovn-kubernetes/tree/master/dist/images) folder in this repository.
20+
To build images locally, use the following [Makefile](https://github.com/ovn-kubernetes/ovn-kubernetes/blob/master/dist/images/Makefile) and their respective Dockerfiles from the [dist/images](https://github.com/ovn-kubernetes/ovn-kubernetes/tree/master/dist/images) folder in this repository.
2121

2222
```bash
2323
$ cd dist/images
@@ -26,5 +26,5 @@ $ make ubuntu
2626
```
2727

2828
The build will create an image called ovn-kube-fedora:latest or ovn-kube-ubuntu:latest, which can be re-tagged.
29-
For example: `${OCI_BIN} tag ovn-kube-fedora:latest ghcr.io/ovn-org/ovn-kubernetes/ovn-kube-fedora:master`
29+
For example: `${OCI_BIN} tag ovn-kube-fedora:latest ghcr.io/ovn-kubernetes/ovn-kubernetes/ovn-kube-fedora:master`
3030

docs/installation/launching-ovn-kubernetes-with-helm.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,14 @@ networking:
7070
```
7171
# cd dist/images
7272
# make ubuntu
73-
# docker tag ovn-kube-ubuntu:latest ghcr.io/ovn-org/ovn-kubernetes/ovn-kube-ubuntu:master
74-
# kind load docker-image ghcr.io/ovn-org/ovn-kubernetes/ovn-kube-ubuntu:master
73+
# docker tag ovn-kube-ubuntu:latest ghcr.io/ovn-kubernetes/ovn-kubernetes/ovn-kube-ubuntu:master
74+
# kind load docker-image ghcr.io/ovn-kubernetes/ovn-kubernetes/ovn-kube-ubuntu:master
7575
```
7676

7777
- Run `helm install` with propery `k8sAPIServer`, `ovnkube-identity.replicas`, image repo and tag
7878
```
7979
# cd helm/ovn-kubernetes
80-
# helm install ovn-kubernetes . -f values.yaml --set k8sAPIServer="https://$(kubectl get pods -n kube-system -l component=kube-apiserver -o jsonpath='{.items[0].status.hostIP}'):6443" --set ovnkube-identity.replicas=$(kubectl get node -l node-role.kubernetes.io/control-plane --no-headers | wc -l) --set global.image.repository=ghcr.io/ovn-org/ovn-kubernetes/ovn-kube-ubuntu --set global.image.tag=master
80+
# helm install ovn-kubernetes . -f values.yaml --set k8sAPIServer="https://$(kubectl get pods -n kube-system -l component=kube-apiserver -o jsonpath='{.items[0].status.hostIP}'):6443" --set ovnkube-identity.replicas=$(kubectl get node -l node-role.kubernetes.io/control-plane --no-headers | wc -l) --set global.image.repository=ghcr.io/ovn-kubernetes/ovn-kubernetes/ovn-kube-ubuntu --set global.image.tag=master
8181
```
8282

8383
## Notes:
@@ -389,7 +389,7 @@ true
389389
<td>global.image.repository</td>
390390
<td>string</td>
391391
<td><pre lang="json">
392-
"ghcr.io/ovn-org/ovn-kubernetes/ovn-kube-ubuntu"
392+
"ghcr.io/ovn-kubernetes/ovn-kubernetes/ovn-kube-ubuntu"
393393
</pre>
394394
</td>
395395
<td>Image repository for ovn-kubernetes components</td>

helm/ovn-kubernetes/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
## Source Code
1010

11-
* <https://github.com/ovn-org/ovn-kubernetes>
11+
* <https://github.com/ovn-kubernetes/ovn-kubernetes>
1212
* <https://github.com/ovn-org/ovn>
1313

1414
## Introduction
@@ -81,14 +81,14 @@ networking:
8181
```
8282
# cd dist/images
8383
# make ubuntu
84-
# docker tag ovn-kube-ubuntu:latest ghcr.io/ovn-org/ovn-kubernetes/ovn-kube-ubuntu:master
85-
# kind load docker-image ghcr.io/ovn-org/ovn-kubernetes/ovn-kube-ubuntu:master
84+
# docker tag ovn-kube-ubuntu:latest ghcr.io/ovn-kubernetes/ovn-kubernetes/ovn-kube-ubuntu:master
85+
# kind load docker-image ghcr.io/ovn-kubernetes/ovn-kubernetes/ovn-kube-ubuntu:master
8686
```
8787

8888
- Run `helm install` with propery `k8sAPIServer`, `ovnkube-identity.replicas`, image repo and tag
8989
```
9090
# cd helm/ovn-kubernetes
91-
# helm install ovn-kubernetes . -f values.yaml --set k8sAPIServer="https://$(kubectl get pods -n kube-system -l component=kube-apiserver -o jsonpath='{.items[0].status.hostIP}'):6443" --set ovnkube-identity.replicas=$(kubectl get node -l node-role.kubernetes.io/control-plane --no-headers | wc -l) --set global.image.repository=ghcr.io/ovn-org/ovn-kubernetes/ovn-kube-ubuntu --set global.image.tag=master
91+
# helm install ovn-kubernetes . -f values.yaml --set k8sAPIServer="https://$(kubectl get pods -n kube-system -l component=kube-apiserver -o jsonpath='{.items[0].status.hostIP}'):6443" --set ovnkube-identity.replicas=$(kubectl get node -l node-role.kubernetes.io/control-plane --no-headers | wc -l) --set global.image.repository=ghcr.io/ovn-kubernetes/ovn-kubernetes/ovn-kube-ubuntu --set global.image.tag=master
9292
```
9393

9494
## Notes:
@@ -422,7 +422,7 @@ true
422422
<td>global.image.repository</td>
423423
<td>string</td>
424424
<td><pre lang="json">
425-
"ghcr.io/ovn-org/ovn-kubernetes/ovn-kube-ubuntu"
425+
"ghcr.io/ovn-kubernetes/ovn-kubernetes/ovn-kube-ubuntu"
426426
</pre>
427427
</td>
428428
<td>Image repository for ovn-kubernetes components</td>

helm/ovn-kubernetes/README.md.gotmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,14 @@ networking:
7979
```
8080
# cd dist/images
8181
# make ubuntu
82-
# docker tag ovn-kube-ubuntu:latest ghcr.io/ovn-org/ovn-kubernetes/ovn-kube-ubuntu:master
83-
# kind load docker-image ghcr.io/ovn-org/ovn-kubernetes/ovn-kube-ubuntu:master
82+
# docker tag ovn-kube-ubuntu:latest ghcr.io/ovn-kubernetes/ovn-kubernetes/ovn-kube-ubuntu:master
83+
# kind load docker-image ghcr.io/ovn-kubernetes/ovn-kubernetes/ovn-kube-ubuntu:master
8484
```
8585

8686
- Run `helm install` with propery `k8sAPIServer`, `ovnkube-identity.replicas`, image repo and tag
8787
```
8888
# cd helm/ovn-kubernetes
89-
# helm install ovn-kubernetes . -f values.yaml --set k8sAPIServer="https://$(kubectl get pods -n kube-system -l component=kube-apiserver -o jsonpath='{.items[0].status.hostIP}'):6443" --set ovnkube-identity.replicas=$(kubectl get node -l node-role.kubernetes.io/control-plane --no-headers | wc -l) --set global.image.repository=ghcr.io/ovn-org/ovn-kubernetes/ovn-kube-ubuntu --set global.image.tag=master
89+
# helm install ovn-kubernetes . -f values.yaml --set k8sAPIServer="https://$(kubectl get pods -n kube-system -l component=kube-apiserver -o jsonpath='{.items[0].status.hostIP}'):6443" --set ovnkube-identity.replicas=$(kubectl get node -l node-role.kubernetes.io/control-plane --no-headers | wc -l) --set global.image.repository=ghcr.io/ovn-kubernetes/ovn-kubernetes/ovn-kube-ubuntu --set global.image.tag=master
9090
```
9191

9292
## Notes:

0 commit comments

Comments
 (0)