Revert "De duplication logic to NF Deploy Fn Param Ref"

[radoslawc]

Reverts #494

[nephio-prow]

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign tliron for approval by writing /assign @tliron in a comment. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

• OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[radoslawc]

/test build-push-image-vlan-fn-commit-conf

[nephio-prow]

@radoslawc: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

• /test build-push-pre-image-configinject-fn
• /test build-push-pre-image-dnn-fn-commit-conf
• /test build-push-pre-image-gen-cmap-fn
• /test build-push-pre-image-interface-fn
• /test build-push-pre-image-ipam-fn
• /test build-push-pre-image-nad-fn
• /test build-push-pre-image-nephio-operator
• /test build-push-pre-image-nfdeployfn
• /test build-push-pre-image-ueransim-deploy-fn
• /test build-push-pre-image-vlan-fn
• /test presubmit-nephio-fossology
• /test presubmit-nephio-go-test
• /test presubmit-nephio-golangci-lint
• /test presubmit-nephio-gosec
• /test presubmit-nephio-license-header-check
• /test presubmit-nephio-lichen
• /test presubmit-nephio-scancode-toolkit
• /test presubmit-test-nephio-inrepoconfig-validation

Use /test all to run the following jobs that were automatically triggered:

• build-push-pre-image-configinject-fn
• build-push-pre-image-dnn-fn-commit-conf
• build-push-pre-image-gen-cmap-fn
• build-push-pre-image-interface-fn
• build-push-pre-image-ipam-fn
• build-push-pre-image-nad-fn
• build-push-pre-image-nephio-operator
• build-push-pre-image-nfdeployfn
• build-push-pre-image-ueransim-deploy-fn
• build-push-pre-image-vlan-fn
• presubmit-nephio-fossology
• presubmit-nephio-go-test
• presubmit-nephio-golangci-lint
• presubmit-nephio-gosec
• presubmit-nephio-license-header-check
• presubmit-nephio-lichen
• presubmit-nephio-scancode-toolkit

In response to this:

/test build-push-image-vlan-fn-commit-conf

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[electrocucaracha]

I discovered during a manual End-to-End testing on this change that the operator was having some issues

