From dfb2839ab18dc93cb80914e83ba83294afdb47d6 Mon Sep 17 00:00:00 2001 From: lreciomelero Date: Fri, 30 Jun 2023 11:42:25 +0200 Subject: [PATCH 1/2] changed valid field --- pkg/cmd/kind/create/cluster/validation/validator.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/cmd/kind/create/cluster/validation/validator.go b/pkg/cmd/kind/create/cluster/validation/validator.go index 79a09e546f..335de7cce6 100644 --- a/pkg/cmd/kind/create/cluster/validation/validator.go +++ b/pkg/cmd/kind/create/cluster/validation/validator.go @@ -111,7 +111,7 @@ func verifyFields(descriptor commons.DescriptorFile) error { return errors.New(err.Error() + "Supported fields for " + descriptor.InfraProvider + ": " + strings.Join(supportedFields, ", ")) } case "azure": - supportedFields = []string{"provisioner", "fsType", "skuName", "kind", "cachingMode", "diskEncryptionType", "resourceGroup", "tags", "networkAccessPolicy", "publicNetworkAccess", "diskAccessID", "enableBursting", "enablePerformancePlus", "subscriptionID"} + supportedFields = []string{"provisioner", "fstype", "skuName", "kind", "cachingMode", "diskEncryptionType", "resourceGroup", "tags", "networkAccessPolicy", "publicNetworkAccess", "diskAccessID", "enableBursting", "enablePerformancePlus", "subscriptionID"} err := verifyAdditionalFields(params, []string{"Provisioner", "FsType", "SkuName", "Kind", "CachingMode", "DiskEncryptionType", "ResourceGroup", "Tags", "NetworkAccessPolicy", "PublicNetworkAccess", "DiskAccessID", "EnableBursting", "EnablePerformancePlus", "SubscriptionID"}) if err != nil { return errors.New(err.Error() + "Supported fields for " + descriptor.InfraProvider + ": " + strings.Join(supportedFields, ", ")) From bab736b7f0b8c35f99c136290502dbfd0c0a89d5 Mon Sep 17 00:00:00 2001 From: lreciomelero Date: Fri, 30 Jun 2023 11:52:32 +0200 Subject: [PATCH 2/2] changed valid field --- pkg/cmd/kind/create/cluster/validation/validator.go | 4 ++-- pkg/commons/cluster.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/cmd/kind/create/cluster/validation/validator.go b/pkg/cmd/kind/create/cluster/validation/validator.go index 335de7cce6..0c9689d1d8 100644 --- a/pkg/cmd/kind/create/cluster/validation/validator.go +++ b/pkg/cmd/kind/create/cluster/validation/validator.go @@ -105,13 +105,13 @@ func verifyFields(descriptor commons.DescriptorFile) error { return errors.New(err.Error() + "Supported fields for " + descriptor.InfraProvider + ": " + strings.Join(supportedFields, ", ")) } case "aws": - supportedFields = []string{"type", "iopsPerGB", "fstype", "allowAutoIOPSPerGBIncrease", "iops", "throughput", "blockExpress", "blockSize", "labels"} + supportedFields = []string{"type", "iopsPerGB", "fsType", "allowAutoIOPSPerGBIncrease", "iops", "throughput", "blockExpress", "blockSize", "labels"} err := verifyAdditionalFields(params, []string{"Type", "IopsPerGB", "FsType", "AllowAutoIOPSPerGBIncrease", "Iops", "Throughput", "BlockExpress", "BlockSize", "Labels"}) if err != nil { return errors.New(err.Error() + "Supported fields for " + descriptor.InfraProvider + ": " + strings.Join(supportedFields, ", ")) } case "azure": - supportedFields = []string{"provisioner", "fstype", "skuName", "kind", "cachingMode", "diskEncryptionType", "resourceGroup", "tags", "networkAccessPolicy", "publicNetworkAccess", "diskAccessID", "enableBursting", "enablePerformancePlus", "subscriptionID"} + supportedFields = []string{"provisioner", "fsType", "skuName", "kind", "cachingMode", "diskEncryptionType", "resourceGroup", "tags", "networkAccessPolicy", "publicNetworkAccess", "diskAccessID", "enableBursting", "enablePerformancePlus", "subscriptionID"} err := verifyAdditionalFields(params, []string{"Provisioner", "FsType", "SkuName", "Kind", "CachingMode", "DiskEncryptionType", "ResourceGroup", "Tags", "NetworkAccessPolicy", "PublicNetworkAccess", "DiskAccessID", "EnableBursting", "EnablePerformancePlus", "SubscriptionID"}) if err != nil { return errors.New(err.Error() + "Supported fields for " + descriptor.InfraProvider + ": " + strings.Join(supportedFields, ", ")) diff --git a/pkg/commons/cluster.go b/pkg/commons/cluster.go index e137c5163c..a46958778f 100644 --- a/pkg/commons/cluster.go +++ b/pkg/commons/cluster.go @@ -275,7 +275,7 @@ type SCParameters struct { Labels string `yaml:"labels,omitempty" validate:"omitempty"` IopsPerGB string `yaml:"iopsPerGB,omitempty" validate:"omitempty,excluded_with=Iops"` - FsType string `yaml:"fstype,omitempty" validate:"omitempty"` + FsType string `yaml:"fsType,omitempty" validate:"omitempty"` KmsKeyId string `yaml:"kmsKeyId,omitempty" validate:"omitempty"` AllowAutoIOPSPerGBIncrease string `yaml:"allowAutoIOPSPerGBIncrease,omitempty" validate:"omitempty,oneof='true' 'false'"` Iops string `yaml:"iops,omitempty" validate:"omitempty,excluded_with=IopsPerGB"`