fix rebase

Author: daimaxiaxie

Makefile

@@ -43,6 +43,7 @@ update: tidy download ## Update go files header, CRD and generated code
 	hack/boilerplate.sh
 	hack/update-generated.sh
 	hack/validation/kubelet.sh
+	cp pkg/apis/crds/* charts/karpenter/crds
 
 verify: ## Verify code. Includes linting, formatting, etc
 	golangci-lint run

charts/karpenter/crds/karpenter.k8s.alibabacloud_ecsnodeclasses.yaml

@@ -3,7 +3,7 @@
 set -eu -o pipefail
 
 # Update CRD
-controller-gen crd paths=./pkg/apis/v1alpha1/... output:crd:dir=./charts/karpenter/crds
+go generate ./...
 
 # Update generated code
 export REPO_ROOT=$(pwd)

config/config.go

@@ -3,11 +3,11 @@
 # The regular expression adds validation for kubelet.kubeReserved and kubelet.systemReserved values of the map are resource.Quantity
 # Quantity: https://github.com/kubernetes/apimachinery/blob/d82afe1e363acae0e8c0953b1bc230d65fdb50e2/pkg/api/resource/quantity.go#L100
 # EC2NodeClass Validation:
-yq eval '.spec.versions[0].schema.openAPIV3Schema.properties.spec.properties.kubeletConfiguration.properties.kubeReserved.additionalProperties.pattern = "^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$"' -i config/components/crds/karpenter.k8s.alicloud_ecsnodeclasses.yaml
-yq eval '.spec.versions[0].schema.openAPIV3Schema.properties.spec.properties.kubeletConfiguration.properties.systemReserved.additionalProperties.pattern = "^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$"' -i config/components/crds/karpenter.k8s.alicloud_ecsnodeclasses.yaml
+yq eval '.spec.versions[0].schema.openAPIV3Schema.properties.spec.properties.kubeletConfiguration.properties.kubeReserved.additionalProperties.pattern = "^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$"' -i pkg/apis/crds/karpenter.k8s.alibabacloud_ecsnodeclasses.yaml
+yq eval '.spec.versions[0].schema.openAPIV3Schema.properties.spec.properties.kubeletConfiguration.properties.systemReserved.additionalProperties.pattern = "^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$"' -i pkg/apis/crds/karpenter.k8s.alibabacloud_ecsnodeclasses.yaml
 
 # The regular expression is a validation for kubelet.evictionHard and kubelet.evictionSoft are percentage or a resource.Quantity
 # Quantity: https://github.com/kubernetes/apimachinery/blob/d82afe1e363acae0e8c0953b1bc230d65fdb50e2/pkg/api/resource/quantity.go#L100
 # EC2NodeClass Validation:
-yq eval '.spec.versions[0].schema.openAPIV3Schema.properties.spec.properties.kubeletConfiguration.properties.evictionHard.additionalProperties.pattern = "^((\d{1,2}(\.\d{1,2})?|100(\.0{1,2})?)%||(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?)$"' -i config/components/crds/karpenter.k8s.alicloud_ecsnodeclasses.yaml
-yq eval '.spec.versions[0].schema.openAPIV3Schema.properties.spec.properties.kubeletConfiguration.properties.evictionSoft.additionalProperties.pattern = "^((\d{1,2}(\.\d{1,2})?|100(\.0{1,2})?)%||(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?)$"' -i config/components/crds/karpenter.k8s.alicloud_ecsnodeclasses.yaml
+yq eval '.spec.versions[0].schema.openAPIV3Schema.properties.spec.properties.kubeletConfiguration.properties.evictionHard.additionalProperties.pattern = "^((\d{1,2}(\.\d{1,2})?|100(\.0{1,2})?)%||(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?)$"' -i pkg/apis/crds/karpenter.k8s.alibabacloud_ecsnodeclasses.yaml
+yq eval '.spec.versions[0].schema.openAPIV3Schema.properties.spec.properties.kubeletConfiguration.properties.evictionSoft.additionalProperties.pattern = "^((\d{1,2}(\.\d{1,2})?|100(\.0{1,2})?)%||(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?)$"' -i pkg/apis/crds/karpenter.k8s.alibabacloud_ecsnodeclasses.yaml

hack/update-generated.sh

@@ -16,15 +16,18 @@ limitations under the License.
 package apis
 
 import (
+	_ "embed"
+
 	"github.com/awslabs/operatorpkg/object"
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"sigs.k8s.io/karpenter/pkg/apis"
-
-	"github.com/cloudpilot-ai/karpenter-provider-alicloud/config"
 )
 
+//go:generate controller-gen crd object:headerFile="../../hack/boilerplate.go.txt" paths="./..." output:crd:artifacts:config=crds
 var (
 	Group              = "karpenter.k8s.alibabacloud"
 	CompatibilityGroup = "compatibility." + Group
-	CRDs               = append(apis.CRDs, object.Unmarshal[apiextensionsv1.CustomResourceDefinition](config.ECSNodeClassCRD))
+	//go:embed crds/karpenter.k8s.alibabacloud_ecsnodeclasses.yaml
+	ECSNodeClassCRD []byte
+	CRDs            = append(apis.CRDs, object.Unmarshal[apiextensionsv1.CustomResourceDefinition](ECSNodeClassCRD))
 )