Merge branch 'main' into playground-cmd

kyverno · Oct 16, 2023 · 1088d69 · 1088d69
2 parents ab3128d + 405de0b
commit 1088d69
Show file tree

Hide file tree

Showing 11 changed files with 72 additions and 37 deletions.
diff --git a/catalog/aws/policy-1.yaml b/catalog/aws/policy-1.yaml
@@ -5,8 +5,8 @@ metadata:
   labels:
     s3.aws.tags.kyverno.io: ''
   annotations:
-    title.catalog.kyverno.io: Policy 1
-    description.catalog.kyverno.io: Policy 1
+    title.policy.kyverno.io: Policy 1
+    description.policy.kyverno.io: Policy 1
 spec:
   rules:
     - name: foo-bar

diff --git a/go.mod b/go.mod
@@ -7,7 +7,7 @@ require (
 	github.com/gin-gonic/gin v1.9.1
 	github.com/jinzhu/copier v0.4.0
 	github.com/jmespath-community/go-jmespath v1.1.2-0.20231004164315-78945398586a
-	github.com/kyverno/kyverno v1.11.0-beta.4
+	github.com/kyverno/kyverno v1.11.0-rc.2
 	github.com/loopfz/gadgeto v0.11.3
 	github.com/nlepage/go-wasm-http-server v1.1.0
 	github.com/spf13/cobra v1.7.0
@@ -105,13 +105,13 @@ require (
 	go.opentelemetry.io/proto/otlp v1.0.0 // indirect
 	go.uber.org/zap v1.26.0 // indirect
 	golang.org/x/arch v0.4.0 // indirect
-	golang.org/x/crypto v0.13.0 // indirect
+	golang.org/x/crypto v0.14.0 // indirect
 	golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
-	golang.org/x/net v0.15.0 // indirect
+	golang.org/x/net v0.17.0 // indirect
 	golang.org/x/oauth2 v0.12.0 // indirect
 	golang.org/x/sync v0.3.0 // indirect
-	golang.org/x/sys v0.12.0 // indirect
-	golang.org/x/term v0.12.0 // indirect
+	golang.org/x/sys v0.13.0 // indirect
+	golang.org/x/term v0.13.0 // indirect
 	golang.org/x/text v0.13.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
 	google.golang.org/appengine v1.6.8 // indirect

diff --git a/go.sum b/go.sum
@@ -254,8 +254,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/kyverno/kyverno v1.11.0-beta.4 h1:QxzTscQg4/68TY2cWxVostgg2QtbQIB4VfcWO+0MK9o=
-github.com/kyverno/kyverno v1.11.0-beta.4/go.mod h1:i/QVQ7mihIndXw79I/Hjz5j3vbhwxGiGE2PKHhfjLeQ=
+github.com/kyverno/kyverno v1.11.0-rc.2 h1:50MHEgcVqdcDLrFCWHvgqi0OHDRKARtGY7Xyx6QjnSs=
+github.com/kyverno/kyverno v1.11.0-rc.2/go.mod h1:mvK5d/VQZVYQl4Efzw2MyawftZwsxhA2MQV2GBmrnbw=
 github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
 github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
 github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q=
@@ -467,8 +467,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck=
-golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
+golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
+golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g=
 golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
@@ -495,8 +495,8 @@ golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81R
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8=
-golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
+golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.12.0 h1:smVPGxink+n1ZI5pkQa8y6fZT0RW0MgCO5bFpepy4B4=
 golang.org/x/oauth2 v0.12.0/go.mod h1:A74bZ3aGXgCY0qaIC9Ahg6Lglin4AMAco8cIv9baba4=
@@ -531,12 +531,12 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
-golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.12.0 h1:/ZfYdc3zq+q02Rv9vGqTeSItdzZTSNDmfTi0mBAuidU=
-golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
+golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=
+golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=

diff --git a/website/docs/catalog/index.md b/website/docs/catalog/index.md
@@ -1,9 +1,9 @@
 # Policy catalog
 
-<p align="center">
-  <img src="../static/WIP.jpg" />
-</p>
+The `kyverno-json` policy catalog contains curated policies to be reused.
 
-The policy catalog is currently under construction, we are actively working on it.
+You can share your policies with the community by opening a pull request [here](https://github.com/kyverno/kyverno-json).
 
-It should be available soon!
+## Policies indexed by tags
+
+[TAGS]
diff --git a/website/docs/catalog/policies/aws/policy-1.md b/website/docs/catalog/policies/aws/policy-1.md
@@ -3,11 +3,25 @@ tags:
 - aws
 - aws/s3
 ---
-# policy-1
+# Policy 1
+
+## Install
+
+### In cluster
+
+```bash
+kubectl apply -f https://raw.githubusercontent.com/kyverno/kyverno-json/main/catalog/aws/policy-1.yaml
+```
+
+### Download locally
+
+```bash
+curl -O https://raw.githubusercontent.com/kyverno/kyverno-json/main/catalog/aws/policy-1.yaml
+```
 
 ## Description
 
-None
+Policy 1
 
 ## Manifest
 
@@ -18,8 +32,8 @@ apiVersion: json.kyverno.io/v1alpha1
 kind: Policy
 metadata:
   annotations:
-    description.catalog.kyverno.io: Policy 1
-    title.catalog.kyverno.io: Policy 1
+    description.policy.kyverno.io: Policy 1
+    title.policy.kyverno.io: Policy 1
   creationTimestamp: null
   labels:
     s3.aws.tags.kyverno.io: ""
@@ -33,4 +47,4 @@ spec:
         - check:
             foo:
               /(bar)/: 10
-```
+```
diff --git a/website/docs/catalog/policies/ecs/policy-1.md b/website/docs/catalog/policies/ecs/policy-1.md
@@ -1,6 +1,20 @@
 
 # policy-1
 
+## Install
+
+### In cluster
+
+```bash
+kubectl apply -f https://raw.githubusercontent.com/kyverno/kyverno-json/main/catalog/ecs/policy-1.yaml
+```
+
+### Download locally
+
+```bash
+curl -O https://raw.githubusercontent.com/kyverno/kyverno-json/main/catalog/ecs/policy-1.yaml
+```
+
 ## Description
 
 None
@@ -24,4 +38,4 @@ spec:
         - check:
             foo:
               /(bar)/: 10
-```
+```
diff --git a/website/docs/tags.md b/website/docs/tags.md
diff --git a/website/mkdocs.base.yaml b/website/mkdocs.base.yaml
@@ -73,7 +73,7 @@ plugins:
 - include-markdown
 - tags:
     enabled: true
-    tags_file: tags.md
+    tags_file: catalog/index.md
 - blog:
     post_url_format: "{slug}"
 

diff --git a/website/mkdocs.yaml b/website/mkdocs.yaml
@@ -37,7 +37,6 @@ nav:
     - v1alpha1: apis/kyverno-json.v1alpha1.md
 - Policy catalog:
   - catalog/index.md
-  - tags.md
   - All:
     - catalog/policies/aws/policy-1.md
     - catalog/policies/ecs/policy-1.md

diff --git a/website/nav.gotmpl b/website/nav.gotmpl
@@ -37,7 +37,6 @@ nav:
     - v1alpha1: apis/kyverno-json.v1alpha1.md
 - Policy catalog:
   - catalog/index.md
-  - tags.md
   - All:
 {{- range .Policies }}
     - {{ .NavPath }}

diff --git a/website/policy.gotmpl b/website/policy.gotmpl
@@ -8,6 +8,20 @@ tags:
 {{- end }}
 # {{ .Title }}
 
+## Install
+
+### In cluster
+
+```bash
+kubectl apply -f https://raw.githubusercontent.com/kyverno/kyverno-json/main/{{ .Path }}
+```
+
+### Download locally
+
+```bash
+curl -O https://raw.githubusercontent.com/kyverno/kyverno-json/main/{{ .Path }}
+```
+
 ## Description
 
 {{ .Description }}
@@ -18,4 +32,4 @@ tags:
 
 ```yaml
 {{ .Manifest }}
-```
+```