From ae6c7032ee79aea2505ac202e4c4350875e9030c Mon Sep 17 00:00:00 2001 From: Cindy Bang Date: Wed, 27 Mar 2024 14:00:00 -0400 Subject: [PATCH] fixup! fix: add name validation for custom resource templates --- .../validation_in_linodeclustertemplates.yaml | 2 +- .../validation_in_linodemachinetemplates.yaml | 18 +++++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/config/crd/patches/validation_in_linodeclustertemplates.yaml b/config/crd/patches/validation_in_linodeclustertemplates.yaml index 579ae5542..2c2fb7556 100644 --- a/config/crd/patches/validation_in_linodeclustertemplates.yaml +++ b/config/crd/patches/validation_in_linodeclustertemplates.yaml @@ -6,4 +6,4 @@ type: string x-kubernetes-validations: - rule: 3 <= size(self) && size(self) <= 26 - message: linode nodebalancer labels must be between 3..32 characters + message: "custom validation: linode nodebalancer: labels must be between 3..32 characters" diff --git a/config/crd/patches/validation_in_linodemachinetemplates.yaml b/config/crd/patches/validation_in_linodemachinetemplates.yaml index 518d79602..a23fa5b38 100644 --- a/config/crd/patches/validation_in_linodemachinetemplates.yaml +++ b/config/crd/patches/validation_in_linodemachinetemplates.yaml @@ -7,11 +7,15 @@ x-kubernetes-validations: - rule: 3 <= size(self) && size(self) <= 58 message: linode instance labels must be between 3..64 characters - # TODO: Combine these into one regex to validate ALL constraints on Linode instance labels at once? - # https://www.linode.com/docs/api/linode-instances/#linode-create - - rule: self.contains('^[a-z0-9](.*[a-z0-9])*$') - message: linode instance labels must begin and end with an alphanumeric character - - rule: self.contains('^[-_.[:alnum:]]*$') - message: linode instance labels may only consist of alphanumeric characters, hyphens (-), underscores (_) or periods (.) + - rule: self.matches('^[[:alnum:]]([-_.[:alnum:]]+[:alnum:])*$') + message: > + custom validation: linode instance: labels: + must begin and end with an alphanumeric character, + may only consist of alphanumeric characters, hyphens (-), underscores (_) or periods (.), + cannot have two hyphens (--), underscores (__) or periods (..) in a row; + regex used for validation is: '^[[:alnum:]]([-_.[:alnum:]]+[:alnum:])*$', + see: https://www.linode.com/docs/api/linode-instances/#linode-create + # TODO: We need to combine this into one regex to minimize time complexity 🥺 + # See: https://github.com/google/cel-spec/blob/master/doc/langdef.md#time-complexity - rule: "!(self.contains('--') || self.contains('__') || self.contains('..'))" - message: linode instance labels cannot have two hyphens (--), underscores (__) or periods (..) in a row + message: "custom validation: linode instance: labels cannot have two hyphens (--), underscores (__) or periods (..) in a row"