Skip to content

Commit

Permalink
Fix definitions (#791)
Browse files Browse the repository at this point in the history
* chore: fix schema definitions and update kyverno

Signed-off-by: Frank Jogeleit <[email protected]>

* update release notes

Signed-off-by: Frank Jogeleit <[email protected]>

---------

Signed-off-by: Frank Jogeleit <[email protected]>
fjogeleit authored Nov 13, 2024
1 parent e5abc05 commit 1fe7c56
Showing 10 changed files with 21 additions and 26 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@

KIND_IMAGE ?= kindest/node:v1.31.0
KIND_NAME ?= kind
KYVERNO_VERSION ?= v1.13.0
KYVERNO_VERSION ?= v1.13.1
KOCACHE ?= /tmp/ko-cache
USE_CONFIG ?= standard,no-ingress,in-cluster,all-read-rbac
KUBECONFIG ?= ""
2 changes: 1 addition & 1 deletion backend/go.mod
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ require (
github.com/gin-contrib/cors v1.7.2
github.com/gin-gonic/gin v1.10.0
github.com/go-logr/logr v1.4.2
github.com/kyverno/kyverno v1.13.0
github.com/kyverno/kyverno v1.13.1
github.com/loopfz/gadgeto v0.11.4
github.com/spf13/cobra v1.8.1
github.com/stretchr/testify v1.9.0
4 changes: 2 additions & 2 deletions backend/go.sum
Original file line number Diff line number Diff line change
@@ -605,8 +605,8 @@ github.com/kyverno/go-jmespath v0.4.1-0.20231124160150-95e59c162877 h1:XOLJNGX/q
github.com/kyverno/go-jmespath v0.4.1-0.20231124160150-95e59c162877/go.mod h1:yzDHaKovQy16rjN4kFnjF+IdNoN4p1ndw+va6+B8zUU=
github.com/kyverno/go-jmespath/internal/testify v1.5.2-0.20230630133209-945021c749d9 h1:lL311dF3a2aeNibJj8v+uhFU3XkvRHZmCtAdSPOrQYY=
github.com/kyverno/go-jmespath/internal/testify v1.5.2-0.20230630133209-945021c749d9/go.mod h1:XRxUGHIiCy1WYma1CdfdO1WOhIe8dLPTENaZr5D1ex4=
github.com/kyverno/kyverno v1.13.0 h1:/yDsoAox+UwHzWPsGZeCTKxMARICs1+kIren+cRegWs=
github.com/kyverno/kyverno v1.13.0/go.mod h1:iC+KA2dfcNOy/hbOnadZ+usSac0rCS+BZ9/1zLU0YPM=
github.com/kyverno/kyverno v1.13.1 h1:JYVheBtrrAIb7IEA3aISY1nzLt8YRnsJ5TyPyw9yJJg=
github.com/kyverno/kyverno v1.13.1/go.mod h1:iC+KA2dfcNOy/hbOnadZ+usSac0rCS+BZ9/1zLU0YPM=
github.com/kyverno/kyverno-json v0.0.4-0.20240730143747-aade3d42fc0e h1:gh9iMuJS8yloxo3JIzvgLWZWwy5iRjEkA8/U7rK3iu8=
github.com/kyverno/kyverno-json v0.0.4-0.20240730143747-aade3d42fc0e/go.mod h1:3LgZogzltja+Sx0o5CIa7d7+991v8sWXHskU0fWSOsQ=
github.com/kyverno/pkg/ext v0.0.0-20240418121121-df8add26c55c h1:lAolpR9H8BwM5lRRvgCQ8JowswyxZRH+fgtIQzHFVCk=
2 changes: 1 addition & 1 deletion backend/pkg/engine/models/ruleresponse.go
Original file line number Diff line number Diff line change
@@ -27,5 +27,5 @@ type RuleResponse struct {
// podSecurityChecks contains pod security checks (only if this is a pod security rule)
PodSecurityChecks *engineapi.PodSecurityChecks `json:"podSecurityChecks"`
// exception is the exception applied (if any)
Exceptions []v2.PolicyException `json:"exception s"`
Exceptions []v2.PolicyException `json:"exceptions"`
}
14 changes: 0 additions & 14 deletions backend/pkg/resource/namespace.go
Original file line number Diff line number Diff line change
@@ -88,17 +88,3 @@ func FilterNamespaces(objects []runtime.Object) []runtime.Object {

return namespaces
}

func Combine(objects []unstructured.Unstructured, namespaces []runtime.Object) []runtime.Object {
resources := make([]runtime.Object, 0, len(objects))

for _, res := range objects {
if res.GetKind() == "Namespace" {
continue
}

resources = append(resources, &res)
}

return append(resources, namespaces...)
}
4 changes: 2 additions & 2 deletions charts/kyverno-playground/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v2
name: kyverno-playground
type: application
version: 0.5.0
appVersion: v0.5.0
version: 0.5.1
appVersion: v0.5.1
icon: https://github.com/kyverno/kyverno/raw/main/img/logo.png
description: Kyverno Playground Web Application
keywords:
2 changes: 1 addition & 1 deletion charts/kyverno-playground/README.md
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

Kyverno Playground Web Application

![Version: 0.5.0](https://img.shields.io/badge/Version-0.5.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.5.0](https://img.shields.io/badge/AppVersion-v0.5.0-informational?style=flat-square)
![Version: 0.5.1](https://img.shields.io/badge/Version-0.5.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.5.1](https://img.shields.io/badge/AppVersion-v0.5.1-informational?style=flat-square)

## About

4 changes: 2 additions & 2 deletions frontend/src/components/AppBar/AppBar.vue
Original file line number Diff line number Diff line change
@@ -6,12 +6,12 @@
<div class="app-logo">
<template v-if="display.mdAndUp.value">
<v-img src="/kyverno-logo.png" />
<v-chip size="small" style="position: absolute; bottom: 12px; right: -90px">v1.13.0</v-chip>
<v-chip size="small" style="position: absolute; bottom: 12px; right: -90px">v1.13.1</v-chip>
</template>
<template v-if="display.smAndDown.value">
<v-img src="/favicon.png" width="80" />
<v-chip size="small" style="position: absolute; bottom: 16px; left: 90px"
>Kyverno v1.13.0</v-chip
>Kyverno v1.13.1</v-chip
>
</template>
</div>
4 changes: 2 additions & 2 deletions frontend/src/main.ts
Original file line number Diff line number Diff line change
@@ -34,8 +34,8 @@ configureMonacoYaml(monaco, {
{ $ref: '#/definitions/policy-v1' },
{ $ref: '#/definitions/clusterpolicy-v2beta1' },
{ $ref: '#/definitions/policy-v2beta1' },
{ $ref: '#/definitions/vap-v1beta1' },
{ $ref: '#/definitions/vapb-v1beta1' }
{ $ref: '#/definitions/vap-v1' },
{ $ref: '#/definitions/vapb-v1' }
],
definitions: {
'clusterpolicy-v1': clusterpolicyv1 as JSONSchema,
9 changes: 9 additions & 0 deletions release-notes/v0.5.1.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Release notes

Release notes for `v0.5.0`.

## :wrench: Fixes :wrench:
- Fixed broken Policy Schema validation

## :guitar: Misc :guitar:
- Bump Kyverno to `v1.13.1`

0 comments on commit 1fe7c56

Please sign in to comment.