MULTIARCH-4515: Add new files for agent-based installer (LPAR support for s390x)staller

Add LPAR support for agend-based installer and bump version.

Signed-off-by: Amadeus Podvratnik <[email protected]>

Author: apodvrat

cmd/openshift-install/testdata/agent/pxe/configurations/sno_s390x.txt

@@ -0,0 +1,78 @@
+skip # Verify a default configuration for the SNO topology for s390x architecture
+
+exec openshift-install agent create pxe-files --dir $WORK
+
+stderr 'Created boot artefacts for s390x'
+
+exists $WORK/boot-artifacts/agent.s390x-initrd.img
+exists $WORK/boot-artifacts/agent.s390x-rootfs.img
+exists $WORK/boot-artifacts/agent.s390x-kernel.img
+exists $WORK/boot-artifacts/agent.s390x-generic.ins
+exists $WORK/boot-artifacts/agent.s390x-initrd.addrsize
+exists $WORK/auth/kubeconfig
+exists $WORK/auth/kubeadmin-password
+
+# no ipxe file in case of s390x
+
+-- install-config.yaml --
+apiVersion: v1
+baseDomain: test.metalkube.org
+controlPlane: 
+  name: master
+  replicas: 1
+  architecture: s390x
+compute: 
+- name: worker
+  replicas: 0
+  architecture: s390x
+metadata:
+  namespace: cluster0
+  name: ostest
+networking:
+  clusterNetwork:
+  - cidr: 10.128.0.0/14 
+    hostPrefix: 23 
+  networkType: OVNKubernetes
+  machineNetwork:
+  - cidr: 192.168.111.0/24
+  serviceNetwork: 
+  - 172.30.0.0/16
+platform:
+  none: {}
+sshKey: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDK6UTEydcEKzuNdPaofn8Z2DwgHqdcionLZBiPf/zIRNco++etLsat7Avv7yt04DINQd5zjxIFgG8jblaUB5E5C9ClUcMwb52GO0ay2Y9v1uBv1a4WhI3peKktAzYNk0EBMQlJtXPjRMrC9ylBPh+DsBHMu+KmDnfk7PIwyN4efC8k5kSRuPWoNdme1rz2+umU8FSmaWTHIajrbspf4GQbsntA5kuKEtDbfoNCU97o2KrRnUbeg3a8hwSjfh3u6MhlnGcg5K2Ij+zivEsWGCLKYUtE1ErqwfIzwWmJ6jnV66XCQGHf4Q1iIxqF7s2a1q24cgG2Z/iDXfqXrCIfy4P7b/Ztak3bdT9jfAdVZtdO5/r7I+O5hYhF86ayFlDWzZWP/ByiSb+q4CQbfVgK3BMmiAv2MqLHdhesmD/SmIcoOWUF6rFmRKZVFFpKpt5ATNTgUJ3JRowoXrrDruVXClUGRiCS6Zabd1rZ3VmTchaPJwtzQMdfIWISXj+Ig+C4UK0=
+pullSecret: '{"auths": {"quay.io": {"auth": "c3VwZXItc2VjcmV0Cg=="}}}'
+
+-- agent-config.yaml --
+apiVersion: v1alpha1
+metadata:
+  name: ostest
+  namespace: cluster0
+rendezvousIP: 192.168.111.20
+hosts:
+  - hostname: master-1
+    role: master
+    interfaces:
+      - name: eth0
+        macAddress: 02:ec:01:00:00:89
+    networkConfig:
+      interfaces:
+        - name: eth0
+          type: ethernet
+          state: up
+          mac-address: 02:ec:01:00:00:89
+          ipv4:
+            enabled: true
+            address:
+              - ip: 172.23.236.86
+                prefix-length: 24
+            dhcp: false
+      dns-resolver:
+        config:
+          server:
+            - 172.23.236.86
+      routes:
+        config:
+          - destination: 0.0.0.0/0
+            next-hop-address: 172.23.236.86
+            next-hop-interface: eth0
+            table-id: 254

go.mod

