Merge upstream 2021-06-15

.golangci.yml

@@ -4,6 +4,7 @@ run:
 linters:
   disable-all: true
   enable: [
+    "golint",
     "govet",
     "goimports",
     "gofmt",

.travis.yml

@@ -10,5 +10,5 @@ go:
 
 env:
   - TARGET=docker
-
+  
 script: make $TARGET

Dockerfile

@@ -7,6 +7,8 @@ WORKDIR /workspace
 # advantage of caching these layers in future builds.
 COPY go.mod go.mod
 COPY go.sum go.sum
+COPY apis/go.mod apis/go.mod
+COPY apis/go.sum apis/go.sum
 RUN go mod download
 
 COPY . .

Makefile

@@ -18,7 +18,6 @@ COVER_PROFILE = cover.out
 BIN_DIR := bin
 
 CRD_OPTIONS ?= "crd:trivialVersions=false,allowDangerousTypes=true,crdVersions=v1"
-CONTROLLER_GEN ?= go run sigs.k8s.io/controller-tools/cmd/controller-gen
 GOLANGCI_LINT ?= GOLANGCI_LINT_CACHE=$(GOLANGCI_LINT_CACHE) go run github.com/golangci/golangci-lint/cmd/golangci-lint
 KUSTOMIZE ?= go run sigs.k8s.io/kustomize/kustomize/v3
 
@@ -64,11 +63,14 @@ test: generate lint manifests unit ## Run common developer tests
 .PHONY: unit
 unit: ## Run unit tests
 	go test ./... $(GO_TEST_FLAGS) -coverprofile $(COVER_PROFILE)
+	cd apis/ && go test ./... $(GO_TEST_FLAGS) -coverprofile $(COVER_PROFILE)
 
 .PHONY: unit-cover
 unit-cover: ## Run unit tests with code coverage
 	go test -coverprofile=$(COVER_PROFILE) $(GO_TEST_FLAGS) ./...
 	go tool cover -func=$(COVER_PROFILE)
+	cd apis/ && go test -coverprofile=$(COVER_PROFILE) $(GO_TEST_FLAGS) ./...
+	cd apis/ && go tool cover -func=$(COVER_PROFILE)
 
 .PHONY: unit-verbose
 unit-verbose: ## Run unit tests with verbose output
@@ -81,15 +83,6 @@ unit-verbose: ## Run unit tests with verbose output
 .PHONY: linters
 linters: lint generate-check fmt-check
 
-.PHONY: sec
-sec: lint
-
-.PHONY: fmt
-fmt: lint
-
-.PHONY: vet
-vet: lint
-
 .PHONY: lint
 lint:
 	$(GOLANGCI_LINT) run
@@ -118,7 +111,7 @@ demo: generate lint manifests ## Run in demo mode
 	go run -ldflags $(LDFLAGS) ./main.go -namespace=$(RUN_NAMESPACE) -dev -demo-mode
 
 .PHONY: run-test-mode
-run-test-mode: generate fmt vet manifests ## Run against the configured Kubernetes cluster in ~/.kube/config
+run-test-mode: generate fmt-check lint manifests ## Run against the configured Kubernetes cluster in ~/.kube/config
 	go run -ldflags $(LDFLAGS) ./main.go -namespace=$(RUN_NAMESPACE) -dev -test-mode
 
 .PHONY: install
@@ -134,14 +127,19 @@ deploy: manifests ## Deploy controller in the configured Kubernetes cluster in ~
 	cd config/manager && kustomize edit set image controller=${IMG}
 	$(KUSTOMIZE) build config/default | kubectl apply -f -
 
+tools/bin/controller-gen: go.mod
+	go build -o $@ sigs.k8s.io/controller-tools/cmd/controller-gen
+
 .PHONY: manifests
-manifests: ## Generate manifests e.g. CRD, RBAC etc.
-	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases
+manifests: tools/bin/controller-gen ## Generate manifests e.g. CRD, RBAC etc.
+	cd apis; ../$< $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=../config/crd/bases
+	$< rbac:roleName=manager-role paths="./..." output:rbac:artifacts:config=config/rbac
 	$(KUSTOMIZE) build config/default > config/render/capm3.yaml
 
 .PHONY: generate
-generate: ## Generate code
-	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
+generate: tools/bin/controller-gen ## Generate code
+	cd apis; ../$< object:headerFile="../hack/boilerplate.go.txt" paths="./..."
+	$< object:headerFile="hack/boilerplate.go.txt" paths="./..."
 
 ## --------------------------------------
 ## Docker Targets

apis/go.mod

@@ -0,0 +1,10 @@
+module github.com/metal3-io/baremetal-operator/apis
+
+go 1.16
+
+require (
+	github.com/stretchr/testify v1.7.0
+	k8s.io/api v0.20.2
+	k8s.io/apimachinery v0.20.2
+	sigs.k8s.io/controller-runtime v0.7.0
+)

apis/metal3.io/v1alpha1/baremetalhost_types.go

@@ -39,7 +39,7 @@ const (
 	// an immediate requeue)
 	PausedAnnotation = "baremetalhost.metal3.io/paused"
 
-	// Detached is the annotation which stops provisioner management of the host
+	// DetachedAnnotation is the annotation which stops provisioner management of the host
 	// unlike in the paused case, the host status may be updated
 	DetachedAnnotation = "baremetalhost.metal3.io/detached"
 
@@ -149,7 +149,7 @@ const (
 	// PreparationError is an error condition occurring when do
 	// cleaning steps failed.
 	PreparationError ErrorType = "preparation error"
-	// ProvisioningError is an error condition occuring when the controller
+	// ProvisioningError is an error condition occurring when the controller
 	// fails to provision or deprovision the Host.
 	ProvisioningError ErrorType = "provisioning error"
 	// PowerManagementError is an error condition occurring when the
@@ -289,6 +289,24 @@ type RAIDConfig struct {
 	SoftwareRAIDVolumes []SoftwareRAIDVolume `json:"softwareRAIDVolumes,omitempty"`
 }
 
+// FirmwareConfig contains the configuration that you want to configure BIOS settings in Bare metal server
+type FirmwareConfig struct {
+	// Supports the virtualization of platform hardware.
+	// This supports following options: true, false.
+	// +kubebuilder:validation:Enum=true;false
+	VirtualizationEnabled *bool `json:"virtualizationEnabled,omitempty"`
+
+	// Allows a single physical processor core to appear as several logical processors.
+	// This supports following options: true, false.
+	// +kubebuilder:validation:Enum=true;false
+	SimultaneousMultithreadingEnabled *bool `json:"simultaneousMultithreadingEnabled,omitempty"`
+
+	// SR-IOV support enables a hypervisor to create virtual instances of a PCI-express device, potentially increasing performance.
+	// This supports following options: true, false.
+	// +kubebuilder:validation:Enum=true;false
+	SriovEnabled *bool `json:"sriovEnabled,omitempty"`
+}
+
 // BareMetalHostSpec defines the desired state of BareMetalHost
 type BareMetalHostSpec struct {
 	// Important: Run "make generate manifests" to regenerate code
@@ -306,6 +324,9 @@ type BareMetalHostSpec struct {
 	// RAID configuration for bare metal server
 	RAID *RAIDConfig `json:"raid,omitempty"`
 
+	// BIOS configuration for bare metal server
+	Firmware *FirmwareConfig `json:"firmware,omitempty"`
+
 	// What is the name of the hardware profile for this host? It
 	// should only be necessary to set this when inspection cannot
 	// automatically determine the profile.
@@ -442,6 +463,16 @@ const (
 	TeraByte          = GigaByte * 1000
 )
 
+// DiskType is a disk type, i.e. HDD, SSD, NVME.
+type DiskType string
+
+// DiskType constants.
+const (
+	HDD  DiskType = "HDD"
+	SSD  DiskType = "SSD"
+	NVME DiskType = "NVME"
+)
+
 // CPU describes one processor on the host.
 type CPU struct {
 	Arch           string     `json:"arch,omitempty"`
@@ -457,9 +488,17 @@ type Storage struct {
 	// may not be stable across reboots.
 	Name string `json:"name,omitempty"`
 
-	// Whether this disk represents rotational storage
+	// Whether this disk represents rotational storage.
+	// This field is not recommended for usage, please
+	// prefer using 'Type' field instead, this field
+	// will be deprecated eventually.
 	Rotational bool `json:"rotational,omitempty"`
 
+	// Device type, one of: HDD, SSD, NVME.
+	// +kubebuilder:validation:Optional
+	// +kubebuilder:validation:Enum=HDD;SSD;NVME;
+	Type DiskType `json:"type,omitempty"`
+
 	// The size of the disk in Bytes
 	SizeBytes Capacity `json:"sizeBytes,omitempty"`
 
@@ -698,6 +737,9 @@ type ProvisionStatus struct {
 
 	// The Raid set by the user
 	RAID *RAIDConfig `json:"raid,omitempty"`
+
+	// The Bios set by the user
+	Firmware *FirmwareConfig `json:"firmware,omitempty"`
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

config/basic-auth/default/credentials_patch.yaml

@@ -21,4 +21,4 @@ spec:
           secretName: ironic-credentials
       - name: ironic-inspector-credentials
         secret:
-          secretName: ironic-inspector-credentials
+          secretName: ironic-inspector-credentials

config/basic-auth/tls/credentials_patch.yaml

@@ -21,4 +21,4 @@ spec:
           secretName: ironic-credentials
       - name: ironic-inspector-credentials
         secret:
-          secretName: ironic-inspector-credentials
+          secretName: ironic-inspector-credentials

config/crd/bases/metal3.io_baremetalhosts.yaml

@@ -132,6 +132,28 @@ spec:
               externallyProvisioned:
                 description: ExternallyProvisioned means something else is managing the image running on the host and the operator should only manage the power status and hardware inventory inspection. If the Image field is filled in, this field is ignored.
                 type: boolean
+              firmware:
+                description: BIOS configuration for bare metal server
+                properties:
+                  simultaneousMultithreadingEnabled:
+                    description: 'Allows a single physical processor core to appear as several logical processors. This supports following options: true, false.'
+                    enum:
+                    - true
+                    - false
+                    type: boolean
+                  sriovEnabled:
+                    description: 'SR-IOV support enables a hypervisor to create virtual instances of a PCI-express device, potentially increasing performance. This supports following options: true, false.'
+                    enum:
+                    - true
+                    - false
+                    type: boolean
+                  virtualizationEnabled:
+                    description: 'Supports the virtualization of platform hardware. This supports following options: true, false.'
+                    enum:
+                    - true
+                    - false
+                    type: boolean
+                type: object
               hardwareProfile:
                 description: What is the name of the hardware profile for this host? It should only be necessary to set this when inspection cannot automatically determine the profile.
                 type: string
@@ -495,7 +517,7 @@ spec:
                           description: The Linux device name of the disk, e.g. "/dev/sda". Note that this may not be stable across reboots.
                           type: string
                         rotational:
-                          description: Whether this disk represents rotational storage
+                          description: Whether this disk represents rotational storage. This field is not recommended for usage, please prefer using 'Type' field instead, this field will be deprecated eventually.
                           type: boolean
                         serialNumber:
                           description: The serial number of the device
@@ -504,6 +526,13 @@ spec:
                           description: The size of the disk in Bytes
                           format: int64
                           type: integer
+                        type:
+                          description: 'Device type, one of: HDD, SSD, NVME.'
+                          enum:
+                          - HDD
+                          - SSD
+                          - NVME
+                          type: string
                         vendor:
                           description: The name of the vendor of the device
                           type: string
@@ -614,6 +643,28 @@ spec:
                     - UEFISecureBoot
                     - legacy
                     type: string
+                  firmware:
+                    description: The Bios set by the user
+                    properties:
+                      simultaneousMultithreadingEnabled:
+                        description: 'Allows a single physical processor core to appear as several logical processors. This supports following options: true, false.'
+                        enum:
+                        - true
+                        - false
+                        type: boolean
+                      sriovEnabled:
+                        description: 'SR-IOV support enables a hypervisor to create virtual instances of a PCI-express device, potentially increasing performance. This supports following options: true, false.'
+                        enum:
+                        - true
+                        - false
+                        type: boolean
+                      virtualizationEnabled:
+                        description: 'Supports the virtualization of platform hardware. This supports following options: true, false.'
+                        enum:
+                        - true
+                        - false
+                        type: boolean
+                    type: object
                   image:
                     description: Image holds the details of the last image successfully provisioned to the host.
                     properties:

config/default/manager_auth_proxy_patch.yaml

@@ -10,7 +10,7 @@ spec:
     spec:
       containers:
       - name: kube-rbac-proxy
-        image: gcr.io/kubebuilder/kube-rbac-proxy:v0.5.0
+        image: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0
         args:
         - "--secure-listen-address=0.0.0.0:8443"
         - "--upstream=http://127.0.0.1:8085/"