From 6ffe272ff0cd8a270362a9fcd70e281e5b07464c Mon Sep 17 00:00:00 2001 From: Ilya Drey Date: Fri, 31 Jul 2026 19:13:32 +0300 Subject: [PATCH] feat: embed kubeconform schemas Signed-off-by: Ilya Drey --- api/v1alpha1/release_types.go | 6 ------ api/v1alpha1/zz_generated.deepcopy.go | 5 ----- config/crd/bases/nelm.werf.io_releases.yaml | 6 ------ go.mod | 2 +- go.sum | 4 ++-- internal/controller/release_controller.go | 6 ------ 6 files changed, 3 insertions(+), 26 deletions(-) diff --git a/api/v1alpha1/release_types.go b/api/v1alpha1/release_types.go index ba9621f..863db68 100644 --- a/api/v1alpha1/release_types.go +++ b/api/v1alpha1/release_types.go @@ -817,15 +817,9 @@ type ValidationConfig struct { // +optional LocalOnly bool `json:"localOnly,omitempty"` - // +optional - KubeVersion string `json:"kubeVersion,omitempty"` - // +optional Skip []string `json:"skip,omitempty"` - // +optional - Schemas []string `json:"schemas,omitempty"` - // +optional ExtraSchemas []string `json:"extraSchemas,omitempty"` diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go index 91ae846..f62519a 100644 --- a/api/v1alpha1/zz_generated.deepcopy.go +++ b/api/v1alpha1/zz_generated.deepcopy.go @@ -794,11 +794,6 @@ func (in *ValidationConfig) DeepCopyInto(out *ValidationConfig) { *out = make([]string, len(*in)) copy(*out, *in) } - if in.Schemas != nil { - in, out := &in.Schemas, &out.Schemas - *out = make([]string, len(*in)) - copy(*out, *in) - } if in.ExtraSchemas != nil { in, out := &in.ExtraSchemas, &out.ExtraSchemas *out = make([]string, len(*in)) diff --git a/config/crd/bases/nelm.werf.io_releases.yaml b/config/crd/bases/nelm.werf.io_releases.yaml index ad55a4d..a1a2451 100644 --- a/config/crd/bases/nelm.werf.io_releases.yaml +++ b/config/crd/bases/nelm.werf.io_releases.yaml @@ -1184,8 +1184,6 @@ spec: items: type: string type: array - kubeVersion: - type: string localOnly: type: boolean noResourceValidation: @@ -1194,10 +1192,6 @@ spec: type: boolean schemaCacheLifetime: type: string - schemas: - items: - type: string - type: array skip: items: type: string diff --git a/go.mod b/go.mod index 4d91857..7daa3c1 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/onsi/ginkgo/v2 v2.28.1 github.com/onsi/gomega v1.39.1 github.com/werf/logboek v0.6.1 - github.com/werf/nelm v1.26.2-0.20260714212319-5c9ccecdb898 + github.com/werf/nelm v1.26.2-0.20260731170307-2a29517d8d19 k8s.io/api v0.35.3 k8s.io/apiextensions-apiserver v0.35.3 k8s.io/apimachinery v0.35.3 diff --git a/go.sum b/go.sum index ecdcbe4..11d8408 100644 --- a/go.sum +++ b/go.sum @@ -403,8 +403,8 @@ github.com/werf/lockgate v0.1.1 h1:S400JFYjtWfE4i4LY9FA8zx0fMdfui9DPrBiTciCrx4= github.com/werf/lockgate v0.1.1/go.mod h1:0yIFSLq9ausy6ejNxF5uUBf/Ib6daMAfXuCaTMZJzIE= github.com/werf/logboek v0.6.1 h1:oEe6FkmlKg0z0n80oZjLplj6sXcBeLleCkjfOOZEL2g= github.com/werf/logboek v0.6.1/go.mod h1:Gez5J4bxekyr6MxTmIJyId1F61rpO+0/V4vjCIEIZmk= -github.com/werf/nelm v1.26.2-0.20260714212319-5c9ccecdb898 h1:4jZdUnRfoadaBNlVf1F+TxIuJSc78NgcpuKSeW1xSpk= -github.com/werf/nelm v1.26.2-0.20260714212319-5c9ccecdb898/go.mod h1:eI4z6u+zG3t+CLdqRvAxNjoLH/5Jq3wStjUILE4HjFc= +github.com/werf/nelm v1.26.2-0.20260731170307-2a29517d8d19 h1:siwzbEpwFYNC+lNH4DNypAwh3/O6UMifvX4NSxU/ui8= +github.com/werf/nelm v1.26.2-0.20260731170307-2a29517d8d19/go.mod h1:eI4z6u+zG3t+CLdqRvAxNjoLH/5Jq3wStjUILE4HjFc= github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= diff --git a/internal/controller/release_controller.go b/internal/controller/release_controller.go index cda0c36..c333b6b 100644 --- a/internal/controller/release_controller.go +++ b/internal/controller/release_controller.go @@ -828,8 +828,6 @@ func (r *ReleaseReconciler) buildTrackingOptions(rel *nelmv1alpha1.Release) comm func (r *ReleaseReconciler) buildValidationOptions(rel *nelmv1alpha1.Release) common.ResourceValidationOptions { opts := common.ResourceValidationOptions{ - ValidationKubeVersion: common.DefaultResourceValidationKubeVersion, - ValidationSchemas: common.DefaultResourceValidationSchema, ValidationSchemaCacheLifetime: common.DefaultResourceValidationCacheLifetime, } @@ -841,11 +839,7 @@ func (r *ReleaseReconciler) buildValidationOptions(rel *nelmv1alpha1.Release) co opts.NoResourceValidation = v.NoResourceValidation opts.NoValuesSchemaValidation = v.NoValuesSchemaValidation opts.LocalResourceValidation = v.LocalOnly - if v.KubeVersion != "" { - opts.ValidationKubeVersion = v.KubeVersion - } opts.ValidationSkip = v.Skip - opts.ValidationSchemas = v.Schemas opts.ValidationExtraSchemas = v.ExtraSchemas opts.ValidationSchemaCacheLifetime = v.SchemaCacheLifetime.Duration