Fork Sync: Update from parent repository

.dockerignore

@@ -0,0 +1,18 @@
+# More info: https://docs.docker.com/engine/reference/builder/#dockerignore-file
+# Ignore build and test binaries.
+bin/
+
+*.md
+blogs
+.vscode
+.github
+.devcontainer
+build
+cache
+.gitignore
+./*.yml
+./*.yaml
+OWNERS
+PROJECT
+LICENSE
+Dockerfile

.github/pull_request_template.md

@@ -0,0 +1,7 @@
+## Why the changes were made
+
+<!-- Explain why this PR is important, what problems it fixes, link related issues -->
+
+## How to test the changes made
+
+<!-- Explain how the changes introduced by this PR can be tested and verified, with commands and pictures -->

.gitignore

@@ -1,8 +1,46 @@
-bin/
-.vscode/
-.idea/
+# Binaries for programs and plugins
+*.exe
+*.exe~
+*.dll
+*.so
+*.dylib
+bin/*
+Dockerfile.cross
+
+# Test binary, built with `go test -c`
+*.test
+
+# Output of the go coverage tool, specifically when used with LiteIDE
+*.out
+
+# Go workspace file
+go.work
+
+# Kubernetes Generated files - skip generated files, except for vendored files
+!vendor/**/zz_generated.*
+
+# editor and IDE paraphernalia
+.idea
+.vscode
+*.swp
+*.swo
+*~
+
+# OADP
 tests/e2e/e2e.test
-cover.out
-.DS_Store
 tests/e2e/templates/*.yaml
-cache/ # `operator-sdk run bundle` caches files in this directory
+.DS_Store
+test-upgrade/
+junit_report.xml
+# `operator-sdk run bundle` caches files in this directory
+cache/
+# debug files
+debug.test*
+
+# Others
+.envrc
+
+# must-gather
+must-gather/oadp-must-gather
+must-gather/must-gather/
+must-gather/must-gather.local.*/

.golangci.yaml

@@ -0,0 +1,127 @@
+# Documentation reference https://github.com/golangci/golangci-lint/blob/v1.55.2/.golangci.reference.yml
+run:
+  skip-dirs-use-default: false
+  modules-download-mode: readonly
+  allow-parallel-runners: false
+
+output:
+  format: colored-line-number
+  print-issued-lines: true
+  print-linter-name: true
+  uniq-by-line: true
+  sort-results: true
+
+linters-settings:
+  dogsled:
+    max-blank-identifiers: 2
+  errcheck:
+    check-type-assertions: true
+    check-blank: true
+  gci:
+    sections:
+      - standard
+      - default
+      - prefix(github.com/openshift/oadp-operator)
+  goconst:
+    min-len: 3
+    min-occurrences: 5
+  gofmt:
+    simplify: true
+  goheader:
+    # copy from ./hack/boilerplate.go.txt
+    template: |-
+      Copyright 2021.
+
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
+  govet:
+    enable-all: true
+  misspell:
+    locale: US
+  nakedret:
+    max-func-lines: 30
+  nolintlint:
+    allow-unused: false
+    allow-no-explanation: []
+    require-explanation: true
+    require-specific: true
+  revive:
+    # TODO enable!
+    # enable-all-rules: true
+    rules:
+      - name: line-length-limit
+        disabled: true
+      # TODO delete after
+      - name: blank-imports
+      - name: dot-imports
+      - name: duplicated-imports
+      - name: import-alias-naming
+      - name: import-shadowing
+      - name: redundant-import-alias
+  unparam:
+    check-exported: true
+
+linters:
+  disable-all: true
+  # TODO enable commented ones
+  enable:
+    - asasalint
+    - asciicheck
+    - bidichk
+    # - bodyclose
+    - dogsled
+    # - dupword
+    # - durationcheck
+    # - errcheck
+    - errchkjson
+    - exportloopref
+    - gci
+    # - ginkgolinter
+    # - goconst
+    - gofmt
+    # - goheader
+    - goprintffuncname
+    # - gosec
+    # - gosimple
+    # - govet
+    # - ineffassign
+    - loggercheck
+    # - misspell
+    - nakedret
+    # - nilerr
+    # - noctx
+    - nolintlint
+    - nosprintfhostport
+    - revive
+    # - staticcheck
+    # - stylecheck
+    # - unconvert
+    - unparam
+    # - unused
+    - usestdlibvars
+  fast: false
+
+issues:
+  exclude-use-default: false
+  exclude-rules:
+    - linters:
+        - revive
+      text: "^struct-tag: unknown option 'inline' in JSON tag$"
+    - linters:
+        - stylecheck
+      text: "ST1000:|ST1020:|ST1021:|ST1022:"
+  max-issues-per-linter: 0
+  max-same-issues: 0
+
+severity:
+  default-severity: error
+  case-sensitive: false

CODE_OF_CONDUCT.md

@@ -0,0 +1,11 @@
+## Introduction
+
+The guidelines here should be clear, easy to understand, and easy to follow.
+They aim to foster a collaborative, respectful, and effective working environment.
+### Assume positive intent, and bring a positive attitude and intentions.
+
+First and foremost, assume positive intent. We are all working towards the same goal, and we are all part of the same team. We should bring a positive attitude and intentions to our work.  This work can be fun and challenging, and we should enjoy the journey.
+
+### Respect peoples time and effort.
+
+If someone takes the time to review your pull request (PR) or contributes to an issue, remember that they’ve invested time and effort. Show respect for this by responding thoughtfully and professionally.

Dockerfile

@@ -1,5 +1,8 @@
 # Build the manager binary
-FROM quay.io/konveyor/builder:v1.19 as builder
+FROM --platform=$BUILDPLATFORM quay.io/konveyor/builder:ubi9-latest AS builder
+ARG BUILDPLATFORM
+ARG TARGETOS
+ARG TARGETARCH
 
 WORKDIR /go/src/github.com/openshift/oadp-operator
 # Copy the Go Modules manifests
@@ -10,18 +13,23 @@ COPY go.sum go.sum
 RUN go mod download
 
 # Copy the go source
-COPY main.go main.go
+COPY cmd/main.go cmd/main.go
 COPY api/ api/
+COPY internal/controller/ internal/controller/
 COPY pkg/ pkg/
-COPY controllers/ controllers/
 
 # Build
-RUN CGO_ENABLED=0 GOOS=linux go build -mod=mod -a -o /go/src/manager main.go
+# the GOARCH has not a default value to allow the binary be built according to the host where the command
+# was called. For example, if we call make docker-build in a local env which has the Apple Silicon M1 SO
+# the docker BUILDPLATFORM arg will be linux/arm64 when for Apple x86 it will be linux/amd64. Therefore,
+# by leaving it empty we can ensure that the container and binary shipped on it will have the same platform.
+RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -mod=mod -a -o /go/src/manager cmd/main.go
 
 # Use distroless as minimal base image to package the manager binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details
-FROM registry.access.redhat.com/ubi8-minimal
+FROM registry.access.redhat.com/ubi9-minimal
 WORKDIR /
 COPY --from=builder /go/src/manager .
 USER 65532:65532
+
 ENTRYPOINT ["/manager"]