Support for s3-large-x86 (#49)

.github/workflows/master.yml

@@ -14,9 +14,8 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@master
-      - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      - uses: google-github-actions/setup-gcloud@master
         with:
-            version: '278.0.0'
             service_account_email: ${{ secrets.GCP_SA_EMAIL }}
             service_account_key: ${{ secrets.GCP_SA_KEY }}
       - name: Build image

.github/workflows/pull_request.yml

@@ -14,9 +14,8 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@master
-      - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      - uses: google-github-actions/setup-gcloud@master
         with:
-            version: '278.0.0'
             service_account_email: ${{ secrets.GCP_SA_EMAIL }}
             service_account_key: ${{ secrets.GCP_SA_KEY }}
       - name: Build image

.github/workflows/release.yml

@@ -14,14 +14,13 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@master
-      - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      - uses: google-github-actions/setup-gcloud@master
         with:
-            version: '278.0.0'
             service_account_email: ${{ secrets.GCP_SA_EMAIL }}
             service_account_key: ${{ secrets.GCP_SA_KEY }}
       - name: Get release
         id: get_release
-        uses: bruceadams/[email protected].1
+        uses: bruceadams/[email protected].2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Build image

Dockerfile

@@ -15,6 +15,7 @@ RUN apt-get update \
 	hdparm \
 	ipmitool \
 	liblz4-tool \
+	mdadm \
 	net-tools \
 	nvme-cli \
 	pciutils \

Makefile

@@ -48,6 +48,8 @@ ramdisk:
 		-files="/sbin/mkswap:sbin/mkswap" \
 		-files="/sbin/mkfs.fat:sbin/mkfs.fat" \
 		-files="/usr/sbin/nvme:sbin/nvme" \
+		-files="/sbin/mdadm:sbin/mdadm" \
+		-files="/sbin/mdmon:sbin/mdmon" \
 		-files="/sbin/sgdisk:sbin/sgdisk" \
 		-files="/etc/ssl/certs/ca-certificates.crt:etc/ssl/certs/ca-certificates.crt" \
 		-files="/usr/lib/x86_64-linux-gnu/libnss_files.so:lib/libnss_files.so.2" \
@@ -74,7 +76,7 @@ vagrant-destroy:
 	vagrant destroy -f
 
 vagrant-up: vagrant-destroy
-	vagrant up && virsh console metal-hammer_pxeclient
+	vagrant up && virsh console metal-hammerpxeclient
 
 # TODO make this work as with vagrant as a lightweight alternative.
 # networking is not working atm.
@@ -93,5 +95,5 @@ qemu-up:
           IMAGE_URL=http://192.168.121.1:4711/images/ubuntu/19.04/img.tar.lz4  \
           DEBUG=1  \
           BGP=1" \
-		-kernel metal-hammer-kernel \
+		-kernel metal-kernel \
 		-initrd metal-hammer-initrd.img.lz4

README.ice.md

@@ -0,0 +1,3 @@
+# Intel 100GB driver
+
+[Intel Driver Download](https://www.intel.com/content/www/us/en/search.html?ws=text#q=e810&t=Downloads&layout=table)

Vagrantfile

@@ -2,7 +2,7 @@
 # vi: set ft=ruby :
 
 current_file_path = File.dirname(__FILE__)
-kernel_path = File.join(current_file_path, "metal-hammer-kernel")
+kernel_path = File.join(current_file_path, "metal-kernel")
 initrd_path = File.join(current_file_path, "metal-hammer-initrd.img.lz4")
 
 Vagrant.configure("2") do |config|
@@ -37,7 +37,7 @@ Vagrant.configure("2") do |config|
           "METAL_CORE_ADDRESS=192.168.121.1:4712 " \
           "IMAGE_ID=default " \
           "SIZE_ID=v1-small-x86 " \
-          "IMAGE_URL=http://192.168.121.1:4711/images/ubuntu/19.04/img.tar.lz4 " \
+          "IMAGE_URL=http://192.168.121.1:4711/images/ubuntu/20.04/img.tar.lz4 " \
           "DEBUG=1 " \
           "BGP=1"
       domain.loader = "/usr/share/OVMF/OVMF_CODE.fd"

cmd/event/event_test.go

@@ -36,6 +36,7 @@ func TestNewEventEmitter(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
+		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
 			assert.Equal(t, tt.args.machineID, tt.want.machineID, "check machine ID")
 		})
@@ -65,6 +66,7 @@ func TestEventEmitter_Emit(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
+		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
 			tt.e.Emit(tt.args.eventType, tt.args.message)
 		})

