replace k8s rules with those from yannh/kubernetes-json-schema, move our rules to other directories

README.md

@@ -64,11 +64,21 @@ File names should match, but since projects will change independently, care shou
 ### Troubleshoot
 
 ```
-cp <troubleshoot root>/schemas/*.json <kots-lint root>/kubernetes_json_schema/schema/v1.23.6-standalone-strict/
+cp <troubleshoot root>/schemas/*.json <kots-lint root>/kubernetes_json_schema/schema/troubleshoot/
 ```
 
 ### KOTS
 
 ```
-cp <kots root>/kotskinds/schemas/*.json <kots-lint root>/kubernetes_json_schema/schema/v1.23.6-standalone-strict/
-```
+cp <kots root>/kotskinds/schemas/*.json <kots-lint root>/kubernetes_json_schema/schema/kots/
+```
+
+### Kubernetes
+
+```
+git clone git@github.com:yannh/kubernetes-json-schema.git
+cp <kubernetes-json-schema>/<desired-version>-standalone-strict/*.json <kots-lint root>/kubernetes_json_schema/schema/<desired-version>-standalone-strict/
+rm -rf <kots-lint root>/kubernetes_json_schema/schema/<previous-version>-standalone-strict/
+```
+
+Finally, update the `KUBERNETES_LINT_VERSION` constant in the `kubernetes_json_schema/schema.go` file.

kubernetes_json_schema/schema.go

@@ -2,15 +2,17 @@ package kubernetes_json_schema
 
 import (
 	"embed"
+	"fmt"
 	"io/fs"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
 
 	"github.com/pkg/errors"
 )
 
+const KUBERNETES_LINT_VERSION = "1.31.4"
+
 //go:embed schema/**/*.json
 var kubernetesJsonSchemaFS embed.FS
 
@@ -22,7 +24,7 @@ func InitKubernetesJsonSchemaDir() (string, error) {
 }
 
 func initKubernetesJsonSchemaDir(schemaFS embed.FS) (string, error) {
-	tempDir, err := ioutil.TempDir("", "kubernetesjsonschema")
+	tempDir, err := os.MkdirTemp("", "kubernetesjsonschema")
 	if err != nil {
 		return "", errors.Wrap(err, "failed to create temp dir")
 	}
@@ -42,17 +44,18 @@ func initKubernetesJsonSchemaDir(schemaFS embed.FS) (string, error) {
 		}
 
 		parts := strings.Split(path, string(os.PathSeparator))
-		if len(parts) < 2 {
+		if len(parts) < 3 {
 			return nil
 		}
-		destPath := filepath.Join(parts[1:]...) // trim root directory
+		destPath := filepath.Join(parts[2:]...) // trim root directory
+		destPath = filepath.Join(fmt.Sprintf("v%s-standalone-strict", KUBERNETES_LINT_VERSION), destPath)
 
 		destDir := filepath.Dir(filepath.Join(tempDir, destPath))
 		if err := os.MkdirAll(destDir, 0755); err != nil {
 			return errors.Wrapf(err, "failed to create dir %s", destDir)
 		}
 
-		if err := ioutil.WriteFile(filepath.Join(tempDir, destPath), data, 0755); err != nil {
+		if err := os.WriteFile(filepath.Join(tempDir, destPath), data, 0755); err != nil {
 			return errors.Wrap(err, "failed to write file")
 		}
 

kubernetes_json_schema/schema/v1.23.6-standalone-strict/config-embeddedcluster-v1beta1.json → kubernetes_json_schema/schema/embeddedcluster/config-embeddedcluster-v1beta1.json

@@ -239,4 +239,4 @@
       "type": "object"
     }
   }
-}
+}

kubernetes_json_schema/schema/v1.23.6-standalone-strict/airgap-kots-v1beta1.json → kubernetes_json_schema/schema/kots/airgap-kots-v1beta1.json

@@ -26,6 +26,24 @@
         "channelName": {
           "type": "string"
         },
+        "embeddedClusterArtifacts": {
+          "description": "EmbeddedClusterArtifacts maps embedded cluster artifacts to their path",
+          "type": "object",
+          "properties": {
+            "binaryAmd64": {
+              "type": "string"
+            },
+            "charts": {
+              "type": "string"
+            },
+            "imagesAmd64": {
+              "type": "string"
+            },
+            "metadata": {
+              "type": "string"
+            }
+          }
+        },
         "format": {
           "type": "string"
         },
@@ -35,6 +53,12 @@
         "releaseNotes": {
           "type": "string"
         },
