Skip to content

Commit

Permalink
fix: use new gradiant repo links (#546)
Browse files Browse the repository at this point in the history
  • Loading branch information
pirog-spb authored May 1, 2024
1 parent 5857dc1 commit 0f704de
Show file tree
Hide file tree
Showing 16 changed files with 54 additions and 113 deletions.
19 changes: 10 additions & 9 deletions docs/deployments/open5gs-with-bgp-and-slices-UE2pdu/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,20 @@ HELM_VALUES_DIR?=./values

HELM_ARGS?=--timeout 30s --create-namespace
HELM_ACTION?=upgrade --install
HELM_REGISTRY?=oci://registry-1.docker.io/gradiant

open5gs:
helm $(HELM_ACTION) \
open5gs openverso/open5gs \
--version 2.0.12 \
open5gs $(HELM_REGISTRY)/open5gs \
--version 2.1.0 \
--values $(HELM_VALUES_DIR)/main.yaml \
-n $(NAMESPACE) \
$(HELM_ARGS)

smf:
helm $(HELM_ACTION) \
open5gs-smf openverso/open5gs-smf \
--version 2.0.10 \
open5gs-smf $(HELM_REGISTRY)/open5gs-smf \
--version 2.1.0 \
--values $(HELM_VALUES_DIR)/smf.yaml \
-n $(NAMESPACE) \
$(HELM_ARGS)
Expand All @@ -26,8 +27,8 @@ smf:

smf2:
helm $(HELM_ACTION) \
open5gs-smf2 openverso/open5gs-smf \
--version 2.0.10 \
open5gs-smf2 $(HELM_REGISTRY)/open5gs-smf \
--version 2.1.0 \
--values $(HELM_VALUES_DIR)/smf.yaml \
-n $(NAMESPACE) \
$(HELM_ARGS)
Expand Down Expand Up @@ -59,23 +60,23 @@ upf2:

gnb:
helm $(HELM_ACTION) \
gnb openverso/ueransim-gnb \
gnb $(HELM_REGISTRY)/ueransim-gnb \
--version 0.2.5 \
--values $(HELM_VALUES_DIR)/gnb.yaml \
-n $(NAMESPACE) \
$(HELM_ARGS)

ue1:
helm $(HELM_ACTION) \
ueransim1 openverso/ueransim-ues \
ueransim1 $(HELM_REGISTRY)/ueransim-ues \
--version 0.1.1 \
--values $(HELM_VALUES_DIR)/ue.yaml \
-n $(NAMESPACE) \
$(HELM_ARGS)

ue2:
helm $(HELM_ACTION) \
ueransim2 openverso/ueransim-ues \
ueransim2 $(HELM_REGISTRY)/ueransim-ues \
--version 0.1.1 \
--values $(HELM_VALUES_DIR)/ue2.yaml \
-n $(NAMESPACE) \
Expand Down
11 changes: 2 additions & 9 deletions docs/deployments/open5gs-with-bgp-and-slices-UE2pdu/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,6 @@

change `calico_backend` parameter to `bird` in configmap with name `calico-config` and then restart all pods with name `calico-node-*`

- configure helm repos

```
helm repo add openverso https://gradiant.github.io/openverso-charts/
helm repo update
```

## Deployment steps

1. install eupf for slice 1
Expand Down Expand Up @@ -59,7 +52,7 @@

1. exec shell in UE1 pod

`kubectl -n open5gslices2 exec -ti deployment/ueransim1-ueransim-ues-ues -- /bin/bash`
`kubectl -n open5gslices2 exec -ti deployment/ueransim1-ueransim-ues -- /bin/bash`

2. run ICMP test

Expand All @@ -68,7 +61,7 @@
3. exec shell in UE2 pod

```
kubectl -n open5gslices2 exec -ti deployment/ueransim2-ueransim-ues-ues -- /bin/bash
kubectl -n open5gslices2 exec -ti deployment/ueransim2-ueransim-ues -- /bin/bash
ip a
```
See there is two interfaces `uesimtun` with ip addresses from different subnets, like this:
Expand Down
19 changes: 10 additions & 9 deletions docs/deployments/open5gs-with-bgp-and-slices/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,20 @@ HELM_VALUES_DIR?=./values

HELM_ARGS?=--timeout 30s --create-namespace
HELM_ACTION?=upgrade --install
HELM_REGISTRY?=oci://registry-1.docker.io/gradiant

open5gs:
helm $(HELM_ACTION) \
open5gs openverso/open5gs \
--version 2.0.12 \
open5gs $(HELM_REGISTRY)/open5gs \
--version 2.1.0 \
--values $(HELM_VALUES_DIR)/main.yaml \
-n $(NAMESPACE) \
$(HELM_ARGS)

smf:
helm $(HELM_ACTION) \
open5gs-smf openverso/open5gs-smf \
--version 2.0.10 \
open5gs-smf $(HELM_REGISTRY)/open5gs-smf \
--version 2.1.0 \
--values $(HELM_VALUES_DIR)/smf.yaml \
-n $(NAMESPACE) \
$(HELM_ARGS)
Expand All @@ -26,8 +27,8 @@ smf:

smf2:
helm $(HELM_ACTION) \
open5gs-smf2 openverso/open5gs-smf \
--version 2.0.10 \
open5gs-smf2 $(HELM_REGISTRY)/open5gs-smf \
--version 2.1.0 \
--values $(HELM_VALUES_DIR)/smf.yaml \
-n $(NAMESPACE) \
$(HELM_ARGS)
Expand Down Expand Up @@ -59,23 +60,23 @@ upf2:

gnb:
helm $(HELM_ACTION) \
gnb openverso/ueransim-gnb \
gnb $(HELM_REGISTRY)/ueransim-gnb \
--version 0.2.5 \
--values $(HELM_VALUES_DIR)/gnb.yaml \
-n $(NAMESPACE) \
$(HELM_ARGS)

ue1:
helm $(HELM_ACTION) \
ueransim1 openverso/ueransim-ues \
ueransim1 $(HELM_REGISTRY)/ueransim-ues \
--version 0.1.1 \
--values $(HELM_VALUES_DIR)/ue.yaml \
-n $(NAMESPACE) \
$(HELM_ARGS)

ue2:
helm $(HELM_ACTION) \
ueransim2 openverso/ueransim-ues \
ueransim2 $(HELM_REGISTRY)/ueransim-ues \
--version 0.1.1 \
--values $(HELM_VALUES_DIR)/ue2.yaml \
-n $(NAMESPACE) \
Expand Down
11 changes: 2 additions & 9 deletions docs/deployments/open5gs-with-bgp-and-slices/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,6 @@

change `calico_backend` parameter to `bird` in configmap with name `calico-config` and then restart all pods with name `calico-node-*`

- configure helm repos

```
helm repo add openverso https://gradiant.github.io/openverso-charts/
helm repo update
```

## Deployment steps

1. install eupf for slice 1
Expand Down Expand Up @@ -59,15 +52,15 @@

1. exec shell in UE1 pod

`kubectl -n open5gs exec -ti deployment/ueransim1-ueransim-ues-ues -- /bin/bash`
`kubectl -n open5gs exec -ti deployment/ueransim1-ueransim-ues -- /bin/bash`

2. run ICMP test

`ping -I uesimtun0 1.1.1.1`

3. exec shell in UE2 pod

`kubectl -n open5gs exec -ti deployment/ueransim2-ueransim-ues-ues -- /bin/bash`
`kubectl -n open5gs exec -ti deployment/ueransim2-ueransim-ues -- /bin/bash`

4. run ICMP test

Expand Down
13 changes: 7 additions & 6 deletions docs/deployments/open5gs-with-bgp/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,20 @@ HELM_VALUES_DIR?=./values

HELM_ARGS?=--timeout 30s --create-namespace
HELM_ACTION?=upgrade --install
HELM_REGISTRY?=oci://registry-1.docker.io/gradiant

open5gs:
helm $(HELM_ACTION) \
open5gs openverso/open5gs \
--version 2.0.12 \
open5gs $(HELM_REGISTRY)/open5gs \
--version 2.1.0 \
--values $(HELM_VALUES_DIR)/main.yaml \
-n $(NAMESPACE) \
$(HELM_ARGS)

smf:
helm $(HELM_ACTION) \
open5gs-smf openverso/open5gs-smf \
--version 2.0.10 \
open5gs-smf $(HELM_REGISTRY)/open5gs-smf \
--version 2.1.0 \
--values $(HELM_VALUES_DIR)/smf.yaml \
-n $(NAMESPACE) \
$(HELM_ARGS)
Expand All @@ -39,15 +40,15 @@ upf:

gnb:
helm $(HELM_ACTION) \
gnb openverso/ueransim-gnb \
gnb $(HELM_REGISTRY)/ueransim-gnb \
--version 0.2.5 \
--values $(HELM_VALUES_DIR)/gnb.yaml \
-n $(NAMESPACE) \
$(HELM_ARGS)

ue1:
helm $(HELM_ACTION) \
ueransim1 openverso/ueransim-ues \
ueransim1 $(HELM_REGISTRY)/ueransim-ues \
--version 0.1.1 \
--values $(HELM_VALUES_DIR)/ue.yaml \
-n $(NAMESPACE) \
Expand Down
9 changes: 1 addition & 8 deletions docs/deployments/open5gs-with-bgp/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,6 @@

change `calico_backend` parameter to `bird` in configmap with name `calico-config` and then restart all pods with name `calico-node-*`

- configure helm repos

```
helm repo add openverso https://gradiant.github.io/openverso-charts/
helm repo update
```

## Deployment steps

1. install eupf
Expand Down Expand Up @@ -47,7 +40,7 @@

1. exec shell in UE pod

`kubectl -n open5gs exec -ti deployment/ueransim1-ueransim-ues-ues -- /bin/bash`
`kubectl -n open5gs exec -ti deployment/ueransim1-ueransim-ues -- /bin/bash`

2. run ICMP test

Expand Down
15 changes: 8 additions & 7 deletions docs/deployments/open5gs-with-scaling-eupf/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ HELM_VALUES_DIR?=./values

HELM_ARGS?=--timeout 30s --create-namespace
HELM_ACTION?=upgrade --install
HELM_REGISTRY?=oci://registry-1.docker.io/gradiant

upf:
helm $(HELM_ACTION) \
Expand All @@ -14,16 +15,16 @@ upf:

open5gs:
helm $(HELM_ACTION) \
open5gs openverso/open5gs \
--version 2.0.12 \
open5gs $(HELM_REGISTRY)/open5gs \
--version 2.1.0 \
--values $(HELM_VALUES_DIR)/main.yaml \
-n $(NAMESPACE) \
$(HELM_ARGS)

smf:
helm $(HELM_ACTION) \
open5gs-smf openverso/open5gs-smf \
--version 2.0.10 \
open5gs-smf $(HELM_REGISTRY)/open5gs-smf \
--version 2.1.0 \
--values $(HELM_VALUES_DIR)/smf.yaml \
-n $(NAMESPACE) \
$(HELM_ARGS)
Expand All @@ -34,23 +35,23 @@ smf:

gnb:
helm $(HELM_ACTION) \
gnb openverso/ueransim-gnb \
gnb $(HELM_REGISTRY)/ueransim-gnb \
--version 0.2.5 \
--values $(HELM_VALUES_DIR)/gnb.yaml \
-n $(NAMESPACE) \
$(HELM_ARGS)

ue1:
helm $(HELM_ACTION) \
ueransim1 openverso/ueransim-ues \
ueransim1 $(HELM_REGISTRY)/ueransim-ues \
--version 0.1.1 \
--values $(HELM_VALUES_DIR)/ue1.yaml \
-n $(NAMESPACE) \
$(HELM_ARGS)

ue2:
helm $(HELM_ACTION) \
ueransim2 openverso/ueransim-ues \
ueransim2 $(HELM_REGISTRY)/ueransim-ues \
--version 0.1.1 \
--values $(HELM_VALUES_DIR)/ue2.yaml \
-n $(NAMESPACE) \
Expand Down
8 changes: 1 addition & 7 deletions docs/deployments/open5gs-with-scaling-eupf/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,6 @@
## Requirements

- [helm](https://helm.sh/docs/intro/install/) installed
- configure helm repos

```
helm repo add openverso https://gradiant.github.io/openverso-charts/
helm repo update
```

# Attention!

Expand Down Expand Up @@ -83,7 +77,7 @@ ue2 is connected and work via eUPF 1 (10.233.64.44)

1. exec shell in UE pod

`kubectl -n open5gs exec -ti deployment/ueransim1-ueransim-ues-ues -- /bin/bash`
`kubectl -n open5gs exec -ti deployment/ueransim1-ueransim-ues -- /bin/bash`

2. run ICMP test

Expand Down
9 changes: 5 additions & 4 deletions docs/deployments/srsran-gnb/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,20 @@ HELM_VALUES_DIR?=./values

HELM_ARGS?=--timeout 30s --create-namespace
HELM_ACTION?=upgrade --install
HELM_REGISTRY?=oci://registry-1.docker.io/gradiant

open5gs:
helm $(HELM_ACTION) \
open5gs openverso/open5gs \
--version 2.0.12 \
open5gs $(HELM_REGISTRY)/open5gs \
--version 2.1.0 \
--values $(HELM_VALUES_DIR)/main.yaml \
-n $(NAMESPACE) \
$(HELM_ARGS)

smf:
helm $(HELM_ACTION) \
open5gs-smf openverso/open5gs-smf \
--version 2.0.10 \
open5gs-smf $(HELM_REGISTRY)/open5gs-smf \
--version 2.1.0 \
--values $(HELM_VALUES_DIR)/smf.yaml \
-n $(NAMESPACE) \
$(HELM_ARGS)
Expand Down
2 changes: 0 additions & 2 deletions docs/deployments/srsran-gnb/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ This deployment helps to create an end-to-end fully open-source 5G network, cons
- configure helm repos

```
helm repo add openverso https://gradiant.github.io/openverso-charts/
helm repo update
git clone https://github.com/edgecomllc/srsRAN5Gue-zmg-gNB.git ../srsRAN5Gue-zmg-gNB
```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,6 @@

Для этого измените значение параметра `calico_backend` на `bird` в настройках (configmap) `calico-config` и перезапустите все поды с именем `calico-node-*`

- Настроены helm-репозитории

```
helm repo add openverso https://gradiant.github.io/openverso-charts/
helm repo update
```

## Шаги развертывания

1. перейдите в папку docs/deployments/open5gs-with-bgp-and-slices-UE2pdu
Expand Down Expand Up @@ -65,7 +58,7 @@

1. запустите оболочку shell в поде UE1

`kubectl -n open5gs exec -ti deployment/ueransim1-ueransim-ues-ues -- /bin/bash`
`kubectl -n open5gs exec -ti deployment/ueransim1-ueransim-ues -- /bin/bash`

2. проверьте доступность сети с помошью команды ping

Expand All @@ -74,7 +67,7 @@
3. запустите оболочку shell в поде UE2

```
kubectl -n open5gslices2 exec -ti deployment/ueransim2-ueransim-ues-ues -- /bin/bash
kubectl -n open5gslices2 exec -ti deployment/ueransim2-ueransim-ues -- /bin/bash
ip a
```
Проверьте, что в поде появились 2 интерфейса `uesimtun` с ip адресами из разных подсетей, как в примере:
Expand Down
Loading

0 comments on commit 0f704de

Please sign in to comment.