Skip to content
This repository has been archived by the owner on Nov 29, 2024. It is now read-only.

Updates for Karpenter 0.35.x CRDs, fixes from previous updates #13

Merged
merged 8 commits into from
May 27, 2024
Merged

Updates for Karpenter 0.35.x CRDs, fixes from previous updates #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e57236d
Adds 0.35 changes for ec2nodeclasses
NicholasRaymondiSpot May 21, 2024
cd8f9b2
Adds 0.35 changes for nodeclaims
NicholasRaymondiSpot May 21, 2024
645dd21
Adds 0.35 changes for nodepools
NicholasRaymondiSpot May 21, 2024
9bee6d5
Added updates for missed changes, reorganization of properties
NicholasRaymondiSpot May 23, 2024
f720bab
Updated description with newline breaks
NicholasRaymondiSpot May 23, 2024
fee74fd
Updated using output from crd-extractor
NicholasRaymondiSpot May 27, 2024
edb3bc0
Fixed EOF newline missing
NicholasRaymondiSpot May 27, 2024
0d92720
Fixed EOF newline missing
NicholasRaymondiSpot May 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions karpenter.sh/nodeclaim_v1beta1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@
"requirements": {
"description": "Requirements are layered with GetLabels and applied to every node.",
"items": {
"description": "A node selector requirement is a selector that contains values, a key, and an operator\nthat relates the key and values.",
"description": "A node selector requirement with min values is a selector that contains values, a key, an operator that relates the key and values\nand minValues that represent the requirement to have at least that many values.",
"properties": {
"key": {
"description": "The label key that the selector applies to.",
Expand All @@ -206,11 +206,11 @@
"x-kubernetes-validations": [
{
"message": "label domain \"kubernetes.io\" is restricted",
"rule": "self in [\"beta.kubernetes.io/instance-type\", \"failure-domain.beta.kubernetes.io/region\", \"beta.kubernetes.io/os\", \"beta.kubernetes.io/arch\", \"failure-domain.beta.kubernetes.io/zone\", \"topology.kubernetes.io/zone\", \"topology.kubernetes.io/region\", \"node.kubernetes.io/instance-type\", \"kubernetes.io/arch\", \"kubernetes.io/os\", \"node.kubernetes.io/windows-build\"] || self.startsWith(\"node.kubernetes.io/\") || self.startsWith(\"node-restriction.kubernetes.io/\") || !self.find(\"^([^/]+)\").endsWith(\"kubernetes.io\")"
"rule": "self in [\"beta.kubernetes.io/instance-type\", \"failure-domain.beta.kubernetes.io/region\", \"beta.kubernetes.io/os\", \"beta.kubernetes.io/arch\", \"failure-domain.beta.kubernetes.io/zone\", \"topology.kubernetes.io/zone\", \"topology.kubernetes.io/region\", \"node.kubernetes.io/instance-type\", \"kubernetes.io/arch\", \"kubernetes.io/os\", \"node.kubernetes.io/windows-build\"] || self.find(\"^([^/]+)\").endsWith(\"node.kubernetes.io\") || self.find(\"^([^/]+)\").endsWith(\"node-restriction.kubernetes.io\") || !self.find(\"^([^/]+)\").endsWith(\"kubernetes.io\")"
},
{
"message": "label domain \"k8s.io\" is restricted",
"rule": "self.startsWith(\"kops.k8s.io/\") || !self.find(\"^([^/]+)\").endsWith(\"k8s.io\")"
"rule": "self.find(\"^([^/]+)\").endsWith(\"kops.k8s.io\") || !self.find(\"^([^/]+)\").endsWith(\"k8s.io\")"
},
{
"message": "label domain \"karpenter.sh\" is restricted",
Expand All @@ -226,6 +226,12 @@
}
]
},
"minValues": {
"description": "This field is ALPHA and can be dropped or replaced at any time\nMinValues is the minimum number of unique values required to define the flexibility of the specific requirement.",
"maximum": 50,
"minimum": 1,
"type": "integer"
},
"operator": {
"description": "Represents a key's relationship to a set of values.\nValid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.",
"enum": [
Expand Down Expand Up @@ -265,6 +271,10 @@
{
"message": "requirements operator 'Gt' or 'Lt' must have a single positive integer value",
"rule": "self.all(x, (x.operator == 'Gt' || x.operator == 'Lt') ? (x.values.size() == 1 && int(x.values[0]) >= 0) : true)"
},
{
"message": "requirements with 'minValues' must have at least that many values specified in the 'values' field",
"rule": "self.all(x, (x.operator == 'In' && has(x.minValues)) ? x.values.size() >= x.minValues : true)"
}
]
},
Expand Down Expand Up @@ -470,5 +480,8 @@
"additionalProperties": false
}
},
"required": [
"spec"
],
"type": "object"
}
34 changes: 27 additions & 7 deletions karpenter.sh/nodepool_v1beta1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@
"required": [
"nodes"
],
"type": "object"
"type": "object",
"additionalProperties": false
},
"maxItems": 50,
"type": "array",
Expand Down Expand Up @@ -137,11 +138,11 @@
"x-kubernetes-validations": [
{
"message": "label domain \"kubernetes.io\" is restricted",
"rule": "self.all(x, x in [\"beta.kubernetes.io/instance-type\", \"failure-domain.beta.kubernetes.io/region\", \"beta.kubernetes.io/os\", \"beta.kubernetes.io/arch\", \"failure-domain.beta.kubernetes.io/zone\", \"topology.kubernetes.io/zone\", \"topology.kubernetes.io/region\", \"kubernetes.io/arch\", \"kubernetes.io/os\", \"node.kubernetes.io/windows-build\"] || x.startsWith(\"node.kubernetes.io\") || x.startsWith(\"node-restriction.kubernetes.io\") || !x.find(\"^([^/]+)\").endsWith(\"kubernetes.io\"))"
"rule": "self.all(x, x in [\"beta.kubernetes.io/instance-type\", \"failure-domain.beta.kubernetes.io/region\", \"beta.kubernetes.io/os\", \"beta.kubernetes.io/arch\", \"failure-domain.beta.kubernetes.io/zone\", \"topology.kubernetes.io/zone\", \"topology.kubernetes.io/region\", \"kubernetes.io/arch\", \"kubernetes.io/os\", \"node.kubernetes.io/windows-build\"] || x.find(\"^([^/]+)\").endsWith(\"node.kubernetes.io\") || x.find(\"^([^/]+)\").endsWith(\"node-restriction.kubernetes.io\") || !x.find(\"^([^/]+)\").endsWith(\"kubernetes.io\"))"
},
{
"message": "label domain \"k8s.io\" is restricted",
"rule": "self.all(x, x.startsWith(\"kops.k8s.io\") || !x.find(\"^([^/]+)\").endsWith(\"k8s.io\"))"
"rule": "self.all(x, x.find(\"^([^/]+)\").endsWith(\"kops.k8s.io\") || !x.find(\"^([^/]+)\").endsWith(\"k8s.io\"))"
},
{
"message": "label domain \"karpenter.sh\" is restricted",
Expand Down Expand Up @@ -349,7 +350,7 @@
"requirements": {
"description": "Requirements are layered with GetLabels and applied to every node.",
"items": {
"description": "A node selector requirement is a selector that contains values, a key, and an operator\nthat relates the key and values.",
"description": "A node selector requirement with min values is a selector that contains values, a key, an operator that relates the key and values\nand minValues that represent the requirement to have at least that many values.",
"properties": {
"key": {
"description": "The label key that the selector applies to.",
Expand All @@ -359,11 +360,11 @@
"x-kubernetes-validations": [
{
"message": "label domain \"kubernetes.io\" is restricted",
"rule": "self in [\"beta.kubernetes.io/instance-type\", \"failure-domain.beta.kubernetes.io/region\", \"beta.kubernetes.io/os\", \"beta.kubernetes.io/arch\", \"failure-domain.beta.kubernetes.io/zone\", \"topology.kubernetes.io/zone\", \"topology.kubernetes.io/region\", \"node.kubernetes.io/instance-type\", \"kubernetes.io/arch\", \"kubernetes.io/os\", \"node.kubernetes.io/windows-build\"] || self.startsWith(\"node.kubernetes.io/\") || self.startsWith(\"node-restriction.kubernetes.io/\") || !self.find(\"^([^/]+)\").endsWith(\"kubernetes.io\")"
"rule": "self in [\"beta.kubernetes.io/instance-type\", \"failure-domain.beta.kubernetes.io/region\", \"beta.kubernetes.io/os\", \"beta.kubernetes.io/arch\", \"failure-domain.beta.kubernetes.io/zone\", \"topology.kubernetes.io/zone\", \"topology.kubernetes.io/region\", \"node.kubernetes.io/instance-type\", \"kubernetes.io/arch\", \"kubernetes.io/os\", \"node.kubernetes.io/windows-build\"] || self.find(\"^([^/]+)\").endsWith(\"node.kubernetes.io\") || self.find(\"^([^/]+)\").endsWith(\"node-restriction.kubernetes.io\") || !self.find(\"^([^/]+)\").endsWith(\"kubernetes.io\")"
},
{
"message": "label domain \"k8s.io\" is restricted",
"rule": "self.startsWith(\"kops.k8s.io/\") || !self.find(\"^([^/]+)\").endsWith(\"k8s.io\")"
"rule": "self.find(\"^([^/]+)\").endsWith(\"kops.k8s.io\") || !self.find(\"^([^/]+)\").endsWith(\"k8s.io\")"
},
{
"message": "label domain \"karpenter.sh\" is restricted",
Expand All @@ -383,6 +384,12 @@
}
]
},
"minValues": {
"description": "This field is ALPHA and can be dropped or replaced at any time\nMinValues is the minimum number of unique values required to define the flexibility of the specific requirement.",
"maximum": 50,
"minimum": 1,
"type": "integer"
},
"operator": {
"description": "Represents a key's relationship to a set of values.\nValid operators are In, NotIn, Exists, DoesNotExist. Gt, and Lt.",
"enum": [
Expand Down Expand Up @@ -422,11 +429,16 @@
{
"message": "requirements operator 'Gt' or 'Lt' must have a single positive integer value",
"rule": "self.all(x, (x.operator == 'Gt' || x.operator == 'Lt') ? (x.values.size() == 1 && int(x.values[0]) >= 0) : true)"
},
{
"message": "requirements with 'minValues' must have at least that many values specified in the 'values' field",
"rule": "self.all(x, (x.operator == 'In' && has(x.minValues)) ? x.values.size() >= x.minValues : true)"
}
]
},
"resources": {
"description": "Resources models the resource requirements for the NodeClaim to launch",
"maxProperties": 0,
"properties": {
"requests": {
"additionalProperties": {
Expand All @@ -446,7 +458,6 @@
}
},
"type": "object",
"maxProperties": 0,
"additionalProperties": false
},
"startupTaints": {
Expand Down Expand Up @@ -538,6 +549,9 @@
"additionalProperties": false
}
},
"required": [
"spec"
],
"type": "object",
"additionalProperties": false
},
Expand All @@ -549,6 +563,9 @@
"type": "integer"
}
},
"required": [
"template"
],
"type": "object",
"additionalProperties": false
},
Expand Down Expand Up @@ -576,5 +593,8 @@
"additionalProperties": false
}
},
"required": [
"spec"
],
"type": "object"
}