From 36b10edf32498b1a3c74c15f34a44a0e14c06fa8 Mon Sep 17 00:00:00 2001 From: Wim Henderickx Date: Fri, 13 Oct 2023 07:58:34 -0700 Subject: [PATCH 1/2] revert optional tags --- nf_deployments/v1alpha1/nf_deployment_types.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nf_deployments/v1alpha1/nf_deployment_types.go b/nf_deployments/v1alpha1/nf_deployment_types.go index ee86821ba..7d46dd24d 100644 --- a/nf_deployments/v1alpha1/nf_deployment_types.go +++ b/nf_deployments/v1alpha1/nf_deployment_types.go @@ -62,14 +62,14 @@ type NFDeploymentSpec struct { type ObjectReference struct { // APIVersion of the target resources - APIVersion string `yaml:"apiVersion,omitempty" json:"apiVersion,omitempty"` + APIVersion string `yaml:"apiVersion" json:"apiVersion"` // Kind of the target resources - Kind string `yaml:"kind,omitempty" json:"kind,omitempty"` + Kind string `yaml:"kind" json:"kind"` // Name of the target resource // +optional - Name *string `yaml:"name" json:"name"` + Name *string `yaml:"name,omitempty" json:"name,omitempty"` // Note: Namespace is not allowed; the namespace // must match the namespace of the PackageVariantSet resource From db12d88121ba346f283ef3c76e539c7833541d35 Mon Sep 17 00:00:00 2001 From: Wim Henderickx Date: Fri, 13 Oct 2023 08:54:51 -0700 Subject: [PATCH 2/2] added make generate/manifest --- config/crd/bases/workload.nephio.org_nfdeployments.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/config/crd/bases/workload.nephio.org_nfdeployments.yaml b/config/crd/bases/workload.nephio.org_nfdeployments.yaml index 2da829983..4e46374f5 100644 --- a/config/crd/bases/workload.nephio.org_nfdeployments.yaml +++ b/config/crd/bases/workload.nephio.org_nfdeployments.yaml @@ -252,7 +252,7 @@ spec: type: object type: array parametersRefs: - description: ParametersRefs defines addiitonal KRM parmeter references + description: ParametersRefs defines addiitonal KRM parameter references the nf depends upon items: properties: @@ -265,6 +265,9 @@ spec: name: description: Name of the target resource type: string + required: + - apiVersion + - kind type: object type: array provider: