Auto sync upstream 2022 08 04 07 47

.github/workflows/clusterkubevirtadm-test.yaml

@@ -15,7 +15,7 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.17
+        go-version: 1.18
     - name: Checkout code
       uses: actions/checkout@v2
     - name: Test

.github/workflows/create_release.yaml

@@ -0,0 +1,73 @@
+on:
+  push:
+    tags:
+      - "v*"
+
+name: Upload Release Asset
+
+jobs:
+  build-and-push-image:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: build image
+        shell: bash
+        env:
+          QUAY_TOKEN: ${{secrets.QUAY_TOKEN}}
+          REGISTRY: "quay.io/capk"
+          TAG: ${{ github.ref_name }}
+        run: |
+          echo $QUAY_TOKEN | docker login -u="capk+capk_robot" quay.io --password-stdin
+          make docker-build
+          make docker-push
+  build:
+    name: Upload Release Asset
+    needs: build-and-push-image
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Set up Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: '1.18'
+      - name: Install kustomize
+        run: curl -s "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" | bash
+      - name: Create infrastructure components
+        env:
+          REGISTRY: "quay.io/capk"
+          IMAGE_NAME: "capk-manager-amd64"
+          TAG: ${{ github.ref_name }}
+        run: |
+          make create-infrastructure-components
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: Release ${{ github.ref }}
+          draft: false
+          prerelease: false
+      - name: Upload infrastructure-components.yaml
+        id: upload-infrastructure-components 
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps 
+          asset_path: ./infrastructure-components.yaml
+          asset_name: infrastructure-components.yaml
+          asset_content_type: text/plain
+      - name: Upload metadata.yaml
+        id: upload-metadata 
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps 
+          asset_path: ./metadata.yaml
+          asset_name: metadata.yaml
+          asset_content_type: text/plain

.github/workflows/test.yaml

@@ -5,7 +5,7 @@ jobs:
     if: (github.repository == 'kubernetes-sigs/cluster-api-provider-kubevirt')
     strategy:
       matrix:
-        go-version: [1.17.x]
+        go-version: [1.18.x]
         os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
@@ -27,7 +27,7 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.17.x
+        go-version: 1.18.x
     - name: Checkout code
       uses: actions/checkout@v2
     - name: Test with coverage

.gitignore

@@ -2,3 +2,4 @@ cluster-up/
 hack/tools/bin/
 bin/
 .idea/
+infrastructure-components.yaml

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.17.2
+ARG builder_image=golang:1.18.2
 FROM ${builder_image} as builder
 WORKDIR /workspace
 

Makefile

@@ -15,7 +15,7 @@
 # If you update this file, please follow:
 # https://suva.sh/posts/well-documented-makefiles/
 
-ROOT = $$GOPATH/pkg/mod/sigs.k8s.io/cluster-api@v0.3.11-0.20210525210043-6c7878e7b4a9
+ROOT = $$(go env GOPATH)/pkg/mod/sigs.k8s.io/cluster-api@v0.3.11-0.20210525210043-6c7878e7b4a9
 
 .DEFAULT_GOAL:=help
 TARGET ?= target
@@ -50,13 +50,11 @@ endif
 CONTROLLER_GEN := $(abspath $(TOOLS_BIN_DIR)/controller-gen)
 CONVERSION_GEN := $(abspath $(TOOLS_BIN_DIR)/conversion-gen)
 GOTESTSUM := $(abspath $(TOOLS_BIN_DIR)/gotestsum)
-KUSTOMIZE := $(abspath $(TOOLS_BIN_DIR)/kustomize)
-
-$(KUSTOMIZE): # Build kustomize from tools folder.
-	$(MAKE) -C $(ROOT) kustomize
+KUSTOMIZE_IMAGE = k8s.gcr.io/kustomize/kustomize:v3.8.7
+KUSTOMIZE ?= docker run $(KUSTOMIZE_IMAGE)
 
 # Define Docker related variables. Releases should modify and double check these vars.
-REGISTRY ?= localhost:5000
+REGISTRY ?= 127.0.0.1:5000
 IMAGE_NAME ?= capk-manager
 CONTROLLER_IMG ?= $(REGISTRY)/$(IMAGE_NAME)
 ARCH ?= amd64
@@ -187,7 +185,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.1-experimental
-	docker pull docker.io/library/golang:1.17.2
+	docker pull docker.io/library/golang:1.18.2
 	docker pull gcr.io/distroless/static:latest
 
 .PHONY: docker-build
@@ -244,6 +242,18 @@ else
 	sed -i -e 's@imagePullPolicy: .*@imagePullPolicy: '"$(PULL_POLICY)"'@' ./config/default/manager_pull_policy.yaml
 endif
 
+## --------------------------------------
+## Deployment
+## --------------------------------------
+##> infrastructure-components.yaml
+set_controller_image:
+	echo setting controller image to be ${CONTROLLER_IMG}:${TAG}
+	cd config/default && kustomize edit set image controller=${CONTROLLER_IMG}:${TAG} 
+
+create-infrastructure-components: generate-manifests set_controller_image
+	kustomize build config/default > infrastructure-components.yaml
+
+
 ## --------------------------------------
 ## Cleanup / Verification
 ## --------------------------------------

api/v1alpha1/kubevirtcluster_types.go

@@ -28,13 +28,17 @@ const (
 	ClusterFinalizer = "kubevirtcluster.infrastructure.cluster.x-k8s.io"
 )
 
-const (
+const ( //labels
 	KubevirtMachineNameLabel      = "capk.cluster.x-k8s.io/kubevirt-machine-name"
 	KubevirtMachineNamespaceLabel = "capk.cluster.x-k8s.io/kubevirt-machine-namespace"
 
 	KubevirtMachineVMTerminalLabel = "capk.cluster.x-k8s.io/vm-is-terminal"
 )
 
+const ( // annotations
+	VmiDeletionGraceTime = "capk.cluster.x-k8s.io/vmi-deletion-grace-time"
+)
+
 // KubevirtClusterSpec defines the desired state of KubevirtCluster.
 type KubevirtClusterSpec struct {
 	// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster

clusterctl-settings.json

@@ -1,5 +1,5 @@
 {
-  "name": "infrastructure-kubevirt",
+  "name": "kubevirt",
   "config": {
     "componentsFile": "infrastructure-components.yaml",
     "nextVersion": "v0.1.0"