Skip to content

Commit

Permalink
Merge pull request #3715 from natasha41575/SpeedUpCustomParsing
Browse files Browse the repository at this point in the history
Speed up custom parsing
  • Loading branch information
monopole authored Mar 16, 2021
2 parents 5247aa5 + 2f6a611 commit 831f99c
Show file tree
Hide file tree
Showing 6 changed files with 299 additions and 92,468 deletions.
12 changes: 3 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ verify-kustomize: \
lint-kustomize \
test-unit-kustomize-all \
test-examples-kustomize-against-HEAD \
test-examples-kustomize-against-4.0 \
test-examples-kustomize-against-3.10
test-examples-kustomize-against-4.0

# The following target referenced by a file in
# https://github.com/kubernetes/test-infra/tree/master/config/jobs/kubernetes-sigs/kustomize
Expand All @@ -39,8 +38,7 @@ prow-presubmit-check: \
test-unit-cmd-all \
test-go-mod \
test-examples-kustomize-against-HEAD \
test-examples-kustomize-against-4.0 \
test-examples-kustomize-against-3.10
test-examples-kustomize-against-4.0

.PHONY: verify-kustomize-e2e
verify-kustomize-e2e: test-examples-e2e-kustomize
Expand Down Expand Up @@ -282,11 +280,7 @@ test-examples-kustomize-against-HEAD: $(MYGOBIN)/kustomize $(MYGOBIN)/mdrip

.PHONY:
test-examples-kustomize-against-4.0: $(MYGOBIN)/mdrip
./hack/testExamplesAgainstKustomize.sh [email protected]

.PHONY:
test-examples-kustomize-against-3.10: $(MYGOBIN)/mdrip
./hack/testExamplesAgainstKustomize.sh [email protected]
./hack/testExamplesAgainstKustomize.sh [email protected]

# linux only.
# This is for testing an example plugin that
Expand Down
4 changes: 4 additions & 0 deletions api/krusty/openapicustomschema_test.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright 2019 The Kubernetes Authors.
// SPDX-License-Identifier: Apache-2.0

package krusty_test

import (
Expand Down Expand Up @@ -183,6 +186,7 @@ openapi:

func TestCustomOpenApiFieldOverlayTakesPrecedence(t *testing.T) {
th := kusttest_test.MakeHarness(t)
openapi.ResetOpenAPI()
th.WriteK("base", `
resources:
- mycrd.yaml
Expand Down
3 changes: 3 additions & 0 deletions api/krusty/openapiversion_test.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright 2019 The Kubernetes Authors.
// SPDX-License-Identifier: Apache-2.0

package krusty_test

import (
Expand Down
Loading

0 comments on commit 831f99c

Please sign in to comment.