NO-ISSUE: moving images to be multiplatform

.github/dependabot.yml

@@ -15,8 +15,12 @@ updates:
       - "ok-to-test"
       - "go"
       - "dependencies"
+    commit-message:
+      prefix: "NO-ISSUE"
 
   - package-ecosystem: "docker"
     directory: "/"
     schedule:
       interval: "weekly"
+    commit-message:
+      prefix: "NO-ISSUE"

Dockerfile.assisted-installer

@@ -1,4 +1,9 @@
-FROM registry.ci.openshift.org/openshift/release:golang-1.15 AS builder
+FROM --platform=$BUILDPLATFORM  golang:1.16 AS builder
+
+ARG TARGETPLATFORM
+
+WORKDIR /go/src/github.com/openshift/assisted-installer-agent
+
 ENV GOFLAGS=-mod=mod
 WORKDIR /go/src/github.com/openshift/assisted-installer
 
@@ -9,9 +14,10 @@ COPY go.sum go.sum
 RUN go mod download
 
 COPY . .
-RUN make installer
 
-FROM quay.io/centos/centos:centos8
+RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then GO_BUILD_ENV_PARAMS="GOOS=linux GOARCH=arm64" make installer;else make installer; fi
+
+FROM  --platform=$TARGETPLATFORM quay.io/centos/centos:centos8
 
 COPY --from=builder /go/src/github.com/openshift/assisted-installer/build/installer /usr/bin/installer
 COPY --from=builder /go/src/github.com/openshift/assisted-installer/deploy/assisted-installer-controller /assisted-installer-controller/deploy

Dockerfile.assisted-installer-build

@@ -1,4 +1,4 @@
-FROM registry.ci.openshift.org/openshift/release:golang-1.15
+FROM registry.ci.openshift.org/openshift/release:golang-1.16
 ENV GO111MODULE=on
 ENV GOFLAGS=""
 

Dockerfile.assisted-installer-controller

@@ -1,7 +1,10 @@
-FROM quay.io/openshift/origin-cli:4.9.0 AS cli
+FROM --platform=$BUILDPLATFORM quay.io/openshift/origin-cli:4.9.0 AS cli
 
-FROM registry.ci.openshift.org/openshift/release:golang-1.15 AS builder
+FROM --platform=$BUILDPLATFORM golang:1.16 AS builder
+
+ARG TARGETPLATFORM
 ENV GOFLAGS=-mod=mod
+
 WORKDIR /go/src/github.com/openshift/assisted-installer
 
 # Bring in the go dependencies before anything else so we can take
@@ -11,9 +14,10 @@ COPY go.sum go.sum
 RUN go mod download
 
 COPY . .
-RUN make controller
 
-FROM quay.io/centos/centos:centos8
+RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then GO_BUILD_ENV_PARAMS="GOOS=linux GOARCH=arm64" make controller;else make controller; fi
+
+FROM --platform=$TARGETPLATFORM quay.io/centos/centos:centos8
 
 RUN yum -y install make gcc unzip wget curl rsync && yum clean all
 COPY --from=builder /go/src/github.com/openshift/assisted-installer/build/assisted-installer-controller /usr/bin/assisted-installer-controller

Makefile

@@ -6,7 +6,7 @@ NAMESPACE := $(or ${NAMESPACE},assisted-installer)
 GIT_REVISION := $(shell git rev-parse HEAD)
 PUBLISH_TAG := $(or ${GIT_REVISION})
 
-CONTAINER_BUILD_PARAMS = --network=host --label git_revision=${GIT_REVISION}
+CONTAINER_BUILD_PARAMS = --label git_revision=${GIT_REVISION}
 
 REPORTS ?= $(ROOT_DIR)/reports
 CI ?= false
@@ -53,18 +53,18 @@ endif
 build: installer controller
 
 installer:
-	CGO_ENABLED=0 go build -o build/installer src/main/main.go
+	$(GO_BUILD_ENV_PARAMS) CGO_ENABLED=0 go build -o build/installer src/main/main.go
 
 controller:
-	CGO_ENABLED=0 go build -o build/assisted-installer-controller src/main/assisted-installer-controller/assisted_installer_main.go
+	$(GO_BUILD_ENV_PARAMS) CGO_ENABLED=0 go build -o build/assisted-installer-controller src/main/assisted-installer-controller/assisted_installer_main.go
 
 build-images: installer-image controller-image
 
 installer-image:
-	$(CONTAINER_COMMAND) build $(CONTAINER_BUILD_PARAMS) -f Dockerfile.assisted-installer . -t $(INSTALLER)
+	docker buildx build --platform=linux/arm64,linux/amd64 $(CONTAINER_BUILD_PARAMS) -f Dockerfile.assisted-installer . -t $(INSTALLER) --push
 
 controller-image:
-	$(CONTAINER_COMMAND) build $(CONTAINER_BUILD_PARAMS) -f Dockerfile.assisted-installer-controller . -t $(CONTROLLER)
+	docker buildx build --platform=linux/arm64,linux/amd64 $(CONTAINER_BUILD_PARAMS) -f Dockerfile.assisted-installer-controller . -t $(CONTROLLER) --push
 
 push-installer: installer-image
 	$(CONTAINER_COMMAND) push $(INSTALLER)

OWNERS_ALIASES

@@ -9,26 +9,24 @@ aliases:
     - gamli75
     - ori-amizur
     - oshercc