$ kubectl logs -n free5gc free5gc-operator-6887fb54f8-xbxs8 --kubeconfig /tmp/tmp.B1MiU5THUn_kubeconfig-edge02 -c operator
2024-02-01T23:37:09Z    INFO    controller-runtime.metrics      Metrics server is starting to listen    {"addr": "127.0.0.1:8080"}
2024-02-01T23:37:09Z    INFO    setup   starting manager
2024-02-01T23:37:09Z    INFO    Starting server {"kind": "health probe", "addr": "[::]:8081"}
I0201 23:37:09.167201       1 leaderelection.go:245] attempting to acquire leader lease free5gc/5089c67f.nephio.org...
2024-02-01T23:37:09Z    INFO    starting server {"path": "/metrics", "kind": "metrics", "addr": "127.0.0.1:8080"}
I0201 23:37:09.222363       1 leaderelection.go:255] successfully acquired lease free5gc/5089c67f.nephio.org
2024-02-01T23:37:09Z    DEBUG   events  free5gc-operator-6887fb54f8-xbxs8_29d2d95d-1272-4538-b49a-534e5f96d024 became leader    {"type": "Normal", "object": {"kind":"Lease","namespace":"free5gc","name":"5089c67f.nephio.org","uid":"c498354e-c502-4496-854f-44551ca87b95","apiVersion":"coordination.k8s.io/v1","resourceVersion":"2011"}, "reason": "LeaderElection"}
2024-02-01T23:37:09Z    INFO    Starting EventSource    {"controller": "nfdeployment", "controllerGroup": "workload.nephio.org", "controllerKind": "NFDeployment", "source": "kind source: *v1alpha1.NFDeployment"}
2024-02-01T23:37:09Z    INFO    Starting EventSource    {"controller": "nfdeployment", "controllerGroup": "workload.nephio.org", "controllerKind": "NFDeployment", "source": "kind source: *v1.Deployment"}
2024-02-01T23:37:09Z    INFO    Starting EventSource    {"controller": "nfdeployment", "controllerGroup": "workload.nephio.org", "controllerKind": "NFDeployment", "source": "kind source: *v1.ConfigMap"}
2024-02-01T23:37:09Z    INFO    Starting Controller     {"controller": "nfdeployment", "controllerGroup": "workload.nephio.org", "controllerKind": "NFDeployment"}
2024-02-01T23:37:09Z    INFO    Starting workers        {"controller": "nfdeployment", "controllerGroup": "workload.nephio.org", "controllerKind": "NFDeployment", "worker count": 1}
2024-02-01T23:51:19Z    INFO    Creating ConfigMap      {"controller": "nfdeployment", "controllerGroup": "workload.nephio.org", "controllerKind": "NFDeployment", "NFDeployment": {"name":"upf-edge02","namespace":"free5gc-upf"}, "namespace": "free5gc-upf", "name": "upf-edge02", "reconcileID": "63574471-2aec-40d5-b602-e8ee0a23a740", "NFDeployment": {"name":"upf-edge02","namespace":"free5gc-upf"}, "NF": "UPF", "ConfigMap.namespace": "free5gc-upf", "ConfigMap.name": "upf-edge02"}
2024-02-01T23:51:19Z    INFO    Creating Deployment     {"controller": "nfdeployment", "controllerGroup": "workload.nephio.org", "controllerKind": "NFDeployment", "NFDeployment": {"name":"upf-edge02","namespace":"free5gc-upf"}, "namespace": "free5gc-upf", "name": "upf-edge02", "reconcileID": "63574471-2aec-40d5-b602-e8ee0a23a740", "NFDeployment": {"name":"upf-edge02","namespace":"free5gc-upf"}, "NF": "UPF", "Deployment.namespace": "free5gc-upf", "Deployment.name": "upf-edge02"}
2024-02-01T23:51:19Z    INFO    Creating Deployment     {"controller": "nfdeployment", "controllerGroup": "workload.nephio.org", "controllerKind": "NFDeployment", "NFDeployment": {"name":"upf-edge02","namespace":"free5gc-upf"}, "namespace": "free5gc-upf", "name": "upf-edge02", "reconcileID": "4204b900-cdd5-48ad-93e7-7b3794e804d3", "NFDeployment": {"name":"upf-edge02","namespace":"free5gc-upf"}, "NF": "UPF", "Deployment.namespace": "free5gc-upf", "Deployment.name": "upf-edge02"}
2024-02-01T23:51:19Z    ERROR   Failed to create new Deployment {"controller": "nfdeployment", "controllerGroup": "workload.nephio.org", "controllerKind": "NFDeployment", "NFDeployment": {"name":"upf-edge02","namespace":"free5gc-upf"}, "namespace": "free5gc-upf", "name": "upf-edge02", "reconcileID": "4204b900-cdd5-48ad-93e7-7b3794e804d3", "NFDeployment": {"name":"upf-edge02","namespace":"free5gc-upf"}, "NF": "UPF", "Deployment.namespace": "free5gc-upf", "Deployment.name": "upf-edge02", "error": "deployments.apps \"upf-edge02\" already exists"}
github.com/nephio-project/free5gc/controllers/nf/upf.(*UPFDeploymentReconciler).Reconcile
        /workspace/controllers/nf/upf/reconciler.go:140
github.com/nephio-project/free5gc/controllers/nf.(*NFDeploymentReconciler).Reconcile
        /workspace/controllers/nf/reconciler.go:99
sigs.k8s.io/controller-runtime/pkg/internal/controller.(*Controller).Reconcile
        /go/pkg/mod/sigs.k8s.io/[email protected]/pkg/internal/controller/controller.go:118
sigs.k8s.io/controller-runtime/pkg/internal/controller.(*Controller).reconcileHandler
        /go/pkg/mod/sigs.k8s.io/[email protected]/pkg/internal/controller/controller.go:314
sigs.k8s.io/controller-runtime/pkg/internal/controller.(*Controller).processNextWorkItem
        /go/pkg/mod/sigs.k8s.io/[email protected]/pkg/internal/controller/controller.go:265
sigs.k8s.io/controller-runtime/pkg/internal/controller.(*Controller).Start.func2.2
        /go/pkg/mod/sigs.k8s.io/[email protected]/pkg/internal/controller/controller.go:226