Merge pull request #2390 from kinarashah/rke24

[v1.1] init metadata only if metadataInitialized is false

cluster/cluster.go

@@ -705,9 +705,11 @@ func InitClusterObject(ctx context.Context, rkeConfig *v3.RancherKubernetesEngin
 		},
 	}
 	if !metadata.MetadataInitialized {
+		logrus.Debugf("metadataInitialized: [False] [%s]", rkeConfig.ClusterName)
 		if err := metadata.InitMetadata(ctx); err != nil {
 			return nil, err
 		}
+		logrus.Debugf("metadataInitialized: [%v] [%s]", metadata.MetadataInitialized, rkeConfig.ClusterName)
 	}
 	if len(c.ConfigPath) == 0 {
 		c.ConfigPath = pki.ClusterConfig

metadata/metadata.go

@@ -44,6 +44,9 @@ var (
 func InitMetadata(ctx context.Context) error {
 	kdmMutex.Lock()
 	defer kdmMutex.Unlock()
+	if MetadataInitialized {
+		return nil
+	}
 	data, err := loadData()
 	if err != nil {
 		return fmt.Errorf("failed to load data.json, error: %v", err)
@@ -53,6 +56,7 @@ func InitMetadata(ctx context.Context) error {
 	initServiceOptions(data)
 	initDockerOptions(data)
 	MetadataInitialized = true
+	logrus.Debugf("metadata initialized successfully")
 	return nil
 }