Make manager optional in legacy config + some fixes

janekbaraniewski · May 3, 2022 · 26f9c66 · 26f9c66
1 parent 073c3af
commit 26f9c66
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 24 deletions.
diff --git a/deploy/chart/kubeserial-crds/templates/app.kubeserial.com_kubeserials.yaml b/deploy/chart/kubeserial-crds/templates/app.kubeserial.com_kubeserials.yaml
@@ -48,7 +48,6 @@ spec:
                   required:
                   - idProduct
                   - idVendor
-                  - manager
                   - name
                   - subsystem
                   type: object

diff --git a/pkg/apis/kubeserial/v1alpha1/kubeserial.go b/pkg/apis/kubeserial/v1alpha1/kubeserial.go
@@ -23,10 +23,20 @@ import (
 // Device defines monitored device
 // +k8s:openapi-gen=true
 type Device_2 struct {
-	Name      string `json:"name"`
-	IdVendor  string `json:"idVendor"`
+	// +required
+	// +kubebuilder:validation:Required
+	Name string `json:"name"`
+	// +required
+	// +kubebuilder:validation:Required
+	IdVendor string `json:"idVendor"`
+	// +required
+	// +kubebuilder:validation:Required
 	IdProduct string `json:"idProduct"`
-	Manager   string `json:"manager"`
+	// +optional
+	// +kubebuilder:validation:Optional
+	Manager string `json:"manager"`
+	// +required
+	// +kubebuilder:validation:Required
 	Subsystem string `json:"subsystem"`
 }
 

diff --git a/pkg/apis/kubeserial/v1alpha1/zz_generated.openapi.go b/pkg/apis/kubeserial/v1alpha1/zz_generated.openapi.go
diff --git a/pkg/controllers/device_controller.go b/pkg/controllers/device_controller.go
@@ -96,26 +96,14 @@ func (r *DeviceReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr
 // EnsureConditions makes sure all conditions are available in resource
 func (r *DeviceReconciler) EnsureConditions(ctx context.Context, device *kubeserialv1alpha1.Device) error {
 	logger := devLog.WithName("EnsureConditions")
-	for _, condition := range []struct {
-		Type     kubeserialv1alpha1.DeviceConditionType
-		IsNeeded func() bool
-	}{
-		{
-			Type:     kubeserialv1alpha1.DeviceAvailable,
-			IsNeeded: func() bool { return true },
-		},
-		{
-			Type:     kubeserialv1alpha1.DeviceReady,
-			IsNeeded: device.NeedsManager,
-		},
+	for _, conditionType := range []kubeserialv1alpha1.DeviceConditionType{
+		kubeserialv1alpha1.DeviceAvailable,
+		kubeserialv1alpha1.DeviceReady,
 	} {
-		if !condition.IsNeeded() {
-			continue
-		}
-		if utils.GetCondition(device.Status.Conditions, condition.Type) == nil {
-			logger.Info("Condition didn't exist, creating", "conditionType", condition.Type)
+		if utils.GetCondition(device.Status.Conditions, conditionType) == nil {
+			logger.Info("Condition didn't exist, creating", "conditionType", conditionType)
 			utils.SetDeviceCondition(&device.Status.Conditions, kubeserialv1alpha1.DeviceCondition{
-				Type:   condition.Type,
+				Type:   conditionType,
 				Status: v1.ConditionUnknown,
 				Reason: "NotValidated",
 			})

diff --git a/pkg/monitor/ds.go b/pkg/monitor/ds.go
@@ -83,7 +83,7 @@ func CreateDaemonSet(cr *appv1alpha1.KubeSerial, monitorVersion string) *appsv1.
 							Command: []string{"/bin/sh"},
 							Args: []string{
 								"-c",
-								"./bin/device-monitor",
+								"./go/bin/device-monitor",
 							},
 							Env: []corev1.EnvVar{
 								{