mastersList := provisioningInstance.Spec.Masters
workersList := provisioningInstance.Spec.Workers
kudPlugins := provisioningInstance.Spec.KUDPlugins
-
+ podSubnet := provisioningInstance.Spec.PodSubnet
bareMetalHostList, _ := listBareMetalHosts(r.bmhClient)
virtletVMList, _ := listVirtletVMs(r.clientset)
err = fmt.Errorf("IP address not found for host with MAC address %s \n", masterMAC)
return reconcile.Result{}, err
}
+ allString += masterLabel + " ansible_ssh_host=" + hostIPaddress + " ansible_ssh_port=22" + "\n"
}
- allString += masterLabel + " ansible_ssh_host=" + hostIPaddress + " ansible_ssh_port=22" + "\n"
if clusterType == "virtlet-vm" {
- allString = masterLabel + " ansible_ssh_host=" + hostIPaddress + " ansible_ssh_port=22" + " ansible_ssh_user=root" + " ansible_ssh_pass=root" + "\n"
+ allString += masterLabel + " ansible_ssh_host=" + hostIPaddress + " ansible_ssh_port=22" + " ansible_ssh_user=root" + " ansible_ssh_pass=root" + "\n"
}
masterString += masterLabel + "\n"
clusterData[masterTag + masterLabel] = hostIPaddress
fmt.Errorf("IP address not found for host with MAC address %s \n", workerMAC)
return reconcile.Result{}, err
}
+ allString += workerLabel + " ansible_ssh_host=" + hostIPaddress + " ansible_ssh_port=22" + "\n"
}
fmt.Printf("%s : %s \n", hostIPaddress, workerMAC)
- allString += workerLabel + " ansible_ssh_host=" + hostIPaddress + " ansible_ssh_port=22" + "\n"
if clusterType == "virtlet-vm" {
- allString = masterLabel + " ansible_ssh_host=" + hostIPaddress + " ansible_ssh_port=22" + " ansible_ssh_user=root" + " ansible_ssh_pass=root" + "\n"
+ allString += masterLabel + " ansible_ssh_host=" + hostIPaddress + " ansible_ssh_port=22" + " ansible_ssh_user=root" + " ansible_ssh_pass=root" + "\n"
}
workerString += workerLabel + "\n"
clusterData[workerTag + workerLabel] = hostIPaddress
return reconcile.Result{}, err
}
+ if clusterType != "virtlet-vm" {
_, err = hostFile.NewRawSection("ovn-central", masterString)
if err != nil {
fmt.Printf("Error occured while creating section \n %v", err)
fmt.Printf("Error occured while creating section \n %v", err)
return reconcile.Result{}, err
}
-
+ }
_, err = hostFile.NewRawSection("k8s-cluster:children", "kube-node\n" + "kube-master")
if err != nil {
fmt.Printf("Error occured while creating section \n %v", err)
hostFile.SaveTo(iniHostFilePath)
//Install KUD
- err = createKUDinstallerJob(clusterName, request.Namespace, clusterLabel, kudPlugins, r.clientset)
+ err = createKUDinstallerJob(clusterName, request.Namespace, clusterLabel, podSubnet, kudPlugins, r.clientset)
if err != nil {
fmt.Printf("Error occured while creating KUD Installer job for cluster %v\n ERROR: %v", clusterName, err)
return reconcile.Result{}, err
}
//Function to create job for KUD installation
-func createKUDinstallerJob(clusterName, namespace string, labels map[string]string, kudPlugins []string, clientset kubernetes.Interface) error{
+func createKUDinstallerJob(clusterName, namespace string, labels map[string]string, podSubnet string, kudPlugins []string, clientset kubernetes.Interface) error{
var backOffLimit int32 = 0
var privi bool = true
installerString := " ./installer --cluster " + clusterName
+ if len(podSubnet) > 0 {
+ installerString += " --network " + podSubnet
+ }
// Check if any plugin was specified
if len(kudPlugins) > 0 {
},
},
+ EnvFrom: []corev1.EnvFromSource{
+ {
+ ConfigMapRef: &corev1.ConfigMapEnvSource{LocalObjectReference: corev1.LocalObjectReference{Name: "kud-installer"}},
+ },
+ },
Command: []string{"/bin/sh","-c"},
Args: []string{"cp -r /.ssh /root/; chmod -R 600 /root/.ssh;" + installerString},
SecurityContext: &corev1.SecurityContext{