++ add pacthes for cdi and new service for cdi-api webhooks

++ rename kubevir kinds Signed-off-by: Ivan Mikheykin <[email protected]>
deckhouse · Apr 16, 2024 · 7d0a5d2 · 7d0a5d2
1 parent 685d221
commit 7d0a5d2
Show file tree

Hide file tree

Showing 15 changed files with 469 additions and 270 deletions.
diff --git a/crds/embedded/cdi.yaml b/crds/embedded/cdi.yaml
@@ -3,17 +3,19 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.13.0
-  name: cdis.x.virtualization.deckhouse.io
+  name: dvpinternalcdis.internal.virtualization.deckhouse.io
 spec:
-  group: x.virtualization.deckhouse.io
+  group: internal.virtualization.deckhouse.io
   names:
-    kind: CDI
-    listKind: CDIList
-    plural: cdis
+    categories:
+      - dvpinternal
+    kind: DVPInternalCDI
+    listKind: DVPInternalCDIList
+    plural: dvpinternalcdis
     shortNames:
-      - xcdi
-      - xcdis
-    singular: cdi
+      - dvpcdi
+      - dvpcdis
+    singular: dvpinternalcdi
   scope: Cluster
   versions:
     - additionalPrinterColumns:

diff --git a/crds/embedded/kubevirt.yaml b/crds/embedded/kubevirt.yaml
@@ -1,25 +1,28 @@
 # Source:
 # https://github.com/kubevirt/kubevirt/releases/download/v1.0.0/kubevirt-operator.yaml
 # Changes:
+# - 2024.04.16
+#   - Add prefixes xinternal, XInternal
 # - 2023.12.12
 #   - Add x.virtualization.deckhouse prefix
 #   - Remove short names.
 #   - Remove all category, add kubevirt category.
+
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   labels:
     operator.kubevirt.io: ""
-  name: kubevirts.x.virtualization.deckhouse.io
+  name: dvpinternalkubevirts.internal.virtualization.deckhouse.io
 spec:
-  group: x.virtualization.deckhouse.io
+  group: internal.virtualization.deckhouse.io
   names:
     categories:
-      - kubevirt
-    kind: KubeVirt
-    plural: kubevirts
-    singular: kubevirt
+      - dvpinternal
+    kind: DVPInternalKubeVirt
+    plural: dvpinternalkubevirts
+    singular: dvpinternalkubevirt
   scope: Namespaced
   versions:
     - additionalPrinterColumns:

diff --git a/images/kube-api-proxy/pkg/kubevirt/kubevirt_rules.go b/images/kube-api-proxy/pkg/kubevirt/kubevirt_rules.go
@@ -5,11 +5,11 @@ import (
 )
 
 var KubevirtRewriteRules = &RewriteRules{
-	KindPrefix:         "", // KV
-	ResourceTypePrefix: "", // kv
-	ShortNamePrefix:    "x",
+	KindPrefix:         "DVPInternal", // KV
+	ResourceTypePrefix: "dvpinternal", // kv
+	ShortNamePrefix:    "dvp",
 	Categories:         []string{"kubevirt"},
-	RenamedGroup:       "x.virtualization.deckhouse.io",
+	RenamedGroup:       "internal.virtualization.deckhouse.io",
 	Rules:              KubevirtAPIGroupsRules,
 	Webhooks:           KubevirtWebhooks,
 }

diff --git a/images/kube-api-proxy/pkg/rewriter/target_request.go b/images/kube-api-proxy/pkg/rewriter/target_request.go
@@ -136,6 +136,11 @@ func (tr *TargetRequest) ShouldRewriteRequest() bool {
 				return true
 			}
 
+			// Rewrite request body when creating CRD.
+			if tr.originEndpoint.ResourceType == "customresourcedefinitions" && tr.originEndpoint.Name == "" {
+				return true
+			}
+
 			// Should not rewrite request if path is not rewritten.
 			return false
 		}

