Merge pull request kubevirt#3257 from xpivarc/explainVM/I

Explain vm/i
yulng · Oct 21, 2020 · 9ed0772 · 9ed0772
2 parents 5102772 + 20b4281
commit 9ed0772
Show file tree

Hide file tree

Showing 33 changed files with 9,680 additions and 184 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,8 +4,11 @@ tools/openapispec/openapispec
 tools/crd-generator/crd-generator
 tools/csv-generator/csv-generator
 tools/doc-generator/doc-generator
+tools/crd-validation-generator/crd-validation-generator
 tools/resource-generator/resource-generator
 tools/marketplace/marketplace
+tools/manifest-templator/manifest-templator
+tools/vms-generator/vms-generator
 **/bin
 bin/*
 .vagrant
@@ -30,8 +33,6 @@ cluster/local/certs
 _out
 vendor/**/*_test.go
 **/polarion.xml
-tools/manifest-templator/manifest-templator
-tools/vms-generator/vms-generator
 .coverprofile*
 coverage.html
 manifests/**/*.tmp

diff --git a/api/api-rule-violations-known.list b/api/api-rule-violations-known.list
@@ -144,14 +144,17 @@ API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,DHCPOptions,N
 API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,DHCPOptions,PrivateOptions
 API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,DeveloperConfiguration,FeatureGates
 API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,Devices,Disks
+API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,Devices,Filesystems
 API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,Devices,GPUs
 API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,Devices,Inputs
 API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,Devices,Interfaces
+API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,DownwardAPIVolumeSource,Fields
 API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,Interface,Ports
 API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,KubeVirtConfiguration,EmulatedMachines
 API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,KubeVirtConfiguration,SupportedGuestAgentVersions
 API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,KubeVirtList,Items
 API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,KubeVirtStatus,Conditions
+API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,NodePlacement,Tolerations
 API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,VirtualMachineInstanceFileSystemInfo,Filesystems
 API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,VirtualMachineInstanceFileSystemList,Items
 API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,VirtualMachineInstanceGuestAgentInfo,UserList
@@ -172,6 +175,7 @@ API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,VirtualMachin
 API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,VirtualMachineSpec,DataVolumeTemplates
 API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,VirtualMachineStatus,Conditions
 API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,VirtualMachineStatus,StateChangeRequests
+API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,VirtualMachineStatus,VolumeSnapshotStatuses
 API rule violation: list_type_missing,kubevirt.io/client-go/apis/snapshot/v1alpha1,VirtualMachineRestoreList,Items
 API rule violation: list_type_missing,kubevirt.io/client-go/apis/snapshot/v1alpha1,VirtualMachineRestoreStatus,Conditions
 API rule violation: list_type_missing,kubevirt.io/client-go/apis/snapshot/v1alpha1,VirtualMachineRestoreStatus,DeletedDataVolumes

diff --git a/api/api-rule-violations.list b/api/api-rule-violations.list
@@ -144,14 +144,17 @@ API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,DHCPOptions,N
 API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,DHCPOptions,PrivateOptions
 API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,DeveloperConfiguration,FeatureGates
 API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,Devices,Disks
+API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,Devices,Filesystems
 API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,Devices,GPUs
 API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,Devices,Inputs
 API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,Devices,Interfaces
+API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,DownwardAPIVolumeSource,Fields
 API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,Interface,Ports
 API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,KubeVirtConfiguration,EmulatedMachines
 API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,KubeVirtConfiguration,SupportedGuestAgentVersions
 API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,KubeVirtList,Items
 API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,KubeVirtStatus,Conditions
+API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,NodePlacement,Tolerations
 API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,VirtualMachineInstanceFileSystemInfo,Filesystems
 API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,VirtualMachineInstanceFileSystemList,Items
 API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,VirtualMachineInstanceGuestAgentInfo,UserList
@@ -172,6 +175,7 @@ API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,VirtualMachin
 API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,VirtualMachineSpec,DataVolumeTemplates
 API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,VirtualMachineStatus,Conditions
 API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,VirtualMachineStatus,StateChangeRequests
