Skip to content

Commit e414355

Browse files
fjogeleitfjogeleit
authored
Update to current kyverno main (#1070)
* Update to current kyverno main Signed-off-by: Frank Jogeleit <frank.jogeleit@web.de> * update versioning Signed-off-by: Frank Jogeleit <frank.jogeleit@web.de> * schema updates Signed-off-by: Frank Jogeleit <frank.jogeleit@web.de> --------- Signed-off-by: Frank Jogeleit <frank.jogeleit@web.de>
1 parent 45538c3 commit e414355

File tree

11 files changed

+170
-60
lines changed

11 files changed

+170
-60
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
KIND_IMAGE ?= kindest/node:v1.33.1
66
KIND_NAME ?= kind
7-
KYVERNO_VERSION ?= v1.15.1
7+
KYVERNO_VERSION ?= main
88
KOCACHE ?= /tmp/ko-cache
99
USE_CONFIG ?= standard,no-ingress,in-cluster,all-read-rbac
1010
KUBECONFIG ?= ""

‎backend/data/schemas/apis/policies.kyverno.io/v1alpha1.json‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎backend/go.mod‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
github.com/knadh/koanf/parsers/yaml v1.1.0
1212
github.com/knadh/koanf/providers/file v1.2.0
1313
github.com/knadh/koanf/v2 v2.3.0
14-
github.com/kyverno/kyverno v1.15.1
14+
github.com/kyverno/kyverno v1.5.0-rc1.0.20250916081458-93be27ce3540
1515
github.com/loopfz/gadgeto v0.11.5
1616
github.com/spf13/cobra v1.10.1
1717
github.com/stretchr/testify v1.11.1
@@ -145,7 +145,7 @@ require (
145145
github.com/go-git/go-billy/v5 v5.6.2 // indirect
146146
github.com/go-ini/ini v1.67.0 // indirect
147147
github.com/go-jose/go-jose/v3 v3.0.4 // indirect
148-
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
148+
github.com/go-jose/go-jose/v4 v4.1.1 // indirect
149149
github.com/go-ldap/ldap/v3 v3.4.10 // indirect
150150
github.com/go-logr/stdr v1.2.2 // indirect
151151
github.com/go-logr/zerologr v1.2.3 // indirect
@@ -172,7 +172,7 @@ require (
172172
github.com/golang/protobuf v1.5.4 // indirect
173173
github.com/golang/snappy v0.0.4 // indirect
174174
github.com/google/btree v1.1.3 // indirect
175-
github.com/google/cel-go v0.26.0 // indirect
175+
github.com/google/cel-go v0.26.1 // indirect
176176
github.com/google/certificate-transparency-go v1.3.1 // indirect
177177
github.com/google/gnostic-models v0.7.0 // indirect
178178
github.com/google/go-cmp v0.7.0 // indirect
@@ -337,29 +337,29 @@ require (
337337
go.yaml.in/yaml/v2 v2.4.2 // indirect
338338
go.yaml.in/yaml/v3 v3.0.4 // indirect
339339
golang.org/x/arch v0.18.0 // indirect
340-
golang.org/x/crypto v0.40.0 // indirect
340+
golang.org/x/crypto v0.42.0 // indirect
341341
golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 // indirect
342-
golang.org/x/mod v0.26.0 // indirect
343-
golang.org/x/net v0.41.0 // indirect
342+
golang.org/x/mod v0.27.0 // indirect
343+
golang.org/x/net v0.43.0 // indirect
344344
golang.org/x/oauth2 v0.30.0 // indirect
345-
golang.org/x/sync v0.16.0 // indirect
346-
golang.org/x/sys v0.34.0 // indirect
347-
golang.org/x/term v0.33.0 // indirect
348-
golang.org/x/text v0.27.0 // indirect
345+
golang.org/x/sync v0.17.0 // indirect
346+
golang.org/x/sys v0.36.0 // indirect
347+
golang.org/x/term v0.35.0 // indirect
348+
golang.org/x/text v0.29.0 // indirect
349349
golang.org/x/time v0.11.0 // indirect
350350
google.golang.org/api v0.233.0 // indirect
351351
google.golang.org/genproto v0.0.0-20250303144028-a0af3efb3deb // indirect
352-
google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 // indirect
353-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
354-
google.golang.org/grpc v1.74.2 // indirect
355-
google.golang.org/protobuf v1.36.6 // indirect
352+
google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
353+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
354+
google.golang.org/grpc v1.75.1 // indirect
355+
google.golang.org/protobuf v1.36.8 // indirect
356356
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
357357
gopkg.in/inf.v0 v0.9.1 // indirect
358358
gopkg.in/ini.v1 v1.67.0 // indirect
359359
gopkg.in/yaml.v2 v2.4.0 // indirect
360360
gopkg.in/yaml.v3 v3.0.1 // indirect
361361
k8s.io/apiextensions-apiserver v0.34.0 // indirect
362-
k8s.io/cli-runtime v0.33.3 // indirect
362+
k8s.io/cli-runtime v0.33.4 // indirect
363363
k8s.io/component-base v0.34.0 // indirect
364364
k8s.io/klog/v2 v2.130.1 // indirect
365365
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
@@ -371,7 +371,7 @@ require (
371371
sigs.k8s.io/kustomize/api v0.20.1 // indirect
372372
sigs.k8s.io/kustomize/kyaml v0.20.1 // indirect
373373
sigs.k8s.io/randfill v1.0.0 // indirect
374-
sigs.k8s.io/release-utils v0.12.0 // indirect
374+
sigs.k8s.io/release-utils v0.12.1 // indirect
375375
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
376376
)
377377

‎backend/go.sum‎

Lines changed: 38 additions & 36 deletions
Large diffs are not rendered by default.

‎backend/pkg/engine/processor.go‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,12 @@ func (p *Processor) Run(
159159
gvk := newResource.GroupVersionKind()
160160
gvr := gvk.GroupVersion().WithResource(strings.ToLower(gvk.Kind + "s"))
161161

162-
result, err := admissionpolicy.Validate(pData, newResource, gvk, gvr, make(map[string]map[string]string), p.dClient, true)
162+
result, err := admissionpolicy.Validate(pData, newResource, gvk, gvr, make(map[string]map[string]string), p.dClient, &authenticationv1.UserInfo{
163+
UID: "user-123",
164+
Username: p.params.Context.Username,
165+
Groups: p.params.Context.Groups,
166+
Extra: nil,
167+
}, true)
163168
if err != nil {
164169
return nil, err
165170
}
@@ -429,7 +434,6 @@ func newEngine(
429434
) (engineapi.Engine, error) {
430435
return kyvernoengine.NewEngine(
431436
cfg,
432-
config.NewDefaultMetricsConfiguration(),
433437
jp,
434438
client,
435439
rclient,

‎frontend/src/components/AppBar/AppBar.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
size="small"
1313
style="position: absolute; bottom: 20px; right: -90px"
1414
>
15-
v1.15.0
15+
v1.15.2
1616
</v-chip>
1717
</template>
1818
<template v-if="display.smAndDown.value">
@@ -22,7 +22,7 @@
2222
size="small"
2323
style="position: absolute; bottom: 16px; left: 90px"
2424
>
25-
Kyverno v1.15.0
25+
Kyverno v1.15.2
2626
</v-chip>
2727
</template>
2828
</div>
@@ -31,7 +31,7 @@
3131
<div>
3232
<v-menu v-if="config.versions.length" open-on-hover>
3333
<template v-slot:activator="{ props }">
34-
<v-btn variant="outlined" class="text-none" rounded="xl" v-bind="props">v1.15.0 </v-btn>
34+
<v-btn variant="outlined" class="text-none" rounded="xl" v-bind="props">v1.15.2 </v-btn>
3535
</template>
3636

3737
<v-list variant="flat" class="my-0 py-0 border">

‎frontend/src/schemas/policyexception-policies.kyverno.io-v1alpha1.json‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,32 @@
317317
"spec": {
318318
"description": "Spec declares policy exception behaviors.",
319319
"properties": {
320+
"allowedValues": {
321+
"description": "AllowedValues specifies values that can be used in CEL expressions to bypass policy checks.\nThese values can be referenced in CEL expressions via `exceptions.allowedValues`.",
322+
"items": {
323+
"type": [
324+
"string",
325+
"null"
326+
]
327+
},
328+
"type": [
329+
"array",
330+
"null"
331+
]
332+
},
333+
"images": {
334+
"description": "Images specifies container images to be excluded from policy evaluation.\nThese excluded images can be referenced in CEL expressions via `exceptions.allowedImages`.",
335+
"items": {
336+
"type": [
337+
"string",
338+
"null"
339+
]
340+
},
341+
"type": [
342+
"array",
343+
"null"
344+
]
345+
},
320346
"matchConditions": {
321347
"description": "MatchConditions is a list of CEL expressions that must be met for a resource to be excluded.",
322348
"items": {

‎frontend/src/schemas/policyexceptionlist-policies.kyverno.io-v1alpha1.json‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,32 @@
332332
"spec": {
333333
"description": "Spec declares policy exception behaviors.",
334334
"properties": {
335+
"allowedValues": {
336+
"description": "AllowedValues specifies values that can be used in CEL expressions to bypass policy checks.\nThese values can be referenced in CEL expressions via `exceptions.allowedValues`.",
337+
"items": {
338+
"type": [
339+
"string",
340+
"null"
341+
]
342+
},
343+
"type": [
344+
"array",
345+
"null"
346+
]
347+
},
348+
"images": {
349+
"description": "Images specifies container images to be excluded from policy evaluation.\nThese excluded images can be referenced in CEL expressions via `exceptions.allowedImages`.",
350+
"items": {
351+
"type": [
352+
"string",
353+
"null"
354+
]
355+
},
356+
"type": [
357+
"array",
358+
"null"
359+
]
360+
},
335361
"matchConditions": {
336362
"description": "MatchConditions is a list of CEL expressions that must be met for a resource to be excluded.",
337363
"items": {

‎schemas/json/v3/policyexception-policies.kyverno.io-v1alpha1.json‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,32 @@
317317
"spec": {
318318
"description": "Spec declares policy exception behaviors.",
319319
"properties": {
320+
"allowedValues": {
321+
"description": "AllowedValues specifies values that can be used in CEL expressions to bypass policy checks.\nThese values can be referenced in CEL expressions via `exceptions.allowedValues`.",
322+
"items": {
323+
"type": [
324+
"string",
325+
"null"
326+
]
327+
},
328+
"type": [
329+
"array",
330+
"null"
331+
]
332+
},
333+
"images": {
334+
"description": "Images specifies container images to be excluded from policy evaluation.\nThese excluded images can be referenced in CEL expressions via `exceptions.allowedImages`.",
335+
"items": {
336+
"type": [
337+
"string",
338+
"null"
339+
]
340+
},
341+
"type": [
342+
"array",
343+
"null"
344+
]
345+
},
320346
"matchConditions": {
321347
"description": "MatchConditions is a list of CEL expressions that must be met for a resource to be excluded.",
322348
"items": {

‎schemas/json/v3/policyexceptionlist-policies.kyverno.io-v1alpha1.json‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,32 @@
332332
"spec": {
333333
"description": "Spec declares policy exception behaviors.",
334334
"properties": {
335+
"allowedValues": {
336+
"description": "AllowedValues specifies values that can be used in CEL expressions to bypass policy checks.\nThese values can be referenced in CEL expressions via `exceptions.allowedValues`.",
337+
"items": {
338+
"type": [
339+
"string",
340+
"null"
341+
]
342+
},
343+
"type": [
344+
"array",
345+
"null"
346+
]
347+
},
348+
"images": {
349+
"description": "Images specifies container images to be excluded from policy evaluation.\nThese excluded images can be referenced in CEL expressions via `exceptions.allowedImages`.",
350+
"items": {
351+
"type": [
352+
"string",
353+
"null"
354+
]
355+
},
356+
"type": [
357+
"array",
358+
"null"
359+
]
360+
},
335361
"matchConditions": {
336362
"description": "MatchConditions is a list of CEL expressions that must be met for a resource to be excluded.",
337363
"items": {

0 commit comments

Comments
 (0)