Skip to content

Commit

Permalink
minor edit to the doc and fix typo
Browse files Browse the repository at this point in the history
Signed-off-by: Hui Kang <[email protected]>
  • Loading branch information
Hui Kang committed Sep 3, 2021
1 parent 1892ff0 commit de9c211
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion docs/features/kustomize.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ patchesStrategicMerge:
image: nginx
```
The OpenAPI data is defined in a [file](https://github.com/argoproj/argo-rollouts/blob/master/docs/features/kustomize/rollout_cr_schema.json).
The OpenAPI data is auto-generated and defined in this [file](https://github.com/argoproj/argo-rollouts/blob/master/docs/features/kustomize/rollout_cr_schema.json).
An example kustomize app demonstrating the ability to use OpenAPI data with Rollouts can be seen
[here](https://github.com/argoproj/argo-rollouts/blob/master/test/kustomize/rollout).
4 changes: 2 additions & 2 deletions hack/gen-crd-spec/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ func loadK8SDefinitions() (spec.Definitions, error) {
k8sVersionCmd := exec.Command("sh", "-c", "go list -m all | grep k8s.io/client-go | awk '{print $2}'")
versionData, err := k8sVersionCmd.Output()
if err != nil {
return nil, fmt.Errorf("failed to determine k8s client verison: %v", err)
return nil, fmt.Errorf("failed to determine k8s client version: %v", err)
}
v, err := semver.Parse(strings.TrimSpace(strings.Replace(string(versionData), "v", "", 1)))
if err != nil {
Expand Down Expand Up @@ -386,7 +386,7 @@ const (
rolloutsDefinitionsPrefix = "github.com/argoproj/argo-rollouts/pkg/apis/rollouts"
)

// generateKustomizeSchema generates open api schema that has properies with patch annotations only
// generateKustomizeSchema generates open api schema that has properties with patch annotations only
func generateKustomizeSchema(crds []*extensionsobj.CustomResourceDefinition, outputPath string) error {
k8sDefinitions, err := loadK8SDefinitions()
if err != nil {
Expand Down
3 changes: 1 addition & 2 deletions test/kustomize/rollout/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ images:
newTag: v2

openapi:
path: ../../../docs/features/kustomize/rollout.swagger.json
# path: ../../../docs/features/kustomize/rollout_cr_schema.json
path: ../../../docs/features/kustomize/rollout_cr_schema.json

patchesStrategicMerge:
- |-
Expand Down

0 comments on commit de9c211

Please sign in to comment.