Make use of rev label in some files (#41485)

* refactor rev const to rev label * lint
istio · Oct 18, 2022 · 836483a · 836483a
1 parent 07447f6
commit 836483a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/tests/integration/helm/upgrade/util.go b/tests/integration/helm/upgrade/util.go
@@ -26,6 +26,7 @@ import (
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
+	"istio.io/api/label"
 	"istio.io/istio/pkg/test/framework"
 	"istio.io/istio/pkg/test/framework/components/cluster"
 	kubecluster "istio.io/istio/pkg/test/framework/components/cluster/kube"
@@ -50,7 +51,6 @@ revision: "%s"
 `
 	tarGzSuffix = ".tar.gz"
 
-	istioRevLabel     = "istio.io/rev"
 	prodTag           = "prod"
 	canaryTag         = "canary"
 	latestRevisionTag = "latest"
@@ -354,7 +354,7 @@ func performRevisionTagsUpgradeFunc(previousVersion, previousValidatingWebhookNa
 
 		// change the old namespace that was pointing to the old prod (1-10-0) to point to the
 		// 'latest' revision by setting the `istio.io/rev=prod` label on the namespace
-		err := oldNs.SetLabel(istioRevLabel, prodTag)
+		err := oldNs.SetLabel(label.IoIstioRev.Name, prodTag)
 		if err != nil {
 			t.Fatal("could not remove istio.io/rev from old namespace")
 		}

diff --git a/tools/bug-report/pkg/bugreport/bugreport.go b/tools/bug-report/pkg/bugreport/bugreport.go
@@ -29,6 +29,7 @@ import (
 	"github.com/kr/pretty"
 	"github.com/spf13/cobra"
 
+	label2 "istio.io/api/label"
 	"istio.io/istio/operator/pkg/util"
 	"istio.io/istio/pkg/kube"
 	"istio.io/istio/pkg/kube/inject"
@@ -49,7 +50,6 @@ import (
 
 const (
 	bugReportDefaultTimeout = 30 * time.Minute
-	istioRevisionLabel      = "istio.io/rev"
 )
 
 var (
@@ -215,7 +215,7 @@ func getIstioRevisions(resources *cluster2.Resources) []string {
 	revMap := sets.New[string]()
 	for _, podLabels := range resources.Labels {
 		for label, value := range podLabels {
-			if label == istioRevisionLabel {
+			if label == label2.IoIstioRev.Name {
 				revMap.Insert(value)
 			}
 		}