From 438edbfd5a9a72992803d45addb1f45b10a0b62f Mon Sep 17 00:00:00 2001
From: hlihhovac <hlihovac@gmail.com>
Date: Mon, 24 Feb 2020 19:09:29 +0100
Subject: [PATCH] fix issue #66 (#67)

replace "extensions/v1beta1" with "apps/v1" for Deployment and ReplicaSet
---
 cmd/trace.go   | 10 +++++-----
 print/print.go | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/cmd/trace.go b/cmd/trace.go
index 2c49a65..894752d 100644
--- a/cmd/trace.go
+++ b/cmd/trace.go
@@ -20,7 +20,7 @@ const (
 	v1Service                   = "v1/Service"
 	v1Pod                       = "v1/Pod"
 	deployment                  = "Deployment"
-	extensionsV1Beta1ReplicaSet = "extensions/v1beta1/ReplicaSet"
+	v1ReplicaSet                = "v1/ReplicaSet"
 )
 
 func init() {
@@ -103,13 +103,13 @@ func traceService(namespace, name string) {
 
 func traceDeployment(namespace, name string) {
 	// API server should rewrite this to apps/v1beta2, apps/v1beta2, or apps/v1 as appropriate.
-	deploymentEvents, err := watch.Forever("extensions/v1beta1", "Deployment",
+	deploymentEvents, err := watch.Forever("apps/v1", "Deployment",
 		watch.ThisObject(namespace, name))
 	if err != nil {
 		log.Fatal(err)
 	}
 
-	replicaSetEvents, err := watch.Forever("extensions/v1beta1", "ReplicaSet",
+	replicaSetEvents, err := watch.Forever("apps/v1", "ReplicaSet",
 		watch.ObjectsOwnedBy(namespace, name))
 	if err != nil {
 		log.Fatal(err)
@@ -150,9 +150,9 @@ func traceDeployment(namespace, name string) {
 			} else {
 				repSets[o.GetName()] = e
 			}
-			table[extensionsV1Beta1ReplicaSet] = []k8sWatch.Event{}
+			table[v1ReplicaSet] = []k8sWatch.Event{}
 			for _, rsEvent := range repSets {
-				table[extensionsV1Beta1ReplicaSet] = append(table[extensionsV1Beta1ReplicaSet], rsEvent)
+				table[v1ReplicaSet] = append(table[v1ReplicaSet], rsEvent)
 			}
 		case e := <-podEvents:
 			o := e.Object.(*unstructured.Unstructured)
diff --git a/print/print.go b/print/print.go
index 88951d6..83ac497 100644
--- a/print/print.go
+++ b/print/print.go
@@ -17,11 +17,11 @@ import (
 )
 
 const (
-	v1Endpoints                 = "v1/Endpoints"
-	v1Service                   = "v1/Service"
-	v1Pod                       = "v1/Pod"
-	deployment                  = "Deployment"
-	extensionsV1Beta1ReplicaSet = "extensions/v1beta1/ReplicaSet"
+	v1Endpoints  = "v1/Endpoints"
+	v1Service    = "v1/Service"
+	v1Pod        = "v1/Pod"
+	deployment   = "Deployment"
+	v1ReplicaSet = "v1/ReplicaSet"
 
 	prefix = "\n       - "
 
@@ -196,7 +196,7 @@ func DeploymentWatchTable(w *uilive.Writer, table map[string][]k8sWatch.Event) {
 	}
 	var prevRepSet *unstructured.Unstructured
 	var prevRepSetSpec *repSet
-	if events, hasRs := table[extensionsV1Beta1ReplicaSet]; hasRs {
+	if events, hasRs := table[v1ReplicaSet]; hasRs {
 		for _, e := range events {
 			rs := e.Object.(*unstructured.Unstructured)
 			repSetRevision, err := parseRevision(rs)