Merge pull request #47 from davidvossel/auto_sync_upstream_2023-09-15-20-38

Auto sync upstream 2023 09 15 20 38

Author: openshift-merge-robot

.github/workflows/clusterkubevirtadm-test.yaml

@@ -12,12 +12,12 @@ jobs:
   clusterkubevirtadm-unit_test:
     runs-on: ubuntu-latest
     steps:
+    - name: Checkout code
+      uses: actions/checkout@v3
     - name: Install Go
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v4
       with:
-        go-version: 1.18
-    - name: Checkout code
-      uses: actions/checkout@v2
+        go-version-file: go.mod
     - name: Test
       run: make clusterkubevirtadm-test
     - name: Build for linux

.github/workflows/create_release.yaml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
       - name: build image
@@ -29,11 +29,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Set up Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v4
         with:
-          go-version: '1.18'
+          go-version-file: go.mod
       - name: Install kustomize
         run: curl -s "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" | bash
       - name: Create infrastructure components

.github/workflows/e2e.yaml

@@ -9,7 +9,7 @@ jobs:
     if: (github.repository == 'kubernetes-sigs/cluster-api-provider-kubevirt') && contains(github.event.pull_request.labels.*.name, 'ok-to-test')
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
           repository: kubevirt/project-infra

.github/workflows/image_build.yaml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
       - name: build image

.github/workflows/pr-gh-workflow-approve.yaml

@@ -0,0 +1,40 @@
+name: PR approve GH Workflows
+
+on:
+  pull_request_target:
+    types:
+      - edited
+      - labeled
+      - reopened
+      - synchronize
+
+jobs:
+  approve:
+    name: Approve ok-to-test
+    if: (github.repository == 'kubernetes-sigs/cluster-api-provider-kubevirt') && contains(github.event.pull_request.labels.*.name, 'ok-to-test')
+    runs-on: ubuntu-latest
+    permissions:
+      actions: write
+    steps:
+      - name: Update PR
+        uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
+        continue-on-error: true
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const result = await github.rest.actions.listWorkflowRunsForRepo({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              event: "pull_request",
+              status: "action_required",
+              head_sha: context.payload.pull_request.head.sha,
+              per_page: 100
+            });
+
+            for (var run of result.data.workflow_runs) {
+              await github.rest.actions.approveWorkflowRun({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                run_id: run.id
+              });
+            }

.github/workflows/test.yaml

@@ -5,16 +5,15 @@ jobs:
     if: (github.repository == 'kubernetes-sigs/cluster-api-provider-kubevirt')
     strategy:
       matrix:
-        go-version: [1.18.x]
         os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
-    steps: 
-    - name: Install Go 
-      uses: actions/setup-go@v2
-      with:
-        go-version: ${{ matrix.go-version }}
+    steps:
     - name: Checkout code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
+    - name: Install Go
+      uses: actions/setup-go@v4
+      with:
+        go-version-file: go.mod
     - name: Test
       run: make test
     - name: Build
@@ -24,12 +23,12 @@ jobs:
     if: (github.repository == 'kubernetes-sigs/cluster-api-provider-kubevirt')
     runs-on: ubuntu-latest
     steps:
+    - name: Checkout code
+      uses: actions/checkout@v3
     - name: Install Go
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v4
       with:
-        go-version: 1.18.x
-    - name: Checkout code
-      uses: actions/checkout@v2
+        go-version-file: go.mod
     - name: Test with coverage
       env:
         TEST_ARGS: -covermode atomic -outputdir=./coverprofiles -coverprofile=cover.coverprofile
@@ -46,21 +45,24 @@ jobs:
   go-linter:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
+    - name: Install Go
+      uses: actions/setup-go@v4
+      with:
+        go-version-file: go.mod
     - name: golangci-lint
       uses: golangci/golangci-lint-action@v3
-      with: # TODO: remove this when the deprecated function will be removed (issue #85)
-        args: --exclude SA1019 --timeout=5m -E ginkgolinter
+      with:
+        args: --timeout=5m -v
+        version: v1.54.2
 
   check-gen:
     runs-on: ubuntu-latest
     steps:
+    - uses: actions/checkout@v3
     - name: Install Go
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v4
       with:
-        go-version: 1.18.x
-    - uses: actions/checkout@v2
+        go-version-file: go.mod
     - name: Check that 'make generate' has being call
       run: make check-gen
-
-

.golangci.yml

@@ -0,0 +1,22 @@
+linters-settings:
+  ginkgolinter:
+    forbid-focus-container: true
+
+linters:
+  enable:
+    - deadcode
+    - errcheck
+    - ginkgolinter
+    - gosimple
+    - govet
+    - ineffassign
+    - staticcheck
+    - structcheck
+    - typecheck
+    - unused
+    - varcheck
+  disable: []
+
+issues:
+  exclude:
+    - SA1019 # todo remove the exclude parameter when issue #85 is resolved

Dockerfile

@@ -16,7 +16,7 @@
 
 # Build the manager binary
 # Run this with docker build --build-arg builder_image=<golang:x.y.z>