@@ -66,7 +66,7 @@ require (
 	github.com/nutanix-cloud-native/prism-go-client v0.3.4
 	github.com/onsi/gomega v1.33.0
 	github.com/openshift/api v0.0.0-20240517002838-931fa9860c01
-	github.com/openshift/assisted-image-service v0.0.0-20240506123319-82517255ca17
+	github.com/openshift/assisted-image-service v0.0.0-20240607085136-02df2e56dde6
 	github.com/openshift/assisted-service/api v0.0.0
 	github.com/openshift/assisted-service/client v0.0.0
 	github.com/openshift/assisted-service/models v0.0.0

go.sum

@@ -1973,8 +1973,8 @@ github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b h1
 github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b/go.mod h1:3OVijpioIKYWTqjiG0zfF6wvoJ4fAXGbjdZuI2NgsRQ=
 github.com/openshift/api v0.0.0-20240517002838-931fa9860c01 h1:X3PJCyGHG5aM9yUTb8yaLjR43Qp1lvsT2rMlcdl4G+c=
 github.com/openshift/api v0.0.0-20240517002838-931fa9860c01/go.mod h1:CxgbWAlvu2iQB0UmKTtRu1YfepRg1/vJ64n2DlIEVz4=
-github.com/openshift/assisted-image-service v0.0.0-20240506123319-82517255ca17 h1:rsTD5h6S3dCgAClbwWi/6AIo2twckeJEf+j4EZYkwII=
-github.com/openshift/assisted-image-service v0.0.0-20240506123319-82517255ca17/go.mod h1:o2H5VwQhUD8P6XsK6dRmKpCCJqVvv12KJQZBXmcCXCU=
+github.com/openshift/assisted-image-service v0.0.0-20240607085136-02df2e56dde6 h1:U6ve+dnHlHhAELoxX+rdFOHVhoaYl0l9qtxwYtsO6C0=
+github.com/openshift/assisted-image-service v0.0.0-20240607085136-02df2e56dde6/go.mod h1:o2H5VwQhUD8P6XsK6dRmKpCCJqVvv12KJQZBXmcCXCU=
 github.com/openshift/assisted-service/api v0.0.0-20230831114549-1922eda29cf8 h1:+fZLKbycDo4JeLwPGVSAgf2XPaJGLM341l9ZfrrlxG0=
 github.com/openshift/assisted-service/api v0.0.0-20230831114549-1922eda29cf8/go.mod h1:PmMnbVno5ocinfELDdKOaatvT5ucJLrau+fjHQNeCiY=
 github.com/openshift/assisted-service/client v0.0.0-20230831114549-1922eda29cf8 h1:9NpCGby6O44BlWqWCbd8wcN4QwBebR8McQGrjTwhlzQ=

pkg/asset/agent/image/agentpxefiles.go

@@ -68,6 +68,7 @@ func (a *AgentPXEFiles) Generate(dependencies asset.Parents) error {
 
 // PersistToFile writes the PXE assets in the assets folder named pxe.
 func (a *AgentPXEFiles) PersistToFile(directory string) error {
+	var kernelFileType string
 	// If the imageReader is not set then it means that either one of the AgentPXEFiles
 	// dependencies or the asset itself failed for some reason
 	if a.imageReader == nil {
@@ -92,10 +93,20 @@ func (a *AgentPXEFiles) PersistToFile(directory string) error {
 	if err != nil {
 		return err
 	}
-	kernelFileType := "vmlinuz"
-	if a.cpuArch == arch.RpmArch(types.ArchitectureS390X) {
+
+	switch a.cpuArch {
+	case arch.RpmArch(types.ArchitectureS390X):
+
 		kernelFileType = "kernel.img"
+
+		err = a.handleAdditionals390xArtifacts(bootArtifactsFullPath)
+		if err != nil {
+			return err
+		}
+	default:
+		kernelFileType = "vmlinuz"
 	}
+
 	agentVmlinuzFile := filepath.Join(bootArtifactsFullPath, fmt.Sprintf("agent.%s-%s", a.cpuArch, kernelFileType))
 	kernelReader, err := os.Open(filepath.Join(a.tmpPath, "images", "pxeboot", kernelFileType))
 	if err != nil {
@@ -212,3 +223,37 @@ func getKernelArgs(filepath string) (string, error) {
 	kernelArgs := liveISOArgMatch.ReplaceAllString(args.DefaultKernelArgs, "")
 	return kernelArgs, nil
 }
+
+func (a *AgentPXEFiles) handleAdditionals390xArtifacts(bootArtifactsFullPath string) error {
+	// initrd is already copied and file pointer is at EOF so move it to start again.
+	_, err := a.imageReader.Seek(0, io.SeekStart)
+	if err != nil {
+		return err
+	}
+
+	agentInitrdAddrFilePath := filepath.Join(a.tmpPath, "images", "initrd.addrsize")
+	addrsizeFile, err := isoeditor.NewInitrdAddrsizeReader(agentInitrdAddrFilePath, a.imageReader)
+	if err != nil {
+		return err
+	}
+
+	agentInitrdAddrFile := filepath.Join(bootArtifactsFullPath, fmt.Sprintf("agent.%s-initrd.addrsize", a.cpuArch))
+	err = copyfile(agentInitrdAddrFile, addrsizeFile)
+	if err != nil {
+		return err
+	}
+
+	agentINSFile := filepath.Join(bootArtifactsFullPath, fmt.Sprintf("agent.%s-generic.ins", a.cpuArch))
+	genericReader, err := os.Open(filepath.Join(a.tmpPath, "generic.ins"))
+	if err != nil {
+		return err
+	}
+	defer genericReader.Close()
+
+	err = copyfile(agentINSFile, genericReader)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}

vendor/github.com/openshift/assisted-image-service/pkg/isoeditor/initrd_addrsize.go

@@ -990,7 +990,7 @@ github.com/openshift/api/machineconfiguration/v1
 github.com/openshift/api/operator/v1
 github.com/openshift/api/operator/v1alpha1
 github.com/openshift/api/route/v1
-# github.com/openshift/assisted-image-service v0.0.0-20240506123319-82517255ca17
+# github.com/openshift/assisted-image-service v0.0.0-20240607085136-02df2e56dde6
 ## explicit; go 1.21
 github.com/openshift/assisted-image-service/pkg/isoeditor
 github.com/openshift/assisted-image-service/pkg/overlay