Skip to content

Commit

Permalink
Merge pull request openshift#239 from danwinship/network-status-empty
Browse files Browse the repository at this point in the history
Make config.NetworkStatus fields omitempty
  • Loading branch information
openshift-merge-robot authored Mar 7, 2019
2 parents f044dc4 + cfceec0 commit 600a551
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions config/v1/types_network.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,19 +44,17 @@ type NetworkSpec struct {
// NetworkStatus is the current network configuration.
type NetworkStatus struct {
// IP address pool to use for pod IPs.
// +nullable
ClusterNetwork []ClusterNetworkEntry `json:"clusterNetwork"`
ClusterNetwork []ClusterNetworkEntry `json:"clusterNetwork,omitempty"`

// IP address pool for services.
// Currently, we only support a single entry here.
// +nullable
ServiceNetwork []string `json:"serviceNetwork"`
ServiceNetwork []string `json:"serviceNetwork,omitempty"`

// NetworkType is the plugin that is deployed (e.g. OpenShiftSDN).
NetworkType string `json:"networkType"`
NetworkType string `json:"networkType,omitempty"`

// ClusterNetworkMTU is the MTU for inter-pod networking.
ClusterNetworkMTU int `json:"clusterNetworkMTU"`
ClusterNetworkMTU int `json:"clusterNetworkMTU,omitempty"`
}

// ClusterNetworkEntry is a contiguous block of IP addresses from which pod IPs
Expand Down

0 comments on commit 600a551

Please sign in to comment.