+API rule violation: list_type_missing,kubevirt.io/client-go/api/v1,VirtualMachineStatus,VolumeSnapshotStatuses
 API rule violation: list_type_missing,kubevirt.io/client-go/apis/snapshot/v1alpha1,VirtualMachineRestoreList,Items
 API rule violation: list_type_missing,kubevirt.io/client-go/apis/snapshot/v1alpha1,VirtualMachineRestoreStatus,Conditions
 API rule violation: list_type_missing,kubevirt.io/client-go/apis/snapshot/v1alpha1,VirtualMachineRestoreStatus,DeletedDataVolumes

diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json
@@ -8544,8 +8544,7 @@
       "type": "array",
       "items": {
        "$ref": "#/definitions/v1.Filesystem"
-      },
-      "x-kubernetes-list-type": "set"
+      }
      },
      "gpus": {
       "description": "Whether to attach a GPU device to the vmi.",
@@ -8709,8 +8708,7 @@
       "type": "array",
       "items": {
        "$ref": "#/definitions/k8s.io.api.core.v1.DownwardAPIVolumeFile"
-      },
-      "x-kubernetes-list-type": "set"
+      }
      },
      "volumeLabel": {
       "description": "The volume label of the resulting disk inside the VMI. Different bootstrapping mechanisms require different values. Typical values are \"cidata\" (cloud-init), \"config-2\" (cloud-init) or \"OEMDRV\" (kickstart).",
@@ -8908,6 +8906,7 @@
       "type": "string"
      },
      "virtiofs": {
+      "description": "Virtiofs is supported",
       "$ref": "#/definitions/v1.FilesystemVirtiofs"
      }
     }
@@ -9528,8 +9527,7 @@
       "type": "array",
       "items": {
        "$ref": "#/definitions/k8s.io.api.core.v1.Toleration"
-      },
-      "x-kubernetes-list-type": "map"
+      }
      }
     }
    },
@@ -10772,8 +10770,7 @@
       "type": "array",
       "items": {
        "$ref": "#/definitions/v1.VolumeSnapshotStatus"
-      },
-      "x-kubernetes-list-type": "atomic"
+      }
      }
     }
    },

diff --git a/hack/builder/Dockerfile b/hack/builder/Dockerfile
@@ -61,8 +61,8 @@ RUN set -x && \
     go get -v k8s.io/kube-openapi/cmd/openapi-gen@30be4d1 && \
     go get -v github.com/golang/protobuf/protoc-gen-go@1643683 && \
     go get -v k8s.io/code-generator/cmd/client-gen@v0.16.4 && \
-    go get -v sigs.k8s.io/controller-tools/cmd/controller-gen@v0.3.0 && \
     go get -v github.com/securego/gosec/v2/cmd/gosec@0ce48a5 && \
+    go get -v sigs.k8s.io/controller-tools/cmd/controller-gen@v0.4.0 && \
     go clean -cache -modcache
 
 RUN set -x && \

diff --git a/hack/builder/version.sh b/hack/builder/version.sh
@@ -1,3 +1,3 @@
-VERSION=30-8.0.33
+VERSION=30-9.0.3
 # TODO: reenable ppc64le when new builds are available
 ARCHITECTURES="amd64"
diff --git a/hack/dockerized b/hack/dockerized
@@ -22,7 +22,7 @@ if [ -z ${KUBEVIRT_CRI} ]; then
     fi
 fi
 
-KUBEVIRT_BUILDER_IMAGE="kubevirt/builder@sha256:3390fe22e515d653e8c2d5fb50b761f75990a9b67394120ff613cb01f15def93"
+KUBEVIRT_BUILDER_IMAGE="kubevirt/builder@sha256:756e317913e2e5c4f342ff4cd5319bc504286bc52ca7aead3337d79182d11b46"
 
 SYNC_OUT=${SYNC_OUT:-true}
 

diff --git a/hack/generate.sh b/hack/generate.sh
@@ -68,6 +68,28 @@ client-gen --clientset-name versioned \
 find ${KUBEVIRT_DIR}/pkg/ -name "*generated*.go" -exec rm {} -f \;
 
 ${KUBEVIRT_DIR}/hack/build-go.sh generate ${WHAT}