+        "replicatedChartNames": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
         "requiredReleases": {
           "type": "array",
           "items": {

kubernetes_json_schema/schema/v1.23.6-standalone-strict/installation-kots-v1beta1.json → kubernetes_json_schema/schema/kots/installation-kots-v1beta1.json

@@ -23,6 +23,24 @@
         "channelName": {
           "type": "string"
         },
+        "embeddedClusterArtifacts": {
+          "description": "EmbeddedClusterArtifacts maps embedded cluster artifacts to their path",
+          "type": "object",
+          "properties": {
+            "binaryAmd64": {
+              "type": "string"
+            },
+            "charts": {
+              "type": "string"
+            },
+            "imagesAmd64": {
+              "type": "string"
+            },
+            "metadata": {
+              "type": "string"
+            }
+          }
+        },
         "encryptionKey": {
           "type": "string"
         },
@@ -50,6 +68,18 @@
           "type": "string",
           "format": "date-time"
         },
+        "replicatedChartNames": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "replicatedProxyDomain": {
+          "type": "string"
+        },
+        "replicatedRegistryDomain": {
+          "type": "string"
+        },
         "updateCursor": {
           "type": "string"
         },

kubernetes_json_schema/schema/v1.23.6-standalone-strict/application-app-v1beta1.json → kubernetes_json_schema/schema/other/application-app-v1beta1.json

@@ -492,4 +492,4 @@
       }
     }
   }
-}
+}

kubernetes_json_schema/schema/other/application-kgrid-v1beta1.json

@@ -0,0 +1,119 @@
+{
+  "description": "Application is the Schema for the applications API",
+  "type": "object",
+  "properties": {
+    "apiVersion": {
+      "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+      "type": "string"
+    },
+    "kind": {
+      "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+      "type": "string"
+    },
+    "metadata": {
+      "type": "object"
+    },
+    "spec": {
+      "description": "ApplicationSpec defines the desired state of Application",
+      "type": "object",
+      "properties": {
+        "kots": {
+          "type": "object",
+          "required": [
+            "clusters",
+            "licenseID"
+          ],
+          "properties": {
+            "appSlug": {
+              "type": "string"
+            },
+            "channelID": {
+              "type": "string"
+            },
+            "channelSequence": {
+              "type": "integer"
+            },
+            "clusters": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            "configValues": {
+              "description": "App is the Schema for the app API",
+              "type": "object",
+              "properties": {
+                "apiVersion": {
+                  "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
+                  "type": "string"
+                },
+                "kind": {
+                  "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
+                  "type": "string"
+                },
+                "metadata": {
+                  "type": "object"
+                },
+                "spec": {
+                  "description": "ConfigValuesSpec defines the desired state of ConfigValue",
+                  "type": "object",
+                  "required": [
+                    "values"
+                  ],
+                  "properties": {
+                    "values": {
+                      "type": "object",
+                      "additionalProperties": {
+                        "type": "object",
+                        "properties": {
+                          "data": {
+                            "type": "string"
+                          },
+                          "dataPlaintext": {
+                            "type": "string"
+                          },
+                          "default": {
+                            "type": "string"
+                          },
+                          "value": {
+                            "type": "string"
+                          },
+                          "valuePlaintext": {
+                            "type": "string"
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "status": {
+                  "description": "ConfigValuesStatus defines the observed state of ConfigValues",
+                  "type": "object"
+                }
+              }
+            },
+            "endpoint": {
+              "type": "string"
+            },
+            "licenseID": {
+              "type": "string"
+            },
+            "namespace": {
+              "type": "string"
+            },
+            "skipPreflights": {
+              "type": "boolean"
+            },
+            "version": {
+              "type": "string"
+            }
+          }
+        }
+      }
+    },
+    "status": {
+      "description": "ApplicationStatus defines the observed state of Application",
+      "type": "object"
+    }
+  }
+}

kubernetes_json_schema/schema/v1.23.6-standalone-strict/analyzer-troubleshoot-v1beta1.json → kubernetes_json_schema/schema/troubleshoot/analyzer-troubleshoot-v1beta1.json

@@ -604,6 +604,15 @@
                       "podCapacity": {
                         "type": "string"
                       },
+                      "resourceAllocatable": {
+                        "type": "string"
+                      },
+                      "resourceCapacity": {
+                        "type": "string"
+                      },
+                      "resourceName": {
+                        "type": "string"
+                      },
                       "selector": {
                         "type": "object",
                         "properties": {