-ARG builder_image=golang:1.18.2
+ARG builder_image=golang:1.20
 FROM ${builder_image} as builder
 WORKDIR /workspace
 

Makefile

@@ -69,6 +69,16 @@ all: test manager
 help:  ## Display this help
 	@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n  make \033[36m<target>\033[0m\n"} /^[a-zA-Z_-]+:.*?##/ { printf "  \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)
 
+# go-install-tool will 'go install' any package $2 and install it to $1.
+PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
+define go-install-tool
+@[ -f $(1) ] || { \
+set -e ;\
+echo "Installing $(2)" ;\
+GOBIN=$(PROJECT_DIR)/bin go install $(2) ;\
+}
+endef
+
 ## --------------------------------------
 ## Testing
 ## --------------------------------------
@@ -205,7 +215,7 @@ modules: ## Runs go mod to ensure modules are up to date.
 .PHONY: docker-pull-prerequisites
 docker-pull-prerequisites:
 	docker pull docker.io/docker/dockerfile:1.4
-	docker pull docker.io/library/golang:1.18.2
+	docker pull docker.io/library/golang:1.20.2
 	docker pull gcr.io/distroless/static:latest
 
 .PHONY: docker-build
@@ -329,11 +339,13 @@ goimports:
 	go install golang.org/x/tools/cmd/goimports@latest
 	goimports -w -local="sigs.k8s.io/cluster-api-provider-kubevirt"  $(shell find . -type f -name '*.go' ! -path "*/vendor/*" ! -path "./_kubevirtci/*" ! -path "*zz_generated*" )
 
+GOLANGCI_LINT = $(shell pwd)/bin/golangci-lint
+golangci-lint: ## Download golangci-lint locally if necessary.
+	$(call go-install-tool,$(GOLANGCI_LINT),github.com/golangci/golangci-lint/cmd/[email protected])
+
 .PHONY: linter
-linter:
-	go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
-	# todo remove the exclude parameter when issue #85 is resolved
-	golangci-lint run --timeout=5m -E ginkgolinter --exclude SA1019
+linter: golangci-lint
+	$(GOLANGCI_LINT) run --timeout=5m -v
 
 .PHONY: sanity
 sanity: linter goimports test

README.md

@@ -28,7 +28,7 @@ We also encourage ALL active community participants to act as if they are mainta
 - Participate in the conversations on [Kubernetes Discuss](https://discuss.kubernetes.io/c/contributors/cluster-api/23)
 
 - **Meetings:**
-  - Cluster API Provider KubeVirt Syncup Meetings: [Tuesdays at 8:00 PT (Pacific Time)](https://zoom.us/j/94685513559?pwd=cnI3RUQyZ3RrckpOc1BQNDA1Q1BrZz09) (weekly starting Tuesday December 7th, 2021). [Convert to your timezone](http://www.thetimezoneconverter.com/?t=8:00&tz=PT%20%28Pacific%20Time%29).
+  - Cluster API Provider KubeVirt Syncup Meetings: [Tuesdays at 8:00 PT (Pacific Time)](https://zoom.us/j/94685513559?pwd=cnI3RUQyZ3RrckpOc1BQNDA1Q1BrZz09) (weekly starting Tuesday, December 7th, 2021). [Convert to your timezone](http://www.thetimezoneconverter.com/?t=8:00&tz=PT%20%28Pacific%20Time%29).
     - [Meeting notes and Agenda](https://docs.google.com/document/d/1ZAnRLCKOVbDqrsrYis2OR0aZIAlqp576gCJVCkMNiHM/edit?usp=sharing).
 
 ### Other ways to communicate with the maintainers
@@ -44,15 +44,15 @@ If you think you have found a bug please follow the instruction below.
 - Please give a small amount of time giving due diligence to the issue tracker. Your issue might be a duplicate.
 - Get the logs from the custom controllers and please paste them in the issue.
 - Open a bug report.
-- Remember users might be searching the issue in future, so please make sure to give it a meaningful title to help others.
+- Remember users might be searching the issue in the future, so please make sure to give it a meaningful title to help others.
 - Feel free to reach out to the community on slack.
 
 ### Tracking new feature
 
-We also have a issue tracker to track features. If you think you have a feature idea, that could make Cluster API provider Kubevirt become even more awesome, then follow these steps.
+We also have an issue tracker to track features. If you think you have a feature idea, that could make Cluster API provider Kubevirt become even more awesome, then follow these steps.
 
 - Open a feature request
-- Remember users might be searching for the issue in future, so please make sure to give it a meaningful title to help others.
+- Remember users might be searching for the issue in the future, so please make sure to give it a meaningful title to help others.
 - Clearly define the use case with concrete examples. Example: type `this` and cluster-api-provider-kubevirt does `that`.
 - Some of our larger features will require some design. If you would like to include a technical design to your feature, please go ahead.
 - After the new feature is well understood, and the design is agreed upon we can start coding the feature. We would love for you to code it. So please open up a **WIP** *(work in progress)* PR and happy coding!