From 386aa3a7af11ff18f71b0cfda956d4ff2eac68aa Mon Sep 17 00:00:00 2001
From: Anjan Nath <kaludios@gmail.com>
Date: Wed, 15 Jan 2025 13:12:51 +0530
Subject: [PATCH] remove code to reassign new cluster id

this is done by a systemd service in the bundle
so the code on crc can be removed
---
 pkg/crc/cluster/cluster.go | 27 ---------------------------
 pkg/crc/machine/start.go   |  4 ----
 2 files changed, 31 deletions(-)

diff --git a/pkg/crc/cluster/cluster.go b/pkg/crc/cluster/cluster.go
index e07c6a19e6..da963715c9 100644
--- a/pkg/crc/cluster/cluster.go
+++ b/pkg/crc/cluster/cluster.go
@@ -22,7 +22,6 @@ import (
 	crctls "github.com/crc-org/crc/v2/pkg/crc/tls"
 	"github.com/crc-org/crc/v2/pkg/crc/validation"
 	crcstrings "github.com/crc-org/crc/v2/pkg/strings"
-	"github.com/pborman/uuid"
 )
 
 // #nosec G101
@@ -320,32 +319,6 @@ func RemoveOldRenderedMachineConfig(ocConfig oc.Config) error {
 	return nil
 }
 
-func EnsureClusterIDIsNotEmpty(ctx context.Context, ocConfig oc.Config) error {
-	if err := WaitForOpenshiftResource(ctx, ocConfig, "clusterversion"); err != nil {
-		return err
-	}
-
-	stdout, stderr, err := ocConfig.RunOcCommand("get", "clusterversion", "version", "-o", `jsonpath="{['spec']['clusterID']}"`)
-	if err != nil {
-		return fmt.Errorf("Failed to get clusterversion %v: %s", err, stderr)
-	}
-	if strings.TrimSpace(stdout) != "" {
-		return nil
-	}
-
-	logging.Info("Updating cluster ID...")
-	clusterID := uuid.New()
-	cmdArgs := []string{"patch", "clusterversion", "version", "-p",
-		fmt.Sprintf(`'{"spec":{"clusterID":"%s"}}'`, clusterID), "--type", "merge"}
-
-	_, stderr, err = ocConfig.RunOcCommand(cmdArgs...)
-	if err != nil {
-		return fmt.Errorf("Failed to update cluster ID %v: %s", err, stderr)
-	}
-
-	return nil
-}
-
 func AddProxyConfigToCluster(ctx context.Context, sshRunner *ssh.Runner, ocConfig oc.Config, proxy *httpproxy.ProxyConfig) error {
 	type trustedCA struct {
 		Name string `json:"name"`
diff --git a/pkg/crc/machine/start.go b/pkg/crc/machine/start.go
index b46122e6f4..9fad1815a7 100644
--- a/pkg/crc/machine/start.go
+++ b/pkg/crc/machine/start.go
@@ -557,10 +557,6 @@ func (client *client) Start(ctx context.Context, startConfig types.StartConfig)
 		return nil, errors.Wrap(err, "Failed to update kubeadmin user password")
 	}
 
-	if err := cluster.EnsureClusterIDIsNotEmpty(ctx, ocConfig); err != nil {
-		return nil, errors.Wrap(err, "Failed to update cluster ID")
-	}
-
 	if client.monitoringEnabled() {
 		logging.Info("Enabling cluster monitoring operator...")
 		if err := cluster.StartMonitoring(ocConfig); err != nil {