Generate join command based on selected node type when adding a node (#…

…4182)
replicatedhq · Nov 29, 2023 · d76ba5e · d76ba5e
1 parent dd0b7e3
commit d76ba5e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/pkg/kurl/configmap.go b/pkg/kurl/configmap.go
@@ -56,6 +56,10 @@ func UpdateConfigMap(client kubernetes.Interface, generateBootstrapToken, upload
 		return nil, errors.Wrap(err, "get configmap")
 	}
 
+	if cm.Data == nil {
+		cm.Data = map[string]string{}
+	}
+
 	// To be backwards compatible with kotsadm 1.1.0 and 1.2.0, if neither the bootstrap token nor
 	// the upload certs flags are set then generate a token for a worker node
 	if !uploadCerts {

diff --git a/web/src/components/apps/KurlClusterManagement.jsx b/web/src/components/apps/KurlClusterManagement.jsx
@@ -250,7 +250,11 @@ export class KurlClusterManagement extends Component {
         displayAddNode: true,
       },
       async () => {
-        await this.generateWorkerAddNodeCommand();
+        if (this.state.selectedNodeType === "secondary") {
+          await this.generateWorkerAddNodeCommand();
+        } else {
+          await this.generatePrimaryAddNodeCommand();
+        }
       }
     );
   };