Skip to content

Commit a94a5ac

Browse files
committed
revert unintended changes
1 parent e90f6d8 commit a94a5ac

File tree

15 files changed

+773
-70
lines changed

15 files changed

+773
-70
lines changed

api/internal/konfig/builtinpluginconsts/namereference.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -421,6 +421,13 @@ nameReference:
421421
fieldSpecs:
422422
- path: spec/ingressClassName
423423
kind: Ingress
424+
425+
- kind: ValidatingAdmissionPolicy
426+
group: admissionregistration.k8s.io
427+
fieldSpecs:
428+
- path: spec/policyName
429+
kind: ValidatingAdmissionPolicyBinding
430+
group: admissionregistration.k8s.io
424431
`
425432
)
426433

api/internal/target/kusttarget.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ func (kt *KustTarget) accumulateResources(
457457
return ra, nil
458458
}
459459

460-
// accumulateResources fills the given resourceAccumulator
460+
// accumulateComponents fills the given resourceAccumulator
461461
// with resources read from the given list of paths.
462462
func (kt *KustTarget) accumulateComponents(
463463
ra *accumulator.ResAccumulator, paths []string) (*accumulator.ResAccumulator, error) {

api/krusty/namereference_test.go

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -786,3 +786,85 @@ spec:
786786
name: tester
787787
`)
788788
}
789+
790+
func TestBackReferenceAdmissionPolicy(t *testing.T) {
791+
th := kusttest_test.MakeHarness(t)
792+
th.WriteK(".", `
793+
resources:
794+
- admission.yaml
795+
796+
namePrefix: a-prefix-
797+
`)
798+
th.WriteF("admission.yaml", `---
799+
apiVersion: admissionregistration.k8s.io/v1beta1
800+
kind: ValidatingAdmissionPolicy
801+
metadata:
802+
name: sample-policy
803+
spec:
804+
failurePolicy: Fail
805+
paramKind:
806+
apiVersion: apps/v1
807+
kind: Deployment
808+
matchConstraints:
809+
resourceRules:
810+
- apiGroups:
811+
- apps
812+
apiVersions:
813+
- v1
814+
operations:
815+
- CREATE
816+
- UPDATE
817+
resources:
818+
- deployments
819+
validations:
820+
- expression: "!object.metadata.name.startsWith('test-')"
821+
message: prefix 'test-' is not allowed
822+
reason: Invalid
823+
---
824+
apiVersion: admissionregistration.k8s.io/v1beta1
825+
kind: ValidatingAdmissionPolicyBinding
826+
metadata:
827+
name: sample-policy-binding
828+
spec:
829+
policyName: sample-policy
830+
validationActions:
831+
- Deny
832+
`)
833+
834+
m := th.Run(".", th.MakeDefaultOptions())
835+
th.AssertActualEqualsExpected(m, `
836+
apiVersion: admissionregistration.k8s.io/v1beta1
837+
kind: ValidatingAdmissionPolicy
838+
metadata:
839+
name: a-prefix-sample-policy
840+
spec:
841+
failurePolicy: Fail
842+
matchConstraints:
843+
resourceRules:
844+
- apiGroups:
845+
- apps
846+
apiVersions:
847+
- v1
848+
operations:
849+
- CREATE
850+
- UPDATE
851+
resources:
852+
- deployments
853+
paramKind:
854+
apiVersion: apps/v1
855+
kind: Deployment
856+
validations:
857+
- expression: '!object.metadata.name.startsWith(''test-'')'
858+
message: prefix 'test-' is not allowed
859+
reason: Invalid
860+
---
861+
apiVersion: admissionregistration.k8s.io/v1beta1
862+
kind: ValidatingAdmissionPolicyBinding
863+
metadata:
864+
name: a-prefix-sample-policy-binding
865+
spec:
866+
policyName: a-prefix-sample-policy
867+
validationActions:
868+
- Deny
869+
`)
870+
}

cmd/config/internal/commands/run-fns.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"sigs.k8s.io/kustomize/cmd/config/internal/generateddocs/commands"
2121
)
2222

