airship/airshipctl
Code Issues Proposed changes

Add possibility to override default schema location for validator

Browse Source 
This feature would be helpful in case if default schema location is
not reachable (e.g. proxy restrictions).

Change-Id: I9a36256410b31bf5de410fab88cc2c3f31ed5793
Signed-off-by: Ruslan Aliev <raliev@mirantis.com>
This commit is contained in:
Ruslan Aliev 2021-05-12 17:40:30 -05:00
parent bfe8cd3b00
commit 93d9967ada
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
krm-functions/kubeval-validator/image/main.go
View File

@ -97,6 +97,10 @@ type Spec struct {
// KubernetesVersion is the version of Kubernetes to validate // KubernetesVersion is the version of Kubernetes to validate
// against (default "master"). // against (default "master").
KubernetesVersion string `yaml:"kubernetesVersion,omitempty"` KubernetesVersion string `yaml:"kubernetesVersion,omitempty"`
// SchemaLocation is the base URL from which to search for schemas.
// It can be either a remote location or a local directory
SchemaLocation string `yaml:"schemaLocation,omitempty"`
} }
// CRDSpec holds special options for plan/phase which kinds to skip and which additional CRDs to include // CRDSpec holds special options for plan/phase which kinds to skip and which additional CRDs to include
@ -125,6 +129,7 @@ func (f kubevalFilter) Filter(in []*yaml.RNode) ([]*yaml.RNode, error) {
kubevalConfig.Strict = cfg.Spec.Strict kubevalConfig.Strict = cfg.Spec.Strict
kubevalConfig.IgnoreMissingSchemas = cfg.Spec.IgnoreMissingSchemas kubevalConfig.IgnoreMissingSchemas = cfg.Spec.IgnoreMissingSchemas
kubevalConfig.KubernetesVersion = cfg.Spec.KubernetesVersion kubevalConfig.KubernetesVersion = cfg.Spec.KubernetesVersion
kubevalConfig.SchemaLocation = cfg.Spec.SchemaLocation
kubevalConfig.AdditionalSchemaLocations = []string{fileScheme + "://" + schemaLocationDir} kubevalConfig.AdditionalSchemaLocations = []string{fileScheme + "://" + schemaLocationDir}
kubevalConfig.KindsToSkip = []string{crdKind, kubevalOptsKind} kubevalConfig.KindsToSkip = []string{crdKind, kubevalOptsKind}
var crdList []string var crdList []string