Skip to content

Commit 33d4ab1

Browse files
Merging changes from old R3 branch to newly created (#157)
Signed-off-by: Gergely Csatari <gergely.csatari@nokia.com> Co-authored-by: Gergely Csatari <gergely.csatari@nokia.com>
1 parent f45e0e4 commit 33d4ab1

File tree

7 files changed

+57
-19
lines changed

7 files changed

+57
-19
lines changed

.linkspector.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ aliveStatusCodes:
1010
ignorePatterns:
1111
- pattern: "^http://localhost.*$"
1212
- pattern: "^http://HOSTNAME:PORT.*$"
13+
- pattern: "https://wiki.lfnetworking.org/.*"
1314
- pattern: "172\\.18\\.255\\.200"
1415
replacementPatterns:
1516
- pattern: ".md#.*$"

config.toml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
baseURL = 'https://docs.nephio.org/'
1+
baseURL = 'https://r3.docs.nephio.org/'
22
languageCode = 'en-us'
3-
title = 'Nephio Documentation'
4-
3+
title = 'Nephio R3 Documentation'
54
# based on https://www.docsy.dev/docs/get-started/docsy-as-module/start-from-scratch/
65

76
# Language settings
@@ -79,12 +78,11 @@ archived_version = false
7978
# The version number for the version of the docs represented in this doc set.
8079
# Used in the "version-banner" partial to display a version number for the
8180
# current doc set.
82-
83-
version = "main"
81+
#version = "0.0"
82+
version = "R3"
8483

8584
# A link to latest version of the docs. Used in the "version-banner" partial to
8685
# point people to the main doc site.
87-
8886
url_latest_version = "https://docs.nephio.org/docs/"
8987

9088
# Repository configuration (URLs for in-page links to opening issues and suggesting changes)
@@ -207,7 +205,7 @@ enable = false
207205
# name = "Developer mailing list"
208206
# url = "https://example.org/mail"
209207
# icon = "fa fa-envelope"
210-
# desc = "Discuss development issues around the project"
208+
# desc = "Discuss development issues around the project"
211209

212210
# Add your release versions here
213211

@@ -225,4 +223,4 @@ enable = false
225223

226224
[[params.versions]]
227225
version = "R1"
228-
url = "https://github.com/nephio-project/docs/tree/R1"
226+
url = "https://github.com/nephio-project/docs/tree/R1"

content/en/_index.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Start
33
description: Documentation of the Nephio project
44
menu: {main: {weight: 10}}
55
---
6-
{{< blocks/cover title="Welcome to the Nephio documentation" image_anchor="top" height="full" >}}
6+
{{< blocks/cover title="Welcome to Release 3 of Nephio" image_anchor="top" height="full" >}}
77
<a class="btn btn-lg btn-primary me-3 mb-4" href="https://nephio.org/">
88
Homepage <i class="fas fa-arrow-alt-circle-right ms-2"></i>
99
</a>
@@ -28,8 +28,7 @@ and network functions across large scale edge deployments."
2828
{{% blocks/section type="row" %}}
2929

3030
{{% blocks/feature icon="fas fa-rocket" title="R3" %}}
31-
Welcome to the Release 3 of Nephio. This release is under ongoing development together with its documentation. It is
32-
possible to experience some incompleteness ;)
31+
Welcome to the Release 3 (R3) of Nephio. Please use the documentation links below to learn more about Nephio R3.
3332
{{% /blocks/feature %}}
3433

3534
{{% blocks/feature icon="fab fa-wikipedia-w" title="Wiki" %}}

content/en/docs/glossary.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ is part of the "Kubernetes Everywhere" principle).
3434
As a community, we should try to use a common set of terminology for different types of configuration. See
3535
[docs#4](https://github.com/nephio-project/nephio/issues/266).
3636

37-
## Configuration as Data
37+
# Configuration as Data
3838
Configuration as Data is an approach to management of configuration (incl. configuration of infrastructure, policy,
3939
services, applications, etc.) which:
4040

@@ -44,8 +44,8 @@ services, applications, etc.) which:
4444
* abstracts configuration file structure and storage from operations that act upon the configuration data; clients
4545
manipulating configuration data don’t need to directly interact with storage (git, container images)
4646