+
+# Genearte validation with controller-gen and create go file for them
+(
+    cd ${KUBEVIRT_DIR}/staging/src/kubevirt.io/client-go &&
+        # supress -mod=vendor
+        GOFLAGS= controller-gen crd:allowDangerousTypes=true paths=./api/v1/
+    #include snapshot
+    GOFLAGS= controller-gen crd paths=./apis/snapshot/v1alpha1/
+
+    #remove some weird stuff from controller-gen
+    cd config/crd
+    for file in *; do
+        tail -n +3 $file >$file"new"
+        mv $file"new" $file
+    done
+    cd ${KUBEVIRT_DIR}/tools/crd-validation-generator/ && go_build
+
+    cd ${KUBEVIRT_DIR}
+    ${KUBEVIRT_DIR}/tools/crd-validation-generator/crd-validation-generator
+)
+rm -rf ${KUBEVIRT_DIR}/staging/src/kubevirt.io/client-go/config
+
 /${KUBEVIRT_DIR}/hack/bootstrap-ginkgo.sh
 (cd ${KUBEVIRT_DIR}/tools/openapispec/ && go_build)
 
@@ -84,10 +106,12 @@ ${KUBEVIRT_DIR}/tools/openapispec/openapispec --dump-api-spec-path ${KUBEVIRT_DI
 
 rm -f ${KUBEVIRT_DIR}/manifests/generated/*
 rm -f ${KUBEVIRT_DIR}/examples/*
-${KUBEVIRT_DIR}/tools/resource-generator/resource-generator --type=priorityclass >${KUBEVIRT_DIR}/manifests/generated/kubevirt-priority-class.yaml
-${KUBEVIRT_DIR}/tools/resource-generator/resource-generator --type=kv >${KUBEVIRT_DIR}/manifests/generated/kv-resource.yaml
-${KUBEVIRT_DIR}/tools/resource-generator/resource-generator --type=kv-cr --namespace={{.Namespace}} --pullPolicy={{.ImagePullPolicy}} >${KUBEVIRT_DIR}/manifests/generated/kubevirt-cr.yaml.in
-${KUBEVIRT_DIR}/tools/resource-generator/resource-generator --type=operator-rbac --namespace={{.Namespace}} >${KUBEVIRT_DIR}/manifests/generated/rbac-operator.authorization.k8s.yaml.in
+
+ResourceDir=${KUBEVIRT_DIR}/manifests/generated
+${KUBEVIRT_DIR}/tools/resource-generator/resource-generator --type=priorityclass >${ResourceDir}/kubevirt-priority-class.yaml
+${KUBEVIRT_DIR}/tools/resource-generator/resource-generator --type=kv >${ResourceDir}/kv-resource.yaml
+${KUBEVIRT_DIR}/tools/resource-generator/resource-generator --type=kv-cr --namespace={{.Namespace}} --pullPolicy={{.ImagePullPolicy}} >${ResourceDir}/kubevirt-cr.yaml.in
+${KUBEVIRT_DIR}/tools/resource-generator/resource-generator --type=operator-rbac --namespace={{.Namespace}} >${ResourceDir}/rbac-operator.authorization.k8s.yaml.in
 
 # used for Image fields in manifests
 function getVersion() {

diff --git a/pkg/virt-operator/creation/components/BUILD.bazel b/pkg/virt-operator/creation/components/BUILD.bazel
@@ -8,6 +8,7 @@ go_library(
         "deployments.go",
         "scc.go",
         "secrets.go",
+        "validations_generated.go",
         "webhooks.go",
     ],
     importpath = "kubevirt.io/kubevirt/pkg/virt-operator/creation/components",
@@ -32,6 +33,7 @@ go_library(
         "//vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/intstr:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/util/yaml:go_default_library",
         "//vendor/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1:go_default_library",
     ],
 )
@@ -41,6 +43,7 @@ go_test(
     srcs = [
         "apiservices_test.go",
         "components_suite_test.go",
+        "crds_test.go",
         "secrets_test.go",
         "webhooks_test.go",
     ],
@@ -52,6 +55,7 @@ go_test(
         "//vendor/github.com/onsi/ginkgo/extensions/table:go_default_library",
         "//vendor/github.com/onsi/gomega:go_default_library",
         "//vendor/k8s.io/api/core/v1:go_default_library",
+        "//vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
     ],
 )