Add support for MatchExpression CEL constraint DRA

Author: geetasg

README_ruhip.md

@@ -0,0 +1,26 @@
+### Details
+* This is a forked repo from kubernetes to add support for DRA CEL constraint
+
+This modifies the kube-apiserver and kube-scheduler components to introduce a new CEL expression constraint for DRA. Specifically, the following files have been modified:
+* kube-apiserver: kubernetes/staging/src/k8s.io/api/resource/v1alpha3/types.go
+* kube-scheduler: kubernetes/staging/src/k8s.io/dynamic-resource-allocation/structured/allocator.go
+
+### Testing Steps
+
+Add a tag
+ git tag -a v1.34.0-alpha.dracelexpr
+
+KUBE_BUILD_PLATFORMS=linux/amd64 KUBE_DOCKER_IMAGE_TAG=v1.34.0-dracelexpr make quick-release-images
+
+kind load docker-image registry.k8s.io/kube-controller-manager-amd64:v1.34.0-dracelexpr --name dra-example-driver-cluster
+kind load docker-image registry.k8s.io/kube-apiserver-amd64:v1.34.0-dracelexpr --name dra-example-driver-cluster
+kind load docker-image registry.k8s.io/kube-scheduler-amd64:v1.34.0-dracelexpr --name dra-example-driver-cluster
+kind load docker-image registry.k8s.io/kube-proxy-amd64:v1.34.0-dracelexpr --name dra-example-driver-cluster
+
+
+then docker exec -it /bin/bash into control plane container and update manifests - change the image and change log verbosity to 6 -- pods will restart automatically. Verify with get pod that control plane components are running with the above images - change apiserver, kcm and scheduler ..not sure if kcm needs to be updated.
+
+Logs from dra code are in scheduler log
+kubectl logs kube-scheduler-dra-example-driver-cluster-control-plane -n kube-system > s.log
+
+

api/openapi-spec/swagger.json

@@ -976,7 +976,7 @@ type DeviceConstraint struct {
 	// accidentally ignore this additional, for them unknown match
 	// criteria.
 	//
-	// MatchExpression string
+	MatchExpression string
 }
 
 // DeviceClaimConfiguration is used for configuration parameters in DeviceClaim.

api/openapi-spec/v3/apis__resource.k8s.io__v1alpha3_openapi.json

@@ -312,11 +312,20 @@ func validateDeviceConstraint(constraint resource.DeviceConstraint, fldPath *fie
 			return validateRequestNameRef(name, fldPath, requestNames)
 		},
 		stringKey, fldPath.Child("requests"))...)
-	if constraint.MatchAttribute == nil {
-		allErrs = append(allErrs, field.Required(fldPath.Child("matchAttribute"), ""))
-	} else {
+
+	if constraint.MatchAttribute == nil && constraint.MatchExpression == "" {
+		allErrs = append(allErrs, field.Required(fldPath, "must specify either matchAttribute or MatchExpression"))
+	}
+	if constraint.MatchAttribute != nil && constraint.MatchExpression != "" {
+		allErrs = append(allErrs, field.Invalid(fldPath, constraint, "cannot specify both matchAttribute and MatchExpression"))
+	}
+	// Validate MatchAttribute if present
+	if constraint.MatchAttribute != nil {
 		allErrs = append(allErrs, validateFullyQualifiedName(*constraint.MatchAttribute, fldPath.Child("matchAttribute"))...)
 	}
+
+	//TODO add validation for Expression
+
 	return allErrs
 }