Merge pull request #410 from arangodb/json

joerg84 · web-flow · commit 18a8b63d7b62 · 2019-06-25T14:02:33.000+02:00
Fix json marshalling specification.
diff --git a/pkg/apis/deployment/v1alpha/deployment_spec.go b/pkg/apis/deployment/v1alpha/deployment_spec.go
@@ -27,7 +27,7 @@ import (
 
 	"github.com/arangodb/kube-arangodb/pkg/util"
 	"github.com/pkg/errors"
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 )
 
 const (
@@ -72,7 +72,7 @@ type DeploymentSpec struct {
 
 	Chaos ChaosSpec `json:"chaos"`
 
-	Bootstrap BootstrapSpec `json:"bootstrap",omitempty`
+	Bootstrap BootstrapSpec `json:"bootstrap,omitempty"`
 }
 
 // Equal compares two DeploymentSpec

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ import (`
`27`	`27`
`28`	`28`	`"github.com/arangodb/kube-arangodb/pkg/util"`
`29`	`29`	`"github.com/pkg/errors"`
`30`		`- "k8s.io/api/core/v1"`
	`30`	`+ v1 "k8s.io/api/core/v1"`
`31`	`31`	`)`
`32`	`32`
`33`	`33`	`const (`
`@@ -72,7 +72,7 @@ type DeploymentSpec struct {`
`72`	`72`
`73`	`73`	Chaos ChaosSpec `json:"chaos"`
`74`	`74`
`75`		- Bootstrap BootstrapSpec `json:"bootstrap",omitempty`
	`75`	+ Bootstrap BootstrapSpec `json:"bootstrap,omitempty"`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`// Equal compares two DeploymentSpec`