Merge upstream

.travis.yml

@@ -6,7 +6,7 @@ services:
   - docker
 
 go:
-  - "1.13.7"
+  - "1.15.3"
 
 env:
   - TARGET=unit-verbose

Dockerfile

@@ -1,12 +1,25 @@
-FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.7 AS builder
-WORKDIR /go/src/github.com/metal3-io/baremetal-operator
+# Build the manager binary
+FROM registry.hub.docker.com/library/golang:1.15.3 AS builder
+
+WORKDIR /workspace
+
+# Bring in the go dependencies before anything else so we can take
+# advantage of caching these layers in future builds.
+COPY go.mod go.mod
+COPY go.sum go.sum
+RUN go mod download
+
 COPY . .
-RUN make build
-RUN make tools
-
-FROM registry.svc.ci.openshift.org/ocp/4.7:base
-COPY --from=builder /go/src/github.com/metal3-io/baremetal-operator/bin/manager /baremetal-operator
-COPY --from=builder /go/src/github.com/metal3-io/baremetal-operator/bin/get-hardware-details /
-COPY --from=builder /go/src/github.com/metal3-io/baremetal-operator/bin/make-bm-worker /
-COPY --from=builder /go/src/github.com/metal3-io/baremetal-operator/bin/make-virt-host /
-RUN if ! rpm -q genisoimage; then yum install -y genisoimage && yum clean all && rm -rf /var/cache/yum/*; fi
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -a -o baremetal-operator main.go
+
+# Copy the controller-manager into a thin image
+# BMO has a dependency preventing us to use the static one,
+# using the base one instead
+FROM gcr.io/distroless/base:latest
+WORKDIR /
+COPY --from=builder /workspace/baremetal-operator .
+USER nonroot:nonroot
+ENTRYPOINT ["/baremetal-operator"]
+
+LABEL io.k8s.display-name="Metal3 BareMetal Operator" \
+      io.k8s.description="This is the image for the Metal3 BareMetal Operator."

Makefile

@@ -30,7 +30,7 @@ BUILD_VERSION ?= $(shell git describe --always --abbrev=40 --dirty)
 export LDFLAGS="-X github.com/metal3-io/baremetal-operator/pkg/version.Raw=${BUILD_VERSION} -X github.com/metal3-io/baremetal-operator/pkg/version.Commit=${SOURCE_GIT_COMMIT}"
 
 # Set some variables the operator expects to have in order to work
-# Those need to be the same as in deploy/ironic_ci.env
+# Those need to be the same as in config/default/ironic.env
 export OPERATOR_NAME=baremetal-operator
 export DEPLOY_KERNEL_URL=http://172.22.0.1:6180/images/ironic-python-agent.kernel
 export DEPLOY_RAMDISK_URL=http://172.22.0.1:6180/images/ironic-python-agent.initramfs
@@ -134,16 +134,17 @@ install: $(KUSTOMIZE) manifests ## Install CRDs into a cluster
 
 .PHONY: uninstall
 uninstall: $(KUSTOMIZE) manifests ## Uninstall CRDs from a cluster
-	kustomize build config/crd | kubectl delete -f -
+	$(KUSTOMIZE) build config/crd | kubectl delete -f -
 
 .PHONY: deploy
 deploy: $(KUSTOMIZE) manifests ## Deploy controller in the configured Kubernetes cluster in ~/.kube/config
 	cd config/manager && kustomize edit set image controller=${IMG}
-	kustomize build config/default | kubectl apply -f -
+	$(KUSTOMIZE) build config/default | kubectl apply -f -
 
 .PHONY: manifests
-manifests: $(CONTROLLER_GEN) ## 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: $(CONTROLLER_GEN) $(KUSTOMIZE) ## Generate manifests e.g. CRD, RBAC etc.
+	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases 
+	$(KUSTOMIZE) build config/default > config/render/capm3.yaml
 
 .PHONY: generate
 generate: $(CONTROLLER_GEN) ## Generate code
@@ -162,7 +163,7 @@ $(CONTROLLER_GEN):
 ## --------------------------------------
 
 .PHONY: docker
-docker: test ## Build the docker image
+docker: generate manifests ## Build the docker image
 	docker build . -t ${IMG}
 
 # Push the docker image

Tiltfile

@@ -60,7 +60,7 @@ def validate_auth():
 
 tilt_helper_dockerfile_header = """
 # Tilt image
-FROM golang:1.14 as tilt-helper
+FROM golang:1.15.3 as tilt-helper
 # Support live reloading with Tilt
 RUN wget --output-document /restart.sh --quiet https://raw.githubusercontent.com/windmilleng/rerun-process-wrapper/master/restart.sh  && \
     wget --output-document /start.sh --quiet https://raw.githubusercontent.com/windmilleng/rerun-process-wrapper/master/start.sh && \
@@ -139,7 +139,7 @@ def enable_provider(name):
     os.environ.update(substitutions)
 
     # Apply the kustomized yaml for this provider
-    yaml = str(kustomizesub(context + "/deploy/default"))
+    yaml = str(kustomizesub(context + "/config"))
     k8s_yaml(blob(yaml))
 
 def kustomizesub(folder):

apis/metal3.io/v1alpha1/baremetalhost_types.go

@@ -360,7 +360,8 @@ type CPU struct {
 
 // Storage describes one storage device (disk, SSD, etc.) on the host.
 type Storage struct {
-	// A name for the disk, e.g. "disk 1 (boot)"
+	// The Linux device name of the disk, e.g. "/dev/sda". Note that this
+	// may not be stable across reboots.
 	Name string `json:"name"`
 
 	// Whether this disk represents rotational storage
@@ -406,20 +407,21 @@ type VLAN struct {
 
 // NIC describes one network interface on the host.
 type NIC struct {
-	// The name of the NIC, e.g. "nic-1"
+	// The name of the network interface, e.g. "en0"
 	Name string `json:"name"`
 
-	// The name of the model, e.g. "virt-io"
+	// The vendor and product IDs of the NIC, e.g. "0x8086 0x1572"
 	Model string `json:"model"`
 
-	// The device MAC addr
+	// The device MAC address
 	// +kubebuilder:validation:Pattern=`[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}`
 	MAC string `json:"mac"`
 
-	// The IP address of the device
+	// The IP address of the interface. This will be an IPv4 address if one is
+	// present, and only an IPv6 address if there is no IPv4 address.
 	IP string `json:"ip"`
 
-	// The speed of the device
+	// The speed of the device in Gigabits per second
 	SpeedGbps int `json:"speedGbps"`
 
 	// The VLANs available

cmd/make-bm-worker/templates/templates.go

@@ -22,7 +22,7 @@ kind: BareMetalHost
 metadata:
   name: {{ .Name }}
 spec:
-  online: false
+  online: true
 {{- if .HardwareProfile }}
   hardwareProfile: {{ .HardwareProfile }}
 {{- end }}

cmd/make-bm-worker/templates/templates_test.go

@@ -51,7 +51,7 @@ kind: BareMetalHost
 metadata:
   name: hostname
 spec:
-  online: false
+  online: true
   hardwareProfile: hardware profile
   bmc:
     address: bmcAddress
@@ -86,7 +86,7 @@ kind: BareMetalHost
 metadata:
   name: hostname
 spec:
-  online: false
+  online: true
   bmc:
     address: bmcAddress
     credentialsName: hostname-bmc-secret
@@ -122,7 +122,7 @@ kind: BareMetalHost
 metadata:
   name: hostname
 spec:
-  online: false
+  online: true
   bmc:
     address: bmcAddress
     credentialsName: hostname-bmc-secret

cmd/make-virt-host/main.go

@@ -68,7 +68,7 @@ kind: BareMetalHost
 metadata:
   name: {{ .Domain }}
 spec:
-  online: false
+  online: true
   bmc:
     address: libvirt://192.168.122.1:{{ .BMCPort }}/
     credentialsName: {{ .Domain }}-bmc-secret

config/basic-auth/default/credentials.yaml

@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: controller-manager
+  namespace: system
 spec:
   template:
     spec:

config/basic-auth/default/kustomization.yaml

@@ -1,8 +1,9 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: metal3
+namespace: baremetal-operator-system
 resources:
 - ../../default
+- ../../namespace
 
 secretGenerator:
   - name: ironic-credentials

config/basic-auth/tls/credentials.yaml

@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: controller-manager
+  namespace: system
 spec:
   template:
     spec:

config/basic-auth/tls/kustomization.yaml

@@ -1,6 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: metal3
+namespace: baremetal-operator-system
 resources:
 - ../../tls