Updated free5gc UPF package to align with r2 (#50)

Updating packages to move into [catalog](https://github.com/nephio-project/catalog/tree/main/workloads/free5gc) Based on [49](#49)
nephio-project · Jan 12, 2024 · 80753bf · 80753bf
1 parent 7b177d3
commit 80753bf
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 12 deletions.
diff --git a/free5gc-upf/upf-deployment.yaml b/free5gc-upf/upf-deployment.yaml
@@ -1,7 +1,8 @@
 apiVersion: nf.nephio.org/v1alpha1
-kind: UPFDeployment
+kind: NFDeployment
 metadata:
   name: upf-deployment
   annotations:
     automation.nephio.org/config-injection: "True"
-spec: {}
+spec:
+  provider: upf.free5gc.io
diff --git a/pkg-example-upf-bp/Kptfile b/pkg-example-upf-bp/Kptfile
@@ -14,10 +14,10 @@ pipeline:
       configPath: apply-replacements-namespace.yaml
     - image: gcr.io/kpt-fn/set-namespace:v0.4.1
       configPath: package-context.yaml
-    - image: docker.io/nephio/upf-deploy-fn:v1.0.1
+    - image: nephio/nfdeploy-fn:1729579664202010624
     - image: docker.io/nephio/interface-fn:v1.0.1
     - image: docker.io/nephio/dnn-fn:v1.0.1
     - image: docker.io/nephio/nad-fn:v1.0.1
     - image: docker.io/nephio/dnn-fn:v1.0.1
     - image: docker.io/nephio/interface-fn:v1.0.1
-    - image: docker.io/nephio/upf-deploy-fn:v1.0.1
+    - image: nephio/nfdeploy-fn:1729579664202010624
diff --git a/pkg-example-upf-bp/apply-replacements-owner.yaml b/pkg-example-upf-bp/apply-replacements-owner.yaml
@@ -11,7 +11,7 @@ replacements:
     fieldPath: spec.clusterName
   targets:
   - select:
-      kind: UPFDeployment
+      kind: NFDeployment
     fieldPaths:
     - metadata.name
     options:

diff --git a/pkg-example-upf-bp/capacity.yaml b/pkg-example-upf-bp/capacity.yaml
@@ -4,7 +4,7 @@ metadata:
   name: dataplane
   annotations:
     config.kubernetes.io/local-config: "true"
-    specializer.nephio.org/owner: workload.nephio.org/v1alpha1.UPFDeployment.upf-example
+    specializer.nephio.org/owner: workload.nephio.org/v1alpha1.NFDeployment.upf-example
     specializer.nephio.org/namespace: example
 spec:
   maxUplinkThroughput: 5G

diff --git a/pkg-example-upf-bp/dnn.yaml b/pkg-example-upf-bp/dnn.yaml
@@ -4,7 +4,7 @@ metadata:
   name: internet
   annotations:
     config.kubernetes.io/local-config: "true"
-    specializer.nephio.org/owner: workload.nephio.org/v1alpha1.UPFDeployment.upf-example
+    specializer.nephio.org/owner: workload.nephio.org/v1alpha1.NFDeployment.upf-example
     specializer.nephio.org/namespace: example
 spec:
   networkInstance:

diff --git a/pkg-example-upf-bp/interface-n3.yaml b/pkg-example-upf-bp/interface-n3.yaml
@@ -5,7 +5,7 @@ metadata:
   annotations:
     nephio.org/network-name: n3
     config.kubernetes.io/local-config: "true"
-    specializer.nephio.org/owner: workload.nephio.org/v1alpha1.UPFDeployment.upf-example
+    specializer.nephio.org/owner: workload.nephio.org/v1alpha1.NFDeployment.upf-example
     specializer.nephio.org/namespace: example
 spec:
   networkInstance:

diff --git a/pkg-example-upf-bp/interface-n4.yaml b/pkg-example-upf-bp/interface-n4.yaml
@@ -4,7 +4,7 @@ metadata:
   name: n4
   annotations:
     config.kubernetes.io/local-config: "true"
-    specializer.nephio.org/owner: workload.nephio.org/v1alpha1.UPFDeployment.upf-example
+    specializer.nephio.org/owner: workload.nephio.org/v1alpha1.NFDeployment.upf-example
     specializer.nephio.org/namespace: example
 spec:
   networkInstance:

diff --git a/pkg-example-upf-bp/interface-n6.yaml b/pkg-example-upf-bp/interface-n6.yaml
@@ -4,7 +4,7 @@ metadata:
   name: n6
   annotations:
     config.kubernetes.io/local-config: "true"
-    specializer.nephio.org/owner: workload.nephio.org/v1alpha1.UPFDeployment.upf-example
+    specializer.nephio.org/owner: workload.nephio.org/v1alpha1.NFDeployment.upf-example
     specializer.nephio.org/namespace: example
 spec:
   networkInstance:

diff --git a/pkg-example-upf-bp/interface-sba.yaml b/pkg-example-upf-bp/interface-sba.yaml
@@ -4,7 +4,7 @@ metadata:
   name: sbi
   annotations:
     config.kubernetes.io/local-config: "true"
-    specializer.nephio.org/owner: workload.nephio.org/v1alpha1.SMFDeployment.smf-example
+    specializer.nephio.org/owner: workload.nephio.org/v1alpha1.NFDeployment.smf-example
     specializer.nephio.org/namespace: example
 spec:
   networkInstance:

diff --git a/pkg-example-upf-bp/upfdeployment.yaml b/pkg-example-upf-bp/upfdeployment.yaml
@@ -1,5 +1,7 @@
 apiVersion: workload.nephio.org/v1alpha1
-kind: UPFDeployment
+kind: NFDeployment
 metadata:
   name: upf-example
   namespace: upf-example
+spec:
+  provider: upf.free5gc.io