Add hypervisor crd setting, remove hypervisor crd creation, status TLS

Author: notandy

api/v1alpha1/hypervisor_types.go

@@ -27,6 +27,11 @@ import (
 // INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
 // Important: Run "make" to regenerate code after modifying this file
 
+const (
+	// ConditionTypeReady is the type of condition for ready status of a hypervisor
+	ConditionTypeReady = "Ready"
+)
+
 // HypervisorSpec defines the desired state of Hypervisor
 type HypervisorSpec struct {
 	// +kubebuilder:validation:Optional
@@ -41,10 +46,30 @@ type HypervisorSpec struct {
 	// EvacuateOnReboot request an evacuation of all instances before reboot.
 	EvacuateOnReboot bool `json:"evacuateOnReboot"`
 
+	// +kubebuilder:default:=true
+	// LifecycleEnabled enables the lifecycle management of the hypervisor via hypervisor-operator.
+	LifecycleEnabled bool `json:"lifecycleEnabled"`
+
+	// +kubebuilder:default:=false
+	// SkipTests skips the tests during the onboarding process.
+	SkipTests bool `json:"skipTests"`
+
+	// +kubebuilder:default:={}
+	// CustomTraits are used to apply custom traits to the hypervisor.
+	CustomTraits []string `json:"customTraits"`
+
+	// +kubebuilder:default:=true
+	// HighAvailability is used to enable the high availability handling of the hypervisor.
+	HighAvailability bool `json:"highAvailability"`
+
 	// +kubebuilder:default:=false
 	// Require to issue a certificate from cert-manager for the hypervisor, to be used for
 	// secure communication with the libvirt API.
 	CreateCertManagerCertificate bool `json:"createCertManagerCertificate"`
+
+	// +kubebuilder:default:=true
+	// InstallCertificate is used to enable the installations of the certificates via kvm-node-agent.
+	InstallCertificate bool `json:"installCertificate"`
 }
 
 type Instance struct {
@@ -152,11 +177,13 @@ type HypervisorStatus struct {
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
 // +kubebuilder:resource:scope=Cluster,shortName=hv
-// +kubebuilder:printcolumn:JSONPath=".status.node",name="Node",type="string"
+// +kubebuilder:printcolumn:JSONPath=".status.conditions[?(@.type==\"Ready\")].reason",name="State",type="string"
+// +kubebuilder:printcolumn:JSONPath=".spec.lifecycleEnabled",name="Lifecycle",type="boolean"
+// +kubebuilder:printcolumn:JSONPath=".spec.highAvailability",name="High Availability",type="boolean"
 // +kubebuilder:printcolumn:JSONPath=".status.operatingSystem.prettyVersion",name="Version",type="string"
 // +kubebuilder:printcolumn:JSONPath=".status.numInstances",name="Instances",type="integer"
-// +kubebuilder:printcolumn:JSONPath=".status.operatingSystem.hardwareModel",name="Hardware",type="string"
-// +kubebuilder:printcolumn:JSONPath=".status.operatingSystem.kernelRelease",name="Kernel",type="string"
+// +kubebuilder:printcolumn:JSONPath=".status.operatingSystem.hardwareModel",name="Hardware",type="string",priority=2
+// +kubebuilder:printcolumn:JSONPath=".status.operatingSystem.kernelRelease",name="Kernel",type="string",priority=2
 // +kubebuilder:printcolumn:JSONPath=".metadata.creationTimestamp",name="Age",type="date"
 
 // Hypervisor is the Schema for the hypervisors API

api/v1alpha1/zz_generated.deepcopy.go

@@ -16,9 +16,15 @@ spec:
   scope: Cluster
   versions:
   - additionalPrinterColumns:
-    - jsonPath: .status.node
-      name: Node
+    - jsonPath: .status.conditions[?(@.type=="Ready")].reason
+      name: State
       type: string
+    - jsonPath: .spec.lifecycleEnabled
+      name: Lifecycle
+      type: boolean
+    - jsonPath: .spec.highAvailability
+      name: High Availability
+      type: boolean
     - jsonPath: .status.operatingSystem.prettyVersion
       name: Version
       type: string
@@ -27,9 +33,11 @@ spec:
       type: integer
     - jsonPath: .status.operatingSystem.hardwareModel
       name: Hardware
+      priority: 2
       type: string
     - jsonPath: .status.operatingSystem.kernelRelease
       name: Kernel
+      priority: 2
       type: string
     - jsonPath: .metadata.creationTimestamp
       name: Age
@@ -65,28 +73,82 @@ spec:
                   Require to issue a certificate from cert-manager for the hypervisor, to be used for
                   secure communication with the libvirt API.
                 type: boolean
+              customTraits:
+                default: []
+                description: CustomTraits are used to apply custom traits to the hypervisor.
+                items:
+                  type: string
+                type: array
               evacuateOnReboot:
                 default: true
                 description: EvacuateOnReboot request an evacuation of all instances
                   before reboot.
                 type: boolean
+              highAvailability:
+                default: true
+                description: HighAvailability is used to enable the high availability
+                  handling of the hypervisor.
+                type: boolean
+              installCertificate:
+                default: true
+                description: InstallCertificate is used to enable the installations
+                  of the certificates via kvm-node-agent.
+                type: boolean
+              lifecycleEnabled:
+                default: true
+                description: LifecycleEnabled enables the lifecycle management of
+                  the hypervisor via hypervisor-operator.
+                type: boolean
               reboot:
                 default: false
                 description: Reboot request an reboot after successful installation
                   of an upgrade.
                 type: boolean
+              skipTests:
+                default: false
+                description: SkipTests skips the tests during the onboarding process.
+                type: boolean
               version:
                 description: OperatingSystemVersion represents the desired operating
                   system version.
                 type: string
             required:
             - createCertManagerCertificate
+            - customTraits
             - evacuateOnReboot
+            - highAvailability
+            - installCertificate
+            - lifecycleEnabled
             - reboot
+            - skipTests
             type: object
           status:
             description: HypervisorStatus defines the observed state of Hypervisor
             properties:
+              capabilities:
+                description: The capabilities of the hypervisors as reported by libvirt.
+                properties:
+                  cpuArch:
+                    default: unknown
+                    description: The hosts CPU architecture (not the guests).
+                    type: string
+                  cpus:
+                    anyOf:
+                    - type: integer
+                    - type: string
+                    description: Total host cpus available as a sum of cpus over all
+                      numa cells.
+                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                    x-kubernetes-int-or-string: true
+                  memory:
+                    anyOf:
+                    - type: integer
+                    - type: string
+                    description: Total host memory available as a sum of memory over
+                      all numa cells.
+                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                    x-kubernetes-int-or-string: true
+                type: object
               conditions:
                 description: Represents the Hypervisor node conditions.
                 items:

charts/kvm-node-agent/crds/hypervisor-crd.yaml

@@ -8,18 +8,11 @@ rules:
 - apiGroups:
   - ""
   resources:
-  - nodes
   - secrets
   verbs:
   - get
   - list
   - watch
-- apiGroups:
-  - ""
-  resources:
-  - nodes/status
-  verbs:
-  - get
 - apiGroups:
   - cert-manager.io
   resources:
@@ -43,7 +36,6 @@ rules:
   resources:
   - hypervisors
   verbs:
-  - create
   - delete
   - get
   - list

charts/kvm-node-agent/templates/manager-rbac.yaml

@@ -201,29 +201,6 @@ func main() {
 		os.Exit(1)
 	}
 
-	reboot := true
-	evacuateOnReboot := true
-	createCertManagerCertificate := true
-	if os.Getenv("DISABLE_REBOOT") != "" {
-		reboot = false
-	}
-	if os.Getenv("DISABLE_EVACUATE_ON_REBOOT") != "" {
-		evacuateOnReboot = false
-	}
-	if os.Getenv("DISABLE_CREATE_CERT_MANAGER_CERTIFICATE") != "" {
-		createCertManagerCertificate = false
-	}
-
-	if err = (&controller.NodeReconciler{
-		Client:                       mgr.GetClient(),
-		Scheme:                       mgr.GetScheme(),
-		Reboot:                       reboot,
-		EvacuateOnReboot:             evacuateOnReboot,
-		CreateCertManagerCertificate: createCertManagerCertificate,
-	}).SetupWithManager(mgr); err != nil {
-		setupLog.Error(err, "unable to create controller", "controller", "Node")
-		os.Exit(1)
-	}
 	if err = (&controller.SecretReconciler{
 		Client:  mgr.GetClient(),
 		Scheme:  mgr.GetScheme(),

cmd/main.go

@@ -17,9 +17,15 @@ spec:
   scope: Cluster
   versions:
   - additionalPrinterColumns:
-    - jsonPath: .status.node
-      name: Node
+    - jsonPath: .status.conditions[?(@.type=="Ready")].reason
+      name: State
       type: string
+    - jsonPath: .spec.lifecycleEnabled
+      name: Lifecycle
+      type: boolean
+    - jsonPath: .spec.highAvailability
+      name: High Availability
+      type: boolean
     - jsonPath: .status.operatingSystem.prettyVersion
       name: Version
       type: string
@@ -28,9 +34,11 @@ spec:
       type: integer
     - jsonPath: .status.operatingSystem.hardwareModel
       name: Hardware
+      priority: 2
       type: string
     - jsonPath: .status.operatingSystem.kernelRelease
       name: Kernel
+      priority: 2
       type: string
     - jsonPath: .metadata.creationTimestamp
       name: Age
@@ -66,24 +74,54 @@ spec:
                   Require to issue a certificate from cert-manager for the hypervisor, to be used for
                   secure communication with the libvirt API.
                 type: boolean
+              customTraits:
+                default: []
+                description: CustomTraits are used to apply custom traits to the hypervisor.
+                items:
+                  type: string
+                type: array
               evacuateOnReboot:
                 default: true
                 description: EvacuateOnReboot request an evacuation of all instances
                   before reboot.
                 type: boolean
+              highAvailability:
+                default: true
+                description: HighAvailability is used to enable the high availability
+                  handling of the hypervisor.
+                type: boolean
+              installCertificate:
+                default: true
+                description: InstallCertificate is used to enable the installations
+                  of the certificates via kvm-node-agent.
+                type: boolean
+              lifecycleEnabled:
+                default: true
+                description: LifecycleEnabled enables the lifecycle management of
+                  the hypervisor via hypervisor-operator.
+                type: boolean
               reboot:
                 default: false
                 description: Reboot request an reboot after successful installation
                   of an upgrade.
                 type: boolean
+              skipTests:
+                default: false
+                description: SkipTests skips the tests during the onboarding process.
+                type: boolean
               version:
                 description: OperatingSystemVersion represents the desired operating
                   system version.
                 type: string
             required:
             - createCertManagerCertificate
+            - customTraits
             - evacuateOnReboot
+            - highAvailability
+            - installCertificate
+            - lifecycleEnabled
             - reboot
+            - skipTests
             type: object
           status:
             description: HypervisorStatus defines the observed state of Hypervisor

config/crd/bases/kvm.cloud.sap_hypervisors.yaml

@@ -7,18 +7,11 @@ rules:
 - apiGroups:
   - ""
   resources:
-  - nodes
   - secrets
   verbs:
   - get
   - list
   - watch
-- apiGroups:
-  - ""
-  resources:
-  - nodes/status
-  verbs:
-  - get
 - apiGroups:
   - cert-manager.io
   resources:
@@ -42,7 +35,6 @@ rules:
   resources:
   - hypervisors
   verbs:
-  - create
   - delete
   - get
   - list