forked from aws/karpenter-provider-aws
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: CEL Validation for NodeClaim Requirement (aws#4895)
- Loading branch information
1 parent
110b6cd
commit 79389b0
Showing
8 changed files
with
154 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| # Requirements Validation | ||
|
|
||
| # Adding validation for nodeclaim | ||
|
|
||
| ## checking for restricted labels while filtering out well known labels | ||
| yq eval '.spec.versions[0].schema.openAPIV3Schema.properties.spec.properties.requirements.items.properties.key.x-kubernetes-validations += [ | ||
| {"message": "label domain \"karpenter.k8s.aws\" is restricted", "rule": "self in [\"karpenter.k8s.aws/instance-encryption-in-transit-supported\", \"karpenter.k8s.aws/instance-category\", \"karpenter.k8s.aws/instance-hypervisor\", \"karpenter.k8s.aws/instance-family\", \"karpenter.k8s.aws/instance-generation\", \"karpenter.k8s.aws/instance-local-nvme\", \"karpenter.k8s.aws/instance-size\", \"karpenter.k8s.aws/instance-cpu\",\"karpenter.k8s.aws/instance-memory\", \"karpenter.k8s.aws/instance-network-bandwidth\", \"karpenter.k8s.aws/instance-gpu-name\", \"karpenter.k8s.aws/instance-gpu-manufacturer\", \"karpenter.k8s.aws/instance-gpu-count\", \"karpenter.k8s.aws/instance-gpu-memory\", \"karpenter.k8s.aws/instance-accelerator-name\", \"karpenter.k8s.aws/instance-accelerator-manufacturer\", \"karpenter.k8s.aws/instance-accelerator-count\"] || !self.find(\"^([^/]+)\").endsWith(\"karpenter.k8s.aws\")"}]' -i pkg/apis/crds/karpenter.sh_nodeclaims.yaml | ||
| # # Adding validation for nodepool | ||
|
|
||
| # ## checking for restricted labels while filtering out well known labels | ||
| yq eval '.spec.versions[0].schema.openAPIV3Schema.properties.spec.properties.template.properties.spec.properties.requirements.items.properties.key.x-kubernetes-validations += [ | ||
| {"message": "label domain \"karpenter.k8s.aws\" is restricted", "rule": "self in [\"karpenter.k8s.aws/instance-encryption-in-transit-supported\", \"karpenter.k8s.aws/instance-category\", \"karpenter.k8s.aws/instance-hypervisor\", \"karpenter.k8s.aws/instance-family\", \"karpenter.k8s.aws/instance-generation\", \"karpenter.k8s.aws/instance-local-nvme\", \"karpenter.k8s.aws/instance-size\", \"karpenter.k8s.aws/instance-cpu\",\"karpenter.k8s.aws/instance-memory\", \"karpenter.k8s.aws/instance-network-bandwidth\", \"karpenter.k8s.aws/instance-gpu-name\", \"karpenter.k8s.aws/instance-gpu-manufacturer\", \"karpenter.k8s.aws/instance-gpu-count\", \"karpenter.k8s.aws/instance-gpu-memory\", \"karpenter.k8s.aws/instance-accelerator-name\", \"karpenter.k8s.aws/instance-accelerator-manufacturer\", \"karpenter.k8s.aws/instance-accelerator-count\"] || !self.find(\"^([^/]+)\").endsWith(\"karpenter.k8s.aws\")"}]' -i pkg/apis/crds/karpenter.sh_nodepools.yaml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| /* | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package v1beta1_test | ||
|
|
||
| import ( | ||
| "strings" | ||
|
|
||
| "github.com/Pallinder/go-randomdata" | ||
| . "github.com/onsi/ginkgo/v2" | ||
| . "github.com/onsi/gomega" | ||
| v1 "k8s.io/api/core/v1" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "k8s.io/apimachinery/pkg/util/sets" | ||
|
|
||
| "github.com/aws/karpenter-core/pkg/apis/v1beta1" | ||
| ) | ||
|
|
||
| var _ = Describe("CEL/Validation", func() { | ||
| var nodePool *v1beta1.NodePool | ||
|
|
||
| BeforeEach(func() { | ||
| if env.Version.Minor() < 25 { | ||
| Skip("CEL Validation is for 1.25>") | ||
| } | ||
| nodePool = &v1beta1.NodePool{ | ||
| ObjectMeta: metav1.ObjectMeta{Name: strings.ToLower(randomdata.SillyName())}, | ||
| Spec: v1beta1.NodePoolSpec{ | ||
| Template: v1beta1.NodeClaimTemplate{ | ||
| Spec: v1beta1.NodeClaimSpec{ | ||
| NodeClassRef: &v1beta1.NodeClassReference{ | ||
| Kind: "NodeClaim", | ||
| Name: "default", | ||
| }, | ||
| Requirements: []v1.NodeSelectorRequirement{ | ||
| { | ||
| Key: v1beta1.CapacityTypeLabelKey, | ||
| Operator: v1.NodeSelectorOpExists, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
| }) | ||
| It("should allow restricted domains exceptions", func() { | ||
| oldNodePool := nodePool.DeepCopy() | ||
| for label := range v1beta1.LabelDomainExceptions { | ||
| nodePool.Spec.Template.Spec.Requirements = []v1.NodeSelectorRequirement{ | ||
| {Key: label + "/test", Operator: v1.NodeSelectorOpIn, Values: []string{"test"}}, | ||
| } | ||
| Expect(env.Client.Create(ctx, nodePool)).To(Succeed()) | ||
| Expect(nodePool.RuntimeValidate()).To(Succeed()) | ||
| Expect(env.Client.Delete(ctx, nodePool)).To(Succeed()) | ||
| nodePool = oldNodePool.DeepCopy() | ||
| } | ||
| }) | ||
| It("should allow well known label exceptions", func() { | ||
| oldNodePool := nodePool.DeepCopy() | ||
| for label := range v1beta1.WellKnownLabels.Difference(sets.New(v1beta1.NodePoolLabelKey)) { | ||
| nodePool.Spec.Template.Spec.Requirements = []v1.NodeSelectorRequirement{ | ||
| {Key: label, Operator: v1.NodeSelectorOpIn, Values: []string{"test"}}, | ||
| } | ||
| Expect(env.Client.Create(ctx, nodePool)).To(Succeed()) | ||
| Expect(nodePool.RuntimeValidate()).To(Succeed()) | ||
| Expect(env.Client.Delete(ctx, nodePool)).To(Succeed()) | ||
| nodePool = oldNodePool.DeepCopy() | ||
| } | ||
| }) | ||
| }) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters