Merge pull request #10041 from bear-redhat/issue/CORS-4275

CORS-4275: Add Windows support

Author: openshift-merge-bot[bot]

.gitattributes

@@ -0,0 +1,6 @@
+# the following files will be injected into the bootstrap node (CoreOS) as-is,
+# which must be in Unix line endings (LF)
+data/data/bootstrap/systemd/**/*.service text eol=lf
+data/data/bootstrap/systemd/**/*.socket text eol=lf
+data/data/bootstrap/systemd/**/*.conf text eol=lf
+data/data/bootstrap/files/** text eol=lf

pkg/asset/agent/image/ignition.go

@@ -316,14 +316,14 @@ func (a *Ignition) Generate(ctx context.Context, dependencies asset.Parents) err
 
 	// add ZTP manifests to manifestPath
 	for _, file := range agentManifests.FileList {
-		manifestFile := ignition.FileFromBytes(filepath.Join(manifestPath, filepath.Base(file.Filename)),
+		manifestFile := ignition.FileFromBytes(path.Join(manifestPath, filepath.Base(file.Filename)),
 			"root", 0600, file.Data)
 		config.Storage.Files = append(config.Storage.Files, manifestFile)
 	}
 
 	// add AgentConfig if provided
 	if agentConfigAsset.Config != nil {
-		agentConfigFile := ignition.FileFromBytes(filepath.Join(manifestPath, filepath.Base(agentConfigAsset.File.Filename)),
+		agentConfigFile := ignition.FileFromBytes(path.Join(manifestPath, filepath.Base(agentConfigAsset.File.Filename)),
 			"root", 0600, agentConfigAsset.File.Data)
 		config.Storage.Files = append(config.Storage.Files, agentConfigFile)
 	}
@@ -588,7 +588,7 @@ func addMacAddressToHostnameMappings(
 	}
 	for _, host := range agentHostsAsset.Hosts {
 		if host.Hostname != "" {
-			file := ignition.FileFromBytes(filepath.Join(hostnamesPath,
+			file := ignition.FileFromBytes(path.Join(hostnamesPath,
 				strings.ToLower(filepath.Base(host.Interfaces[0].MacAddress))),
 				"root", 0600, []byte(host.Hostname))
 			config.Storage.Files = append(config.Storage.Files, file)
@@ -602,8 +602,8 @@ func addHostConfig(config *igntypes.Config, agentHosts *agentconfig.AgentHosts)
 		return err
 	}
 
-	for path, content := range confs {
-		hostConfigFile := ignition.FileFromBytes(filepath.Join("/etc/assisted/hostconfig", path), "root", 0644, content)
+	for pathName, content := range confs {
+		hostConfigFile := ignition.FileFromBytes(path.Join("/etc/assisted/hostconfig", pathName), "root", 0644, content)
 		config.Storage.Files = append(config.Storage.Files, hostConfigFile)
 	}
 	return nil

pkg/asset/agent/image/unconfigured_ignition.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"net/url"
 	"os"
+	"path"
 	"path/filepath"
 	"strings"
 
@@ -236,7 +237,7 @@ func (a *UnconfiguredIgnition) Generate(_ context.Context, dependencies asset.Pa
 	}
 
 	for _, file := range ztpManifestsToInclude {
-		manifestFile := ignition.FileFromBytes(filepath.Join(manifestPath, filepath.Base(file.Filename)),
+		manifestFile := ignition.FileFromBytes(path.Join(manifestPath, filepath.Base(file.Filename)),
 			"root", 0600, file.Data)
 		config.Storage.Files = append(config.Storage.Files, manifestFile)
 	}

pkg/asset/ignition/bootstrap/common.go

@@ -682,7 +682,7 @@ func (a *Common) addParentFiles(dependencies asset.Parents) {
 
 	rootCA := &tls.RootCA{}
 	dependencies.Get(rootCA)
-	a.Config.Storage.Files = replaceOrAppend(a.Config.Storage.Files, ignition.FileFromBytes(filepath.Join(rootDir, rootCA.CertFile().Filename), "root", 0644, rootCA.Cert()))
+	a.Config.Storage.Files = replaceOrAppend(a.Config.Storage.Files, ignition.FileFromBytes(path.Join(rootDir, rootCA.CertFile().Filename), "root", 0644, rootCA.Cert()))
 }
 
 func replaceOrAppend(files []igntypes.File, file igntypes.File) []igntypes.File {

pkg/asset/ignition/bootstrap/cvoignore.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
+	"path"
 
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
@@ -18,10 +19,8 @@ import (
 
 var (
 	_ asset.WritableAsset = (*CVOIgnore)(nil)
-)
 
-const (
-	cvoOverridesFilename      = "manifests/cvo-overrides.yaml"
+	cvoOverridesFilename      = path.Join("manifests", "cvo-overrides.yaml")
 	originalOverridesFilename = "original_cvo_overrides.patch"
 )
 

pkg/asset/ignition/node.go

@@ -2,6 +2,7 @@ package ignition
 
 import (
 	"fmt"
+	"path"
 	"path/filepath"
 
 	"github.com/clarketm/json"
@@ -30,7 +31,10 @@ func Marshal(input interface{}) ([]byte, error) {
 func FilesFromAsset(pathPrefix string, username string, mode int, asset asset.WritableAsset) []igntypes.File {
 	var files []igntypes.File
 	for _, f := range asset.Files() {
-		files = append(files, FileFromBytes(filepath.Join(pathPrefix, f.Filename), username, mode, f.Data))
+		// f.Filename is using platform-specific path separators
+		// while its used in CoreOS, thus we need to convert it to Unix path separators
+		normalizedFilename := path.Join(pathPrefix, filepath.ToSlash(f.Filename))
+		files = append(files, FileFromBytes(normalizedFilename, username, mode, f.Data))
 	}
 	return files
 }

pkg/asset/manifests/additionaltrustbundleconfig.go

@@ -5,7 +5,7 @@ import (
 	"crypto/x509"
 	"encoding/pem"
 	"fmt"
-	"path/filepath"
+	"path"
 	"strings"
 
 	"github.com/pkg/errors"
@@ -20,7 +20,7 @@ import (
 )
 
 var (
-	additionalTrustBundleConfigFileName = filepath.Join(manifestDir, "user-ca-bundle-config.yaml")
+	additionalTrustBundleConfigFileName = path.Join(manifestDir, "user-ca-bundle-config.yaml")
 )
 
 const (

pkg/asset/manifests/cloudproviderconfig.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"path/filepath"
+	"path"
 
 	"github.com/IBM/vpc-go-sdk/vpcv1"
 	"github.com/pkg/errors"
@@ -43,7 +43,7 @@ import (
 )
 
 var (
-	cloudProviderConfigFileName = filepath.Join(manifestDir, "cloud-provider-config.yaml")
+	cloudProviderConfigFileName = path.Join(manifestDir, "cloud-provider-config.yaml")
 )
 
 const (

pkg/asset/manifests/clustercsidriver.go

@@ -2,7 +2,7 @@ package manifests
 
 import (
 	"context"
-	"path/filepath"
+	"path"
 
 	"github.com/pkg/errors"
 
@@ -19,7 +19,7 @@ import (
 )
 
 var (
-	clusterCSIDriverConfigFileName = filepath.Join(manifestDir, "cluster-csi-driver-config.yaml")
+	clusterCSIDriverConfigFileName = path.Join(manifestDir, "cluster-csi-driver-config.yaml")
 )
 
 // ClusterCSIDriverConfig generates the cluster-csi-driver-config.yaml file.

pkg/asset/manifests/dns.go

@@ -3,7 +3,7 @@ package manifests
 import (
 	"context"
 	"fmt"
-	"path/filepath"
+	"path"
 	"strings"
 
 	"github.com/pkg/errors"
@@ -35,7 +35,7 @@ import (
 )
 
 var (
-	dnsCfgFilename = filepath.Join(manifestDir, "cluster-dns-02-config.yml")
+	dnsCfgFilename = path.Join(manifestDir, "cluster-dns-02-config.yml")
 
 	combineGCPZoneInfo = func(project, zoneName string) string {
 		return fmt.Sprintf("project/%s/managedZones/%s", project, zoneName)