fix installer owning name (istio#44928)

hanxiaop · web-flow · commit 729ec0340892 · 2023-05-16T10:12:15.000-07:00
diff --git a/operator/cmd/mesh/install.go b/operator/cmd/mesh/install.go
@@ -199,6 +199,8 @@ func Install(rootArgs *RootArgs, iArgs *InstallArgs, logOpts *log.Options, stdOu
 		return fmt.Errorf("could not configure logs: %s", err)
 	}
 
+	iop.Name = savedIOPName(iop)
+
 	// Detect whether previous installation exists prior to performing the installation.
 	exists := revtag.PreviousInstallExists(context.Background(), kubeClient.Kube())
 	rev := iop.Spec.Revision
@@ -302,7 +304,6 @@ func InstallManifests(iop *v1alpha12.IstioOperator, force bool, dryRun bool, kub
 	opts.ProgressLog.SetState(progress.StateComplete)
 
 	// Save a copy of what was installed as a CR in the cluster under an internal name.
-	iop.Name = savedIOPName(iop)
 	if iop.Annotations == nil {
 		iop.Annotations = make(map[string]string)
 	}

Original file line number	Diff line number	Diff line change
`@@ -199,6 +199,8 @@ func Install(rootArgs RootArgs, iArgs InstallArgs, logOpts *log.Options, stdOu`
`199`	`199`	`return fmt.Errorf("could not configure logs: %s", err)`
`200`	`200`	`}`
`201`	`201`
	`202`	`+ iop.Name = savedIOPName(iop)`
	`203`	`+`
`202`	`204`	`// Detect whether previous installation exists prior to performing the installation.`
`203`	`205`	`exists := revtag.PreviousInstallExists(context.Background(), kubeClient.Kube())`
`204`	`206`	`rev := iop.Spec.Revision`
`@@ -302,7 +304,6 @@ func InstallManifests(iop *v1alpha12.IstioOperator, force bool, dryRun bool, kub`
`302`	`304`	`opts.ProgressLog.SetState(progress.StateComplete)`
`303`	`305`
`304`	`306`	`// Save a copy of what was installed as a CR in the cluster under an internal name.`
`305`		`- iop.Name = savedIOPName(iop)`
`306`	`307`	`if iop.Annotations == nil {`
`307`	`308`	`iop.Annotations = make(map[string]string)`
`308`	`309`	`}`