diff --git a/images/pre-delete-hook/entrypoint.sh b/images/pre-delete-hook/entrypoint.sh
@@ -1,7 +1,14 @@
 #!/bin/bash
 set -eu -o pipefail
 
-kubectl delete -n d8-virtualization kubevirts.x.virtualization.deckhouse.io kubevirt
-kubectl delete cdis.x.virtualization.deckhouse.io cdi
-kubectl wait --for=delete cdis.x.virtualization.deckhouse.io cdi --timeout=180s
-kubectl wait --for=delete -n d8-virtualization kubevirts.x.virtualization.deckhouse.io kubevirt --timeout=180s
+KUBEVIRT_RESOURCE="dvpinternalkubevirts.internal.virtualization.deckhouse.io"
+echo "Delete Kubevirt configuration ..."
+kubectl delete -n d8-virtualization ${KUBEVIRT_RESOURCE} kubevirt || true
+echo "Wait for Kubevirt deletion ..."
+kubectl wait --for=delete -n d8-virtualization ${KUBEVIRT_RESOURCE} kubevirt --timeout=180s || true
+
+CDI_RESOURCE="dvpinternalcdis.internal.virtualization.deckhouse.io"
+echo "Delete CDI configuration ..."
+kubectl delete ${CDI_RESOURCE} cdi || true
+echo "Wait for CDI deletion ..."
+kubectl wait --for=delete ${CDI_RESOURCE} cdi --timeout=180s || true
diff --git a/images/virtualization-artifact/cmd/virtualization-controller/main.go b/images/virtualization-artifact/cmd/virtualization-controller/main.go
@@ -11,9 +11,7 @@ import (
 
 	"go.uber.org/zap/zapcore"
 	extv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	apiruntime "k8s.io/apimachinery/pkg/runtime"
-	apiruntimeschema "k8s.io/apimachinery/pkg/runtime/schema"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
 	virtv1 "kubevirt.io/api/core/v1"
 	cdiv1beta1 "kubevirt.io/containerized-data-importer-api/pkg/apis/core/v1beta1"
@@ -47,18 +45,18 @@ var (
 )
 
 const (
-	defaultVerbosity      = "1"
-	kubevirtCoreGroupName = "x.virtualization.deckhouse.io"
-	cdiCoreGroupName      = "x.virtualization.deckhouse.io"
+	defaultVerbosity = "1"
+	//kubevirtCoreGroupName = "x.virtualization.deckhouse.io"
+	//cdiCoreGroupName      = "x.virtualization.deckhouse.io"
 )
 
 func init() {
 	importerImage = getRequiredEnvVar(common.ImporterPodImageNameVar)
 	uploaderImage = getRequiredEnvVar(common.UploaderPodImageNameVar)
 	controllerNamespace = getRequiredEnvVar(common.PodNamespaceVar)
 
-	overrideKubevirtCoreGroupName(kubevirtCoreGroupName)
-	overrideCDICoreGroupName(cdiCoreGroupName)
+	//overrideKubevirtCoreGroupName(kubevirtCoreGroupName)
+	//overrideCDICoreGroupName(cdiCoreGroupName)
 }
 
 func setupLogger() {
@@ -99,60 +97,60 @@ func getRequiredEnvVar(name string) string {
 	return val
 }
 
-func overrideKubevirtCoreGroupName(groupName string) {
-	virtv1.GroupVersion.Group = groupName
-	virtv1.SchemeGroupVersion.Group = groupName
-	virtv1.StorageGroupVersion.Group = groupName
-	for i := range virtv1.GroupVersions {
-		virtv1.GroupVersions[i].Group = groupName
-	}
-
-	virtv1.VirtualMachineInstanceGroupVersionKind.Group = groupName
-	virtv1.VirtualMachineInstanceReplicaSetGroupVersionKind.Group = groupName
-	virtv1.VirtualMachineInstancePresetGroupVersionKind.Group = groupName
-	virtv1.VirtualMachineGroupVersionKind.Group = groupName
-	virtv1.VirtualMachineInstanceMigrationGroupVersionKind.Group = groupName
-	virtv1.KubeVirtGroupVersionKind.Group = groupName
-
-	virtv1.SchemeBuilder = apiruntime.NewSchemeBuilder(virtv1.AddKnownTypesGenerator([]apiruntimeschema.GroupVersion{virtv1.GroupVersion}))
-	virtv1.AddToScheme = virtv1.SchemeBuilder.AddToScheme
-}
-
-func overrideCDICoreGroupName(groupName string) {
-	cdiv1beta1.SchemeGroupVersion.Group = groupName
-	cdiv1beta1.CDIGroupVersionKind.Group = groupName
-
-	cdiv1beta1.SchemeBuilder = apiruntime.NewSchemeBuilder(addKnownTypes)
-	cdiv1beta1.AddToScheme = cdiv1beta1.SchemeBuilder.AddToScheme
-}
+//func overrideKubevirtCoreGroupName(groupName string) {
+//	virtv1.GroupVersion.Group = groupName
+//	virtv1.SchemeGroupVersion.Group = groupName
+//	virtv1.StorageGroupVersion.Group = groupName
+//	for i := range virtv1.GroupVersions {
+//		virtv1.GroupVersions[i].Group = groupName
+//	}
+//
+//	virtv1.VirtualMachineInstanceGroupVersionKind.Group = groupName
+//	virtv1.VirtualMachineInstanceReplicaSetGroupVersionKind.Group = groupName
+//	virtv1.VirtualMachineInstancePresetGroupVersionKind.Group = groupName
+//	virtv1.VirtualMachineGroupVersionKind.Group = groupName
+//	virtv1.VirtualMachineInstanceMigrationGroupVersionKind.Group = groupName
+//	virtv1.KubeVirtGroupVersionKind.Group = groupName
+//
+//	virtv1.SchemeBuilder = apiruntime.NewSchemeBuilder(virtv1.AddKnownTypesGenerator([]apiruntimeschema.GroupVersion{virtv1.GroupVersion}))
+//	virtv1.AddToScheme = virtv1.SchemeBuilder.AddToScheme
+//}
+
+//func overrideCDICoreGroupName(groupName string) {
+//	cdiv1beta1.SchemeGroupVersion.Group = groupName
+//	cdiv1beta1.CDIGroupVersionKind.Group = groupName
+//
+//	cdiv1beta1.SchemeBuilder = apiruntime.NewSchemeBuilder(addKnownTypes)
+//	cdiv1beta1.AddToScheme = cdiv1beta1.SchemeBuilder.AddToScheme
+//}
 
 // Adds the list of known types to Scheme.
-func addKnownTypes(scheme *apiruntime.Scheme) error {
-	scheme.AddKnownTypes(cdiv1beta1.SchemeGroupVersion,
-		&cdiv1beta1.DataVolume{},
-		&cdiv1beta1.DataVolumeList{},
-		&cdiv1beta1.CDIConfig{},
-		&cdiv1beta1.CDIConfigList{},
-		&cdiv1beta1.CDI{},
-		&cdiv1beta1.CDIList{},
-		&cdiv1beta1.StorageProfile{},
-		&cdiv1beta1.StorageProfileList{},
-		&cdiv1beta1.DataSource{},
-		&cdiv1beta1.DataSourceList{},
-		&cdiv1beta1.DataImportCron{},
-		&cdiv1beta1.DataImportCronList{},
-		&cdiv1beta1.ObjectTransfer{},
-		&cdiv1beta1.ObjectTransferList{},
-		&cdiv1beta1.VolumeImportSource{},
-		&cdiv1beta1.VolumeImportSourceList{},
-		&cdiv1beta1.VolumeUploadSource{},
-		&cdiv1beta1.VolumeUploadSourceList{},
-		&cdiv1beta1.VolumeCloneSource{},
-		&cdiv1beta1.VolumeCloneSourceList{},
-	)
-	metav1.AddToGroupVersion(scheme, cdiv1beta1.SchemeGroupVersion)
-	return nil
-}
+//func addKnownTypes(scheme *apiruntime.Scheme) error {
+//	scheme.AddKnownTypes(cdiv1beta1.SchemeGroupVersion,
+//		&cdiv1beta1.DataVolume{},
+//		&cdiv1beta1.DataVolumeList{},
+//		&cdiv1beta1.CDIConfig{},
+//		&cdiv1beta1.CDIConfigList{},
+//		&cdiv1beta1.CDI{},
+//		&cdiv1beta1.CDIList{},
+//		&cdiv1beta1.StorageProfile{},
+//		&cdiv1beta1.StorageProfileList{},
+//		&cdiv1beta1.DataSource{},
+//		&cdiv1beta1.DataSourceList{},
+//		&cdiv1beta1.DataImportCron{},
+//		&cdiv1beta1.DataImportCronList{},
+//		&cdiv1beta1.ObjectTransfer{},
+//		&cdiv1beta1.ObjectTransferList{},
+//		&cdiv1beta1.VolumeImportSource{},
+//		&cdiv1beta1.VolumeImportSourceList{},
+//		&cdiv1beta1.VolumeUploadSource{},
+//		&cdiv1beta1.VolumeUploadSourceList{},
+//		&cdiv1beta1.VolumeCloneSource{},
+//		&cdiv1beta1.VolumeCloneSourceList{},
+//	)
+//	metav1.AddToGroupVersion(scheme, cdiv1beta1.SchemeGroupVersion)
+//	return nil
+//}
 
 func main() {
 	flag.Parse()

diff --git a/templates/cdi/cdi-api/service-webhook-proxy.yaml b/templates/cdi/cdi-api/service-webhook-proxy.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: cdi-api-webhook-proxy
+  namespace: d8-{{ .Chart.Name }}
+  {{- include "helm_lib_module_labels" (list . (dict "app" "cdi-apiserver")) | nindent 2 }}
+spec:
+  ports:
+    - port: 443
+      protocol: TCP
+      targetPort: 24192
+  selector:
+    cdi.kubevirt.io: cdi-apiserver
+  sessionAffinity: None
+  type: ClusterIP
diff --git a/templates/cdi/cdi-operator/rbac-for-us.yaml b/templates/cdi/cdi-operator/rbac-for-us.yaml
@@ -40,7 +40,7 @@ rules:
     - update
     - delete
 - apiGroups:
-    - x.virtualization.deckhouse.io
+    - internal.virtualization.deckhouse.io
     - upload.cdi.kubevirt.io
   resources:
     - '*'
@@ -123,28 +123,28 @@ rules:
   verbs:
     - get
 - apiGroups:
-    - x.virtualization.deckhouse.io
+    - internal.virtualization.deckhouse.io
   resources:
-    - datavolumes
+    - dvpinternaldatavolumes
   verbs:
     - list
     - get
 - apiGroups:
-    - x.virtualization.deckhouse.io
+    - internal.virtualization.deckhouse.io
   resources:
-    - datasources
+    - dvpinternaldatasources
   verbs:
     - get
 - apiGroups:
-    - x.virtualization.deckhouse.io
+    - internal.virtualization.deckhouse.io
   resources:
-    - cdis
+    - dvpinternalcdis
   verbs:
     - get
 - apiGroups:
-    - x.virtualization.deckhouse.io
+    - internal.virtualization.deckhouse.io
   resources:
-    - cdis/finalizers
+    - dvpinternalcdis/finalizers
   verbs:
     - update
 - apiGroups:
@@ -219,7 +219,7 @@ rules:
     - list
     - watch
 - apiGroups:
-    - x.virtualization.deckhouse.io
+    - internal.virtualization.deckhouse.io
   resources:
     - '*'
   verbs:
@@ -286,9 +286,9 @@ rules:
   verbs:
     - get
 - apiGroups:
-    - x.virtualization.deckhouse.io
+    - internal.virtualization.deckhouse.io
   resources:
-    - dataimportcrons
+    - dvpinternaldataimportcrons
   verbs:
     - get
     - list