From 549b9c41fc2a3a7da4c96fb9870ea872a73e8ea8 Mon Sep 17 00:00:00 2001
From: Lapenta Francesco Davide <37077655+lapentad@users.noreply.github.com>
Date: Fri, 12 Jan 2024 11:05:34 +0000
Subject: [PATCH] Updated free5gc smf package to align with r2 (#51)

Updating packages to move into
[catalog](https://github.com/nephio-project/catalog/tree/main/workloads/free5gc)

Based on
[49](https://github.com/nephio-project/free5gc-packages/pull/49)
---
 pkg-example-smf-bp/Kptfile                       | 4 ++--
 pkg-example-smf-bp/apply-replacements-owner.yaml | 2 +-
 pkg-example-smf-bp/capacity.yaml                 | 2 +-
 pkg-example-smf-bp/dependency.yaml               | 2 +-
 pkg-example-smf-bp/dnn.yaml                      | 2 +-
 pkg-example-smf-bp/interface-n11.yaml            | 2 +-
 pkg-example-smf-bp/interface-n4.yaml             | 2 +-
 pkg-example-smf-bp/interface-sba.yaml            | 2 +-
 pkg-example-smf-bp/smfdeployment.yaml            | 4 +++-
 9 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/pkg-example-smf-bp/Kptfile b/pkg-example-smf-bp/Kptfile
index fd38fb7..7ba9ed1 100644
--- a/pkg-example-smf-bp/Kptfile
+++ b/pkg-example-smf-bp/Kptfile
@@ -14,10 +14,10 @@ pipeline:
       configPath: apply-replacements-namespace.yaml
     - image: gcr.io/kpt-fn/set-namespace:v0.4.1
       configPath: cm-namespace.yaml
-    - image: docker.io/nephio/smf-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/smf-deploy-fn:v1.0.1
+    - image: nephio/nfdeploy-fn:1729579664202010624
diff --git a/pkg-example-smf-bp/apply-replacements-owner.yaml b/pkg-example-smf-bp/apply-replacements-owner.yaml
index 57143fc..068d66e 100644
--- a/pkg-example-smf-bp/apply-replacements-owner.yaml
+++ b/pkg-example-smf-bp/apply-replacements-owner.yaml
@@ -11,7 +11,7 @@ replacements:
     fieldPath: spec.clusterName
   targets:
   - select:
-      kind: SMFDeployment
+      kind: NFDeployment
     fieldPaths:
     - metadata.name
     options:
diff --git a/pkg-example-smf-bp/capacity.yaml b/pkg-example-smf-bp/capacity.yaml
index b2642e9..ee4562f 100644
--- a/pkg-example-smf-bp/capacity.yaml
+++ b/pkg-example-smf-bp/capacity.yaml
@@ -4,7 +4,7 @@ metadata:
   name: control-plane
   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:
   maxSessions: 500
diff --git a/pkg-example-smf-bp/dependency.yaml b/pkg-example-smf-bp/dependency.yaml
index e643032..7bc8d3e 100644
--- a/pkg-example-smf-bp/dependency.yaml
+++ b/pkg-example-smf-bp/dependency.yaml
@@ -4,7 +4,7 @@ metadata:
   name: upf
   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:
   packageName: free5gc-upf
diff --git a/pkg-example-smf-bp/dnn.yaml b/pkg-example-smf-bp/dnn.yaml
index 8f63b01..493791a 100644
--- a/pkg-example-smf-bp/dnn.yaml
+++ b/pkg-example-smf-bp/dnn.yaml
@@ -4,6 +4,6 @@ metadata:
   name: internet
   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:
diff --git a/pkg-example-smf-bp/interface-n11.yaml b/pkg-example-smf-bp/interface-n11.yaml
index f13165e..24819ce 100644
--- a/pkg-example-smf-bp/interface-n11.yaml
+++ b/pkg-example-smf-bp/interface-n11.yaml
@@ -4,7 +4,7 @@ metadata:
   name: n11
   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-smf-bp/interface-n4.yaml b/pkg-example-smf-bp/interface-n4.yaml
index ffbf96e..496c2c5 100644
--- a/pkg-example-smf-bp/interface-n4.yaml
+++ b/pkg-example-smf-bp/interface-n4.yaml
@@ -4,7 +4,7 @@ metadata:
   name: n4 # also used as pfcp
   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-smf-bp/interface-sba.yaml b/pkg-example-smf-bp/interface-sba.yaml
index 52218f0..1f53c06 100644
--- a/pkg-example-smf-bp/interface-sba.yaml
+++ b/pkg-example-smf-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-smf-bp/smfdeployment.yaml b/pkg-example-smf-bp/smfdeployment.yaml
index 37f4e41..9bb5784 100644
--- a/pkg-example-smf-bp/smfdeployment.yaml
+++ b/pkg-example-smf-bp/smfdeployment.yaml
@@ -1,5 +1,7 @@
 apiVersion: workload.nephio.org/v1alpha1
-kind: SMFDeployment
+kind: NFDeployment
 metadata:
   name: smf-example
   namespace: smf-example
+spec:
+  provider: smf.free5gc.io