fix

Signed-off-by: Charles-Edouard Brétéché <[email protected]>

Author: eddycharly

cmd/download-builtin-schemas/main.go

@@ -38,6 +38,16 @@ func main() {
 	}
 
 	// Versions 1.0-1.22 did not have OpenAPIV3 schemas.
+	one27Fetcher := openapiclient.NewGitHubBuiltins("1.27")
+	one27Paths, err := one27Fetcher.Paths()
+
+	if err != nil {
+		panic(err)
+	}
+
+	apiregistrationV1Path := "apis/apiregistration.k8s.io/v1"
+	one27APIRegistrationV1 := one27Paths[apiregistrationV1Path]
+
 	for i := 23; ; i++ {
 		version := fmt.Sprintf("1.%d", i)
 		fetcher := openapiclient.NewGitHubBuiltins(version)
@@ -47,6 +57,13 @@ func main() {
 			break
 		}
 
+		if i < 27 {
+			// Copy over the APIRegistrationV1 schema from 1.27 in older
+			// releasees due to
+			// https://github.com/kubernetes/kubernetes/pull/118879
+			schemas[apiregistrationV1Path] = one27APIRegistrationV1
+		}
+
 		for k, v := range schemas {
 			data, err := v.Schema("application/json")
 			if err != nil {

pkg/cmd/validate.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"io/fs"
 	"net/http"
 	"os"
 
@@ -164,16 +165,27 @@ func errorToStatus(err error) metav1.Status {
 }
 
 func (c *commandFlags) Run(cmd *cobra.Command, args []string) error {
+	var schemaPatchesFs, localSchemasFs fs.FS
+	if c.schemaPatchesDir != "" {
+		schemaPatchesFs = os.DirFS(c.schemaPatchesDir)
+	}
+	if c.localSchemasDir != "" {
+		localSchemasFs = os.DirFS(c.localSchemasDir)
+	}
+	var localCRDsFileSystems []fs.FS
+	for _, current := range c.localCRDsDir {
+		localCRDsFileSystems = append(localCRDsFileSystems, os.DirFS(current))
+	}
 	// tool fetches openapi in the following priority order:
 	factory, err := validator.New(
 		openapiclient.NewOverlay(
 			// apply user defined patches on top of the final schema
-			openapiclient.PatchLoaderFromDirectory(nil, c.schemaPatchesDir),
+			openapiclient.PatchLoaderFromDirectory(schemaPatchesFs),
 			openapiclient.NewComposite(
 				// consult local OpenAPI
-				openapiclient.NewLocalSchemaFiles(nil, c.localSchemasDir),
+				openapiclient.NewLocalSchemaFiles(localSchemasFs),
 				// consult local CRDs
-				openapiclient.NewLocalCRDFiles(nil, c.localCRDsDir),
+				openapiclient.NewLocalCRDFiles(localCRDsFileSystems...),
 				openapiclient.NewOverlay(
 					// Hand-written hardcoded patches.
 					openapiclient.HardcodedPatchLoader(c.version),