-    - razregev
     - romfreiman
-    - ronniel1
     - tsorya
     - yevgeny-shnaidman
-    - yuvigold
-    - masayag
     - nmagnezi
     - carbonin
     - rollandf
     - danielerez
     - ybettan
     - slaviered
     - osherdp
-    - asalkeld
     - flaper87
     - mkowalski
+    - lranjbar
+    - omertuc
   code-reviewers:
     - jakub-dzon
     - pkliczewski
     - masayag
     - jordigilh
     - machacekondra
+    - sagidayan

deploy/assisted-installer-controller/assisted-installer-controller-cm.yaml.template

@@ -12,4 +12,4 @@ data:
   ca-cert-path: '{{.CACertPath}}'
   check-cluster-version: '{{.CheckCVO}}'
   high-availability-mode: {{.HaMode}}
-  must-gather-image: {{.MustGatherImage}}
+  must-gather-image: '{{.MustGatherImage}}'

deploy/assisted-installer-controller/assisted-installer-controller-nm.yaml

@@ -2,5 +2,3 @@ apiVersion: v1
 kind: Namespace
 metadata:
   name: assisted-installer
-  labels:
-    openshift.io/run-level: "0"

deploy/assisted-installer-controller/assisted-installer-controller-role.yaml

@@ -154,3 +154,17 @@ rules:
       - pods
     verbs:
       - deletecollection
+  - apiGroups:
+      - "security.openshift.io"
+    resourceNames:
+      - "anyuid"
+      - "nonroot"
+      - "hostmount-anyuid"
+      - "machine-api-termination-handler"
+      - "hostnetwork"
+      - "hostaccess"
+      - "node-exporter"
+    resources:
+      - securitycontextconstraints
+    verbs:
+      - use

go.mod

@@ -1,13 +1,14 @@
 module github.com/openshift/assisted-installer
 
-go 1.14
+go 1.16
 
 require (
 	github.com/Microsoft/go-winio v0.4.15-0.20200113171025-3fe6c5262873 // indirect
 	github.com/PuerkitoBio/rehttp v1.0.0
 	github.com/aybabtme/iocontrol v0.0.0-20150809002002-ad15bcfc95a0 // indirect
 	github.com/benbjohnson/clock v1.0.3 // indirect
 	github.com/coreos/ignition/v2 v2.10.1
+	github.com/go-logr/logr v0.4.0 // indirect
 	github.com/go-openapi/runtime v0.19.28
 	github.com/go-openapi/strfmt v0.20.1
 	github.com/go-openapi/swag v0.19.9
@@ -16,11 +17,11 @@ require (
 	github.com/hashicorp/go-version v1.3.0
 	github.com/kelseyhightower/envconfig v1.4.0
 	github.com/metal3-io/baremetal-operator v0.0.0
-	github.com/onsi/ginkgo v1.16.2
-	github.com/onsi/gomega v1.12.0
+	github.com/onsi/ginkgo v1.16.4
+	github.com/onsi/gomega v1.13.0
 	github.com/openshift/api v3.9.1-0.20191111211345-a27ff30ebf09+incompatible
 	github.com/openshift/assisted-installer-agent v0.0.0-20200811180147-bc9c7b899b8a
-	github.com/openshift/assisted-service v1.0.10-0.20210526082015-cf99d1fca3fe
+	github.com/openshift/assisted-service v1.0.10-0.20210921191140-7dcb60579fdf
 	github.com/openshift/client-go v0.0.0-20201020074620-f8fd44879f7c
 	github.com/openshift/machine-api-operator v0.2.1-0.20201002104344-6abfb5440597
 	github.com/operator-framework/api v0.8.0
@@ -30,20 +31,20 @@ require (
 	github.com/thoas/go-funk v0.8.0
 	github.com/vincent-petithory/dataurl v0.0.0-20191104211930-d1553a71de50
 	golang.org/x/net v0.0.0-20210428140749-89ef3d95e781
-	golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9
+	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
 	gopkg.in/yaml.v2 v2.4.0
-	honnef.co/go/tools v0.0.1-2020.1.6 // indirect
-	k8s.io/api v0.21.0
-	k8s.io/apimachinery v0.21.0
+	k8s.io/api v0.21.1
+	k8s.io/apimachinery v0.21.1
 	k8s.io/client-go v12.0.0+incompatible
-	sigs.k8s.io/controller-runtime v0.8.3
+	sigs.k8s.io/controller-runtime v0.9.0
 )
 
 replace (
 	github.com/metal3-io/baremetal-operator => github.com/openshift/baremetal-operator v0.0.0-20200715132148-0f91f62a41fe // Use OpenShift fork
 	github.com/openshift/api => github.com/openshift/api v0.0.0-20200901182017-7ac89ba6b971
 	github.com/openshift/hive/pkg/apis => github.com/carbonin/hive/pkg/apis v0.0.0-20210209195732-57e8c3ae12d1
 	github.com/openshift/machine-api-operator => github.com/openshift/machine-api-operator v0.2.1-0.20201026110925-50ea569da51b
+	github.com/irifrance/gini => github.com/go-air/gini v1.0.1
 	k8s.io/api => k8s.io/api v0.19.2
 	k8s.io/apimachinery => k8s.io/apimachinery v0.19.2
 	k8s.io/client-go => k8s.io/client-go v0.19.2