Merge pull request #3186 from cupakob/fix-reserved-words-as-variable-name

🌱 Rename variables

Author: kcp-ci-bot

cmd/compat/main.go

@@ -50,28 +50,28 @@ Flags:
 	}
 	oldfile, newfile := flag.Args()[0], flag.Args()[1]
 
-	old, err := parse(oldfile)
+	oldFileContent, err := parse(oldfile)
 	if err != nil {
 		log.Fatal(err)
 	}
-	new, err := parse(newfile)
+	newFileContent, err := parse(newfile)
 	if err != nil {
 		log.Fatal(err)
 	}
 
 	out, err := schemacompat.EnsureStructuralSchemaCompatibility(
 		field.NewPath(""),
 		// TODO: take flags for desired versions, instead of just assuming the first.
-		old.Spec.Versions[0].Schema.OpenAPIV3Schema,
-		new.Spec.Versions[0].Schema.OpenAPIV3Schema,
+		oldFileContent.Spec.Versions[0].Schema.OpenAPIV3Schema,
+		newFileContent.Spec.Versions[0].Schema.OpenAPIV3Schema,
 		*lcd)
 	if err != nil {
 		log.Fatal(err)
 	}
 
 	if *lcd {
-		old.Spec.Versions[0].Schema.OpenAPIV3Schema = out
-		b, err := yaml.Marshal(old)
+		oldFileContent.Spec.Versions[0].Schema.OpenAPIV3Schema = out
+		b, err := yaml.Marshal(oldFileContent)
 		if err != nil {
 			log.Fatal(err)
 		}

pkg/reconciler/tenancy/workspace/workspace_reconcile_phase.go

@@ -61,8 +61,8 @@ func (r *phaseReconciler) reconcile(ctx context.Context, workspace *tenancyv1alp
 
 		if initializers := workspace.Status.Initializers; len(initializers) > 0 {
 			after := time.Since(logicalCluster.CreationTimestamp.Time) / 5
-			if max := time.Minute * 10; after > max {
-				after = max
+			if maxDuration := time.Minute * 10; after > maxDuration {
+				after = maxDuration
 			}
 			logger.V(3).Info("LogicalCluster still has initializers, requeueing", "initializers", initializers, "after", after)
 			conditions.MarkFalse(workspace, tenancyv1alpha1.WorkspaceInitialized, tenancyv1alpha1.WorkspaceInitializedInitializerExists, conditionsv1alpha1.ConditionSeverityInfo, "Initializers still exist: %v", workspace.Status.Initializers)