Skip to content

Commit

Permalink
Merge pull request #110 from Revolyssup/master
Browse files Browse the repository at this point in the history
Changed kubeopenapi-jsonschema version to latest.
  • Loading branch information
leecalcote authored Sep 29, 2021
2 parents bc42217 + b6e986b commit 894730b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions utils/manifests/definitions.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ The filters described below are an abstraction over those filters.
get versions and groups based on X. Hence ItrFilter in this example can be passed as "$.a.b[?(@.c".
All filters except this and ItrSpecFilter are complete.
4. GroupFilter- After ItrFilter gives us the object with the group and version of the crd/resource we are interested in with this iteration, GroupFilter is used as output filter to only extract the group.
5. VersionFilter- After ItrFilter gives us the object with the group and version of the crd/resource we are interested in with this iteration, GroupFilter is used as output filter to only extract the version.
4. GroupFilter- After ItrFilter gives us the object with the group and version of the crd/resource we are interested in with this iteration, GroupFilter is used as output filter to only extract the object with group in one of the fields.
5. VersionFilter- After ItrFilter gives us the object with the group and version of the crd/resource we are interested in with this iteration, GroupFilter is used as output filter to only extract the object with version in one of the fields.
6. ItrSpecFilter- Functionally is same as ItrFilter but instead of group and version, it is used to get openapi spec/schema.
7. GField- The GroupFilter returns a json which has group in it. The key name which is used to signify group will be passed here. For eg: "group"
8. VField- The GroupFilter returns a json which has version in it. The key name which is used to signify version will be passed here. For eg: "version", "name","version-name"
8. VField- The VersionFilter returns a json which has version in it. The key name which is used to signify version will be passed here. For eg: "version", "name","version-name"
9. OnlyRes- In some cases we dont want to compute crdnames/api-resources at runtime as we already have them. Pass those names as an array here to skip that step.
10. IsJson- The file on which to apply all these filters is, by default expected to be YAML. Set this to true if a JSON is passed instead. (These are the only two supported formats)
10. IsJson- The file on which to apply all these filters is by default expected to be YAML. Set this to true if a JSON is passed instead. (These are the only two supported formats)
11. SpecFilter- When SpecFilter is passed, it is applied as output filter after ItrSpec filter.
1(b) If SpecFilter is not passed, then before the ItrSpecFilter the rootfilter will be applied by default and then the ItrSpec filter will be applied as output filter.
Expand Down
2 changes: 1 addition & 1 deletion utils/manifests/generateComponent.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ func GenerateComponents(manifest string, resource int, cfg Config) (*Component,
wd := filepath.Join(utils.GetHome(), ".meshery", "bin")
fmt.Println("Looking for kubeopenapi-jsonschema in ", wd)
var binPath string = filepath.Join(wd, "kubeopenapi-jsonschema")
var url string = "https://github.com/layer5io/kubeopenapi-jsonschema/releases/download/v0.1.0/kubeopenapi-jsonschema"
var url string = "https://github.com/layer5io/kubeopenapi-jsonschema/releases/download/v0.1.2/kubeopenapi-jsonschema"
switch runtime.GOOS {
case "windows":
binPath += ".exe"
Expand Down
2 changes: 1 addition & 1 deletion utils/manifests/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ func getDefinitions(crd string, resource int, cfg Config, filepath string, binPa
"k8skind": crd,
}
def.ObjectMeta.Name += ".K8s"
def.Spec.DefinitionRef.Name = strings.ToLower(crd) + "k8s.meshery.layer5.io"
def.Spec.DefinitionRef.Name = strings.ToLower(crd) + ".k8s.meshery.layer5.io"
case MESHERY:
def.Spec.Metadata = map[string]string{
"@type": "pattern.meshery.io/core",
Expand Down

0 comments on commit 894730b

Please sign in to comment.