From dbc8b2543e9c92a95b967a1abf2e5445e7799eeb Mon Sep 17 00:00:00 2001 From: Eric Multanen Date: Tue, 19 May 2020 09:44:44 -0700 Subject: Fix Network and ProviderNetwork yaml formatting Correct yaml format of Network and ProviderNetwork CRs produced by ncm so that they can be deployed in a cluster. Issue-ID: MULTICLOUD-1072 Signed-off-by: Eric Multanen Change-Id: I27e55c0c7428ccee6ddb720445e104054eefcee3 --- src/ncm/pkg/module/network.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/ncm/pkg/module/network.go') diff --git a/src/ncm/pkg/module/network.go b/src/ncm/pkg/module/network.go index cfb414c5..e753905e 100644 --- a/src/ncm/pkg/module/network.go +++ b/src/ncm/pkg/module/network.go @@ -29,8 +29,8 @@ type Network struct { } type NetworkSpec struct { - CniType string `json:"cniType"` - Ipv4Subnets []Ipv4Subnet `json:"ipv4Subnets"` + CniType string `json:"cniType" yaml:"cniType"` + Ipv4Subnets []Ipv4Subnet `json:"ipv4Subnets" yaml:"ipv4Subnets"` } // NetworkKey is the key structure that is used in the database @@ -42,9 +42,9 @@ type NetworkKey struct { // structure for the Network Custom Resource type CrNetwork struct { - ApiVersion string `yaml:"apiVersion"` - Kind string `yaml:"kind"` - Network Network + ApiVersion string `yaml:"apiVersion"` + Kind string `yaml:"kind"` + Network Network `yaml:",inline"` } const NETWORK_APIVERSION = "k8s.plugin.opnfv.org/v1alpha1" -- cgit 1.2.3-korg