Renaming ObjectMeta field to Metadata as a workaround for the issue k…

…ubernetes/client-go#8
nilebox · Mar 9, 2017 · f5de3d5 · f5de3d5
1 parent 6cae2d0
commit f5de3d5
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 13 deletions.
diff --git a/cmd/main_test.go b/cmd/main_test.go
@@ -61,7 +61,7 @@ func TestCanaryRelease(t *testing.T) {
 					APIVersion: deployv1.ReleaseResourceGroupVersion,
 					Kind:       deployv1.ReleaseResourceKind,
 				},
-				ObjectMeta: apiv1.ObjectMeta{
+				Metadata: apiv1.ObjectMeta{
 					Name: "release2",
 				},
 				Spec: deployv1.ReleaseSpec{

diff --git a/pkg/apis/v1/types.go b/pkg/apis/v1/types.go
@@ -26,9 +26,13 @@ const (
 // Release enables declarative updates for Pods and ReplicaSets.
 type Release struct {
 	metav1.TypeMeta `json:",inline"`
+
+	// *** SECRET KNOWLEDGE ***: Don't call the field below ObjectMeta, it will blow up the JSON deserialization
+	// Issue: https://github.com/kubernetes/client-go/issues/8
+
 	// Standard object metadata.
 	// +optional
-	apiv1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
+	Metadata apiv1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// Specification of the desired behavior of the Release.
 	// +optional
@@ -164,7 +168,7 @@ func (e *Release) GetObjectKind() schema.ObjectKind {
 
 // Required to satisfy ObjectMetaAccessor interface
 func (e *Release) GetObjectMeta() metav1.Object {
-	return &e.ObjectMeta
+	return &e.Metadata
 }
 
 // Required to satisfy Object interface
@@ -191,7 +195,7 @@ func (e *Release) UnmarshalJSON(data []byte) error {
 		log.Printf("UnmarshalJSON Error")
 		return err
 	}
-	log.Printf("UnmarshalJSON: %s", tmp.ObjectMeta.SelfLink)
+	log.Printf("UnmarshalJSON: %s", tmp.Metadata.SelfLink)
 	tmp2 := Release(tmp)
 	*e = tmp2
 	return nil

diff --git a/pkg/release/handler.go b/pkg/release/handler.go
@@ -24,7 +24,7 @@ func NewHandler(clientset kubernetes.Interface) *ReleaseEventHandler {
 
 func (h *ReleaseEventHandler) OnAdd(obj interface{}) {
 	release := obj.(*deployv1.Release)
-	log.Printf("[REH] OnAdd %s", release.ObjectMeta.SelfLink)
+	log.Printf("[REH] OnAdd %s", release.Metadata.SelfLink)
 
 	if release.TypeMeta.Kind == "" {
 		log.Printf("ERROR Unknown release, skipping")
@@ -36,17 +36,17 @@ func (h *ReleaseEventHandler) OnAdd(obj interface{}) {
 func (h *ReleaseEventHandler) OnUpdate(oldObj, newObj interface{}) {
 	oldRelease := oldObj.(*deployv1.Release)
 	newRelease := newObj.(*deployv1.Release)
-	log.Printf("[REH] OnUpdate oldObj: %s", oldRelease.ObjectMeta.SelfLink)
-	log.Printf("[REH] OnUpdate newObj: %s", newRelease.ObjectMeta.SelfLink)
+	log.Printf("[REH] OnUpdate oldObj: %s", oldRelease.Metadata.SelfLink)
+	log.Printf("[REH] OnUpdate newObj: %s", newRelease.Metadata.SelfLink)
 }
 
 func (h *ReleaseEventHandler) OnDelete(obj interface{}) {
 	release := obj.(*deployv1.Release)
-	log.Printf("[REH] OnDelete %s", release.ObjectMeta.SelfLink)
+	log.Printf("[REH] OnDelete %s", release.Metadata.SelfLink)
 }
 
 func (h *ReleaseEventHandler) handle(release *deployv1.Release) {
-	log.Printf("Processing new release %s", release.ObjectMeta.Name)
+	log.Printf("Processing new release %s", release.Metadata.Name)
 	switch release.Spec.Strategy.Type {
 	case "Canary":
 		log.Printf("Starting Canary deployment")

diff --git a/pkg/release/strategy/canary.go b/pkg/release/strategy/canary.go
@@ -23,8 +23,8 @@ func (c *Canary) Run(release *deployv1.Release) error {
 	// First ensure that canary deployment object exists
 	canaryDeployment := &v1beta1.Deployment{
 		ObjectMeta: metav1.ObjectMeta{
-			Namespace: release.ObjectMeta.Namespace,
-			Name:      release.ObjectMeta.Name + "-canary",
+			Namespace: release.Metadata.Namespace,
+			Name:      release.Metadata.Name + "-canary",
 		},
 		Spec: v1beta1.DeploymentSpec{
 			Replicas: release.Spec.Replicas,
@@ -42,8 +42,8 @@ func (c *Canary) Run(release *deployv1.Release) error {
 	// Check if stable deployment object exists too
 	stableDeployment := &v1beta1.Deployment{
 		ObjectMeta: metav1.ObjectMeta{
-			Namespace: release.ObjectMeta.Namespace,
-			Name:      release.ObjectMeta.Name + "-stable",
+			Namespace: release.Metadata.Namespace,
+			Name:      release.Metadata.Name + "-stable",
 		},
 		Spec: v1beta1.DeploymentSpec{
 			Replicas: release.Spec.Replicas,