47-
Source of definition and more information about Configuration as Data can be found in the [kpt documentation](/content/en/docs/porch/config-as-data.md).
48-
47+
Source of definition and more information about Configuration as Data can be found in the
48+
[kpt documentation](/content/en/docs/porch/config-as-data.md).
4949
## Controller
5050
This term comes from Kubernetes where
5151
[controller](https://kubernetes.io/docs/reference/glossary/?fundamental=true#term-controller) is defined as a control
@@ -298,6 +298,7 @@ although we also use it to refer to the external representation of that object
298298
Also see [REST](https://en.wikipedia.org/wiki/Representational_state_transfer).
299299

300300
## Specializer
301+
301302
This refers to a software component that runs in the Nephio Management cluster,
302303
and could be considered a type of [controller](#controller). However, it
303304
specifically watches for `PackageRevision` resources in a Draft state, and

content/en/docs/guides/install-guides/_index.md

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,22 @@ description: >
55
weight: 1
66
---
77

8-
{{% pageinfo %}}
9-
This page is draft and the separation of the content to different categories is not clearly done.
10-
{{% /pageinfo %}}
8+
# Demonstration Environment Installation
9+
10+
## Table of Contents
11+
12+
- [Introduction](#introduction)
13+
- [Installing on GCE](#installing-on-gce)
14+
- [GCE Prerequisites](#gce-prerequisites)
15+
- [Create a Virtual Machine on GCE](#create-a-virtual-machine-on-gce)
16+
- [Follow installation on GCE](#follow-the-installation-on-gce)
17+
- [Installing on a pre-provisioned VM](#installing-on-a-pre-provisioned-vm)
18+
- [VM Prerequisites](#vm-prerequisites)
19+
- [Kick off the installation on VM](#kick-off-an-installation-on-vm)
20+
- [Follow installation on VM](#follow-the-installation-on-vm)
21+
- [Access to the User Interfaces](#access-to-the-user-interfaces)
22+
- [Open terminal](#open-terminal)
23+
- [Next Steps](#next-steps)
1124

1225
## Introduction
1326

content/en/docs/guides/install-guides/package-transformations.md

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,20 @@ description: >
55
weight: 7
66
---
77

8-
## Vanilla kpt for the Management cluster
8+
# Table of Contents
9+
10+
- [Vanilla kpt for the Management cluster](#vanilla-kpt-for-the-management-cluster)
11+
- [kpt pkg get](#kpt-pkg-get)
12+
- [kpt fn render](#kpt-fn-render)
13+
- [kpt live init](#kpt-live-init)
14+
- [porchctl rpkg for the Workload clusters](#porchctl-rpkg-for-workload-clusters)
15+
- [Create workload cluster package](#create-the-workload-cluster-package)
16+
- [Configure the package](#configure-the-package)
17+
- [Propose the package](#propose-the-package)
18+
- [Approve the package and trigger configsync](#approve-the-package-and-trigger-configsync)
19+
- [Transformations in the Workload cluster creation](#transformations-in-the-workload-cluster-creation)
20+
21+
# Vanilla kpt for the Management cluster
922

1023
Before reading this, please read [the kpt book](https://kpt.dev/book/).
1124

content/en/docs/guides/user-guides/exercise-1-free5gc.md

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,19 @@ description: >
55
weight: 2
66
---
77

8+
## Table of Contents
9+
10+
- [Introduction](#introduction)
11+
- [Create the Regional cluster](#step-1-create-the-regional-cluster)
12+
- [Check the Regional cluster installation](#step-2-check-the-regional-cluster-installation)
13+
- [Deploy two Edge clusters](#step-3-deploy-two-edge-clusters)
14+
- [Deploy free5GC control plane functions](#step-4-deploy-free5gc-control-plane-functions)
15+
- [Deploy free5GC Operator in the Workload clusters](#step-5-deploy-free5gc-operator-in-the-workload-clusters)
16+
- [Check free5GC Operator deployment](#step-6-check-free5gc-operator-deployment)
17+
- [Deploy AMF, SMF and UPF](#step-7-deploy-the-amf-smf-and-upf-nfs)
18+
- [Deploy UERANSIM](#step-8-deploy-ueransim)
19+
- [Change the Capacities of the UPF and SMF NFs](#step-9-change-the-capacities-of-the-upf-and-smf-nfs)
20+
821
## Introduction
922

1023
Be sure you have followed the [installation guide](/content/en/docs/guides/install-guides/_index.md)
@@ -595,7 +608,7 @@ kubectl apply -f test-infra/e2e/tests/free5gc/006-regional-free5gc-amf.yaml
595608
kubectl apply -f test-infra/e2e/tests/free5gc/006-regional-free5gc-smf.yaml
596609
```
597610

598-
Free5gc requires that the SMF and AMF NFs be explicitly configured with information about each UPF. Therefore, the AMF
611+
Free5GC requires that the SMF and AMF NFs be explicitly configured with information about each UPF. Therefore, the AMF
599612
and SMF packages will remain in an "unready" state until the UPF packages have all been published.
600613

601614
### Check UPF deployment

0 commit comments

Comments
 (0)