cmd/network/ethtool.go

@@ -89,7 +89,7 @@ func (e *Ethtool) disableFirmwareLLDP(ifi string) {
 	}
 }
 
-var buggyIntelNicDriverNames = []string{"i40e", "ice"}
+var buggyIntelNicDriverNames = []string{"i40e"}
 
 // stopFirmwareLLDP stop Firmeware LLDP not persistent over reboots, only during runtime.
 // mount -t debugfs none /sys/kernel/debug
@@ -98,7 +98,7 @@ var buggyIntelNicDriverNames = []string{"i40e", "ice"}
 // or a loop over all directories in /sys/kernel/debug/i40e/*/command
 func (e *Ethtool) stopFirmwareLLDP() {
 	for _, driver := range buggyIntelNicDriverNames {
-		log.Info("ethtool", "stopFirmwareLLDP", "driver", driver)
+		log.Info("ethtool", "stopFirmwareLLDP for driver", driver)
 		debugFSPath := path.Join("/sys/kernel/debug", driver)
 		err := filepath.Walk(debugFSPath, func(path string, info os.FileInfo, err error) error {
 			if err != nil {

cmd/network/interfaces.go

@@ -6,8 +6,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/metal-stack/go-lldpd/pkg/lldp"
 	"github.com/metal-stack/metal-hammer/metal-core/models"
-	"github.com/metal-stack/metal-hammer/pkg/lldp"
 	"github.com/metal-stack/v"
 
 	log "github.com/inconshreveable/log15"

cmd/register/register_test.go

@@ -89,6 +89,7 @@ func Test_readHardwareDetails(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
+		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
 			r := &Register{
 				Client:      tt.fields.Client,
@@ -121,6 +122,7 @@ func TestHammer_readIPMIDetails(t *testing.T) {
 		// TODO: Add test cases.
 	}
 	for _, tt := range tests {
+		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
 			got, err := readIPMIDetails("00:00:00:00:00:01", nil)
 			if (err != nil) != tt.wantErr {

cmd/root.go

@@ -73,6 +73,13 @@ func Run(spec *Specification, hal hal.InBand) (*event.EventEmitter, error) {
 
 	hammer.Spec.ConsolePassword = password.Generate(16)
 
+	grpcClient, err := NewGrpcClient(certsClient, eventEmitter)
+	if err != nil {
+		log.Error("failed to fetch GRPC certificates", "error", err)
+		return eventEmitter, err
+	}
+	hammer.GrpcClient = grpcClient
+
 	err = hammer.createBmcSuperuser()
 	if err != nil {
 		log.Error("failed to update bmc superuser password", "error", err)
@@ -115,13 +122,6 @@ func Run(spec *Specification, hal hal.InBand) (*event.EventEmitter, error) {
 		return eventEmitter, errors.Wrap(err, "register")
 	}
 
-	grpcClient, err := NewGrpcClient(certsClient, eventEmitter)
-	if err != nil {
-		log.Error("failed to fetch GRPC certificates", "error", err)
-		return eventEmitter, err
-	}
-	hammer.GrpcClient = grpcClient
-
 	m, err := hammer.fetchMachine(spec.MachineUUID)
 	if err == nil && m != nil && m.Allocation != nil && m.Allocation.Reinstall != nil && *m.Allocation.Reinstall {
 		primaryDiskWiped := false

cmd/storage/disk.go

@@ -19,11 +19,15 @@ const (
 	EXT4 = FSType("ext4")
 	// SWAP is for the swap partition
 	SWAP = FSType("swap")
+	// None
+	NONE = FSType("none")
 
 	// GPTBoot EFI Boot Partition
 	GPTBoot = GPTType("ef00")
 	// GPTLinux Linux Partition
 	GPTLinux = GPTType("8300")
+	// GPTLinux Linux Partition
+	GPTLinuxLVM = GPTType("8e00")
 	// EFISystemPartition see https://en.wikipedia.org/wiki/EFI_system_partition
 	EFISystemPartition = "C12A7328-F81F-11D2-BA4B-00A0C93EC93B"
 	// GIB bytes of a Gigabyte
@@ -138,6 +142,39 @@ var (
 			},
 		},
 	}
+	s3LargeDisk = Disk{
+		Partitions: []*Partition{
+			{
+				Label:      "efi",
+				Number:     1,
+				MountPoint: "/boot/efi",
+				Filesystem: VFAT,
+				GPTType:    GPTBoot,
+				GPTGuid:    EFISystemPartition,
+				Size:       300,
+				Properties: make(map[string]string),
+			},
+			{
+				Label:      "root",
+				Number:     2,
+				MountPoint: "/",
+				Filesystem: EXT4,
+				GPTType:    GPTLinux,
+				Size:       50000,
+				Properties: make(map[string]string),
+			},
+			// Keep room for a additional Partition to be used by LVM
+			{
+				Label:      "vgroot",
+				Number:     3,
+				MountPoint: "",
+				Filesystem: NONE,
+				GPTType:    GPTLinuxLVM,
+				Size:       -1,
+				Properties: make(map[string]string),
+			},
+		},
+	}
 )
 
 // String for a Partition
@@ -155,6 +192,8 @@ func primaryDeviceBySize(sizeID string, disks []*models.ModelsV1MachineBlockDevi
 		return PrimaryDevice{DeviceName: "/dev/nvme0n1", PartitionPrefix: "p"}
 	case "y1-medium-x86":
 		return PrimaryDevice{DeviceName: "/dev/nvme0n1", PartitionPrefix: "p"}
+	case "s3-large-x86":
+		return PrimaryDevice{DeviceName: "/dev/sda", PartitionPrefix: ""}
 	default:
 		log.Info("getdisk", "sizeID unknown, try to guess disk", sizeID)
 		deviceName := guessDisk(disks)
@@ -210,6 +249,10 @@ func guessDisk(disks []*models.ModelsV1MachineBlockDevice) string {
 func GetDisk(imageID string, size *models.ModelsV1SizeResponse, disks []*models.ModelsV1MachineBlockDevice) Disk {
 	log.Info("getdisk", "imageID", imageID)
 	disk := diskByImage(imageID)
+	// TODO hack, must be moved to metal-api as all other code here as well
+	if *size.ID == "s3-large-x86" {
+		disk = s3LargeDisk
+	}
 
 	primaryDevice := primaryDeviceBySize(*size.ID, disks)
 	disk.Device = primaryDevice.DeviceName

cmd/storage/disk_test.go

@@ -52,6 +52,7 @@ func TestGuessDisk(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
+		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
 			if got := guessDisk(tt.disks); !reflect.DeepEqual(got, tt.want) {
 				t.Errorf("guessDisk() = %v, want %v", got, tt.want)

cmd/storage/mkfs.go

@@ -60,6 +60,8 @@ func assembleMKFSCommand(p *Partition) (string, []string, error) {
 		if p.Label != "" {
 			args = append(args, "-L", p.Label)
 		}
+	case NONE:
+		// noop
 	default:
 		return "", nil, errors.Errorf("unsupported filesystem format: %q", p.Filesystem)
 	}

cmd/storage/mkfs_test.go

@@ -53,6 +53,7 @@ func Test_assembleMKFSCommand(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
+		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
 			mkfs, mkfsargs, err := assembleMKFSCommand(tt.partition.p)
 			if (err != nil) != tt.wantErr {

cmd/storage/mount.go

@@ -40,6 +40,9 @@ func (disk Disk) MountPartitions(prefix string) error {
 	partitions := disk.SortByMountPoint()
 
 	for _, p := range partitions {
+		if p.Filesystem == NONE {
+			continue
+		}
 		err := p.Mount(prefix, false)
 		if err != nil {
 			return err

cmd/storage/sgdisk_test.go

@@ -52,6 +52,7 @@ func Test_assembleSGDiskCommand(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
+		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
 			if got := assembleSGDiskCommand(tt.disk.disk); !reflect.DeepEqual(got, tt.want) {
 				t.Errorf("assembleSGDiskCommand() = %v, want %v", got, tt.want)