Merge pull request #24 from Nordix/update-free5gc

Fix free5gc-operator-role RBAC
nephio-project · Jan 18, 2024 · 49282de · 49282de
2 parents 4a42739 + baea6c7
commit 49282de
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 66 deletions.
diff --git a/workloads/free5gc/free5gc-operator/operator/clusterrole.yaml b/workloads/free5gc/free5gc-operator/operator/clusterrole.yaml
@@ -1,21 +1,8 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
-
 metadata:
   name: free5gc-operator-role
 rules:
-- apiGroups:
-  - ""
-  resources:
-  - configmaps
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
 - apiGroups:
   - ""
   resources:
@@ -73,67 +60,23 @@ rules:
 - apiGroups:
   - workload.nephio.org
   resources:
-  - amfdeployments
+  - nfdeployments
   verbs:
-  - create
-  - delete
   - get
   - list
-  - patch
-  - update
   - watch
 - apiGroups:
   - workload.nephio.org
   resources:
-  - amfdeployments/status
+  - nfdeployments/status
   verbs:
   - get
   - patch
   - update
 - apiGroups:
   - workload.nephio.org
   resources:
-  - smfdeployments
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - workload.nephio.org
-  resources:
-  - smfdeployments/status
-  verbs:
-  - get
-  - patch
-  - update
-- apiGroups:
-  - workload.nephio.org
-  resources:
-  - upfdeployments
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - workload.nephio.org
-  resources:
-  - upfdeployments/status
-  verbs:
-  - get
-  - patch
-  - update
-- apiGroups:
-  - ref.nephio.org
-  resources:
-  - configs
+  - nfconfigs
   verbs:
   - get
   - list

diff --git a/workloads/free5gc/pkg-example-amf-bp/Kptfile b/workloads/free5gc/pkg-example-amf-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: nephio/nfdeploy-fn:1729579664202010624
+    - image: docker.io/nephio/nfdeploy-fn:1745600386007306240
     - image: docker.io/nephio/interface-fn:latest
     - image: docker.io/nephio/dnn-fn:latest
     - image: docker.io/nephio/nad-fn:latest
     - image: docker.io/nephio/dnn-fn:latest
     - image: docker.io/nephio/interface-fn:latest
-    - image: nephio/nfdeploy-fn:1729579664202010624
+    - image: docker.io/nephio/nfdeploy-fn:1745600386007306240
diff --git a/workloads/free5gc/pkg-example-smf-bp/Kptfile b/workloads/free5gc/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: nephio/nfdeploy-fn:1729579664202010624
+    - image: docker.io/nephio/nfdeploy-fn:1745600386007306240
     - image: docker.io/nephio/interface-fn:latest
     - image: docker.io/nephio/dnn-fn:latest
     - image: docker.io/nephio/nad-fn:latest
     - image: docker.io/nephio/dnn-fn:latest
     - image: docker.io/nephio/interface-fn:latest
-    - image: nephio/nfdeploy-fn:1729579664202010624
+    - image: docker.io/nephio/nfdeploy-fn:1745600386007306240
diff --git a/workloads/free5gc/pkg-example-upf-bp/Kptfile b/workloads/free5gc/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: nephio/nfdeploy-fn:1729579664202010624
+    - image: docker.io/nephio/nfdeploy-fn:1745600386007306240
     - image: docker.io/nephio/interface-fn:latest
     - image: docker.io/nephio/dnn-fn:latest
     - image: docker.io/nephio/nad-fn:latest
     - image: docker.io/nephio/dnn-fn:latest
     - image: docker.io/nephio/interface-fn:latest
-    - image: nephio/nfdeploy-fn:1729579664202010624
+    - image: docker.io/nephio/nfdeploy-fn:1745600386007306240