23-
// GetCatRunner returns a RunFnRunner.
23+
// GetRunFnRunner returns a RunFnRunner.
2424
func GetRunFnRunner(name string) *RunFnRunner {
2525
r := &RunFnRunner{}
2626
c := &cobra.Command{

cmd/config/internal/inpututil/inpututil.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ func MapInputsE(inputs []*yaml.RNode, fn MapInputsEFn) error {
2424

2525
type MapInputsFn func(*yaml.RNode, yaml.ResourceMeta) ([]*yaml.RNode, error)
2626

27-
// runs the function against each input Resource, providing the parsed metadata
27+
// runs the function against each input Resource, providing the parsed metadata
2828
func MapInputs(inputs []*yaml.RNode, fn MapInputsFn) ([]*yaml.RNode, error) {
2929
var outputs []*yaml.RNode
3030
for i := range inputs {

go.work.sum

Lines changed: 252 additions & 0 deletions
Large diffs are not rendered by default.

hack/go.mod

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require (
1212
github.com/instrumenta/kubeval v0.16.1
1313
github.com/joelanford/go-apidiff v0.6.0
1414
github.com/monopole/mdrip v1.0.3
15-
golang.org/x/tools v0.18.0
15+
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d
1616
sigs.k8s.io/controller-tools v0.14.0
1717
sigs.k8s.io/kind v0.21.0
1818
sigs.k8s.io/kustomize/cmd/mdtogo v0.0.0-20240208073625-b154361c0042
@@ -31,13 +31,13 @@ require (
3131
github.com/AlecAivazis/survey/v2 v2.2.2 // indirect
3232
github.com/Antonboom/errname v0.1.7 // indirect
3333
github.com/Antonboom/nilnil v0.1.1 // indirect
34-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.0 // indirect
35-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.0 // indirect
36-
github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect
34+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1 // indirect
35+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.6.0 // indirect
36+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.8.0 // indirect
3737
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.1.0 // indirect
3838
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
3939
github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect
40-
github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0 // indirect
40+
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
4141
github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69 // indirect
4242
github.com/BurntSushi/toml v1.2.1 // indirect
4343
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
@@ -154,7 +154,7 @@ require (
154154
github.com/gohugoio/go-i18n/v2 v2.1.3-0.20230805085216-e63c13218d0e // indirect
155155
github.com/gohugoio/locales v0.14.0 // indirect
156156
github.com/gohugoio/localescompressed v1.0.1 // indirect
157-
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
157+
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
158158
github.com/golang/glog v1.2.0 // indirect
159159
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
160160
github.com/golang/protobuf v1.5.3 // indirect
@@ -172,7 +172,7 @@ require (
172172
github.com/google/s2a-go v0.1.7 // indirect
173173
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
174174
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
175-
github.com/google/uuid v1.3.1 // indirect
175+
github.com/google/uuid v1.6.0 // indirect
176176
github.com/google/wire v0.5.0 // indirect
177177
github.com/googleapis/enterprise-certificate-proxy v0.3.1 // indirect
178178
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
@@ -260,7 +260,7 @@ require (
260260
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
261261
github.com/perimeterx/marshmallow v1.1.5 // indirect
262262
github.com/pjbgf/sha1cd v0.3.0 // indirect
263-
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
263+
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
264264
github.com/pkg/errors v0.9.1 // indirect
265265
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
266266
github.com/polyfloyd/go-errorlint v1.1.0 // indirect
@@ -273,7 +273,7 @@ require (
273273
github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95 // indirect
274274
github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
275275
github.com/rivo/uniseg v0.1.0 // indirect
276-
github.com/rogpeppe/go-internal v1.11.0 // indirect
276+
github.com/rogpeppe/go-internal v1.12.0 // indirect
277277
github.com/russross/blackfriday/v2 v2.1.0 // indirect
278278
github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd // indirect
279279
github.com/ryancurrah/gomodguard v1.3.0 // indirect
@@ -305,8 +305,8 @@ require (
305305
github.com/spf13/viper v1.17.0 // indirect
306306
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
307307
github.com/stbenjam/no-sprintf-host-port v0.1.1 // indirect
308-
github.com/stretchr/objx v0.5.0 // indirect
309-
github.com/stretchr/testify v1.8.4 // indirect
308+
github.com/stretchr/objx v0.5.2 // indirect
309+
github.com/stretchr/testify v1.9.0 // indirect
310310
github.com/subosito/gotenv v1.6.0 // indirect
311311
github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c // indirect
312312
github.com/tdakkota/asciicheck v0.1.1 // indirect
@@ -337,18 +337,18 @@ require (
337337
go.uber.org/multierr v1.11.0 // indirect
338338
go.uber.org/zap v1.24.0 // indirect
339339
gocloud.dev v0.34.0 // indirect
340-
golang.org/x/crypto v0.21.0 // indirect
340+
golang.org/x/crypto v0.24.0 // indirect
341341
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
342342
golang.org/x/exp/typeparams v0.0.0-20230203172020-98cc5a0785f9 // indirect
343-
golang.org/x/image v0.13.0 // indirect
343+
golang.org/x/image v0.18.0 // indirect
344344
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
345-
golang.org/x/mod v0.15.0 // indirect
346-
golang.org/x/net v0.23.0 // indirect
345+
golang.org/x/mod v0.17.0 // indirect
346+
golang.org/x/net v0.26.0 // indirect
347347
golang.org/x/oauth2 v0.12.0 // indirect
348-
golang.org/x/sync v0.6.0 // indirect
349-
golang.org/x/sys v0.18.0 // indirect
350-
golang.org/x/term v0.18.0 // indirect
351-
golang.org/x/text v0.14.0 // indirect
348+
golang.org/x/sync v0.7.0 // indirect
349+
golang.org/x/sys v0.21.0 // indirect
350+
golang.org/x/term v0.21.0 // indirect
351+
golang.org/x/text v0.16.0 // indirect
352352
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
353353
google.golang.org/api v0.143.0 // indirect
354354
google.golang.org/appengine v1.6.7 // indirect

0 commit comments

Comments
 (0)