Skip to content

Commit 49ddc2f

Browse files
committed
Merge branch 'feat/kyverno-default-values' of https://github.com/openmcp-project/mcp-operator into feat/kyverno-default-values
On-behalf-of: Radek Schekalla (SAP) <[email protected]> Signed-off-by: Radek Schekalla (SAP) <[email protected]>
2 parents 772b5ac + 24c2b2f commit 49ddc2f

File tree

5 files changed

+48
-42
lines changed

5 files changed

+48
-42
lines changed

api/go.mod

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ go 1.25.4
55
require (
66
github.com/onsi/ginkgo/v2 v2.27.2
77
github.com/onsi/gomega v1.38.2
8-
github.com/openmcp-project/controller-utils v0.23.4
9-
k8s.io/api v0.34.1
10-
k8s.io/apiextensions-apiserver v0.34.1
11-
k8s.io/apimachinery v0.34.1
12-
k8s.io/client-go v0.34.1
8+
github.com/openmcp-project/controller-utils v0.24.0
9+
k8s.io/api v0.34.2
10+
k8s.io/apiextensions-apiserver v0.34.2
11+
k8s.io/apimachinery v0.34.2
12+
k8s.io/client-go v0.34.2
1313
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
1414
sigs.k8s.io/controller-runtime v0.22.4
1515
sigs.k8s.io/yaml v1.6.0

api/go.sum

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ github.com/onsi/ginkgo/v2 v2.27.2 h1:LzwLj0b89qtIy6SSASkzlNvX6WktqurSHwkk2ipF/Ns
8787
github.com/onsi/ginkgo/v2 v2.27.2/go.mod h1:ArE1D/XhNXBXCBkKOLkbsb2c81dQHCRcF5zwn/ykDRo=
8888
github.com/onsi/gomega v1.38.2 h1:eZCjf2xjZAqe+LeWvKb5weQ+NcPwX84kqJ0cZNxok2A=
8989
github.com/onsi/gomega v1.38.2/go.mod h1:W2MJcYxRGV63b418Ai34Ud0hEdTVXq9NW9+Sx6uXf3k=
90-
github.com/openmcp-project/controller-utils v0.23.4 h1:GUPa0tP0kccp5/DheQR9vWfPChEK37KwTpbFHVDQBhc=
91-
github.com/openmcp-project/controller-utils v0.23.4/go.mod h1:zGsvEJ7P+BjRnDQMVreCOp4Lsx5xpFQ36gm2fcVw34w=
90+
github.com/openmcp-project/controller-utils v0.24.0 h1:r8mtA9JEb2GXgH4H60FR/jbe0h4/ZbYnAeHmacMsb0g=
91+
github.com/openmcp-project/controller-utils v0.24.0/go.mod h1:BjMecTCwaSewG7KV0H4P5Y/MeFzI07DGXQstp/dtF7s=
9292
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
9393
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
9494
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
@@ -190,14 +190,14 @@ gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
190190
gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
191191
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
192192
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
193-
k8s.io/api v0.34.1 h1:jC+153630BMdlFukegoEL8E/yT7aLyQkIVuwhmwDgJM=
194-
k8s.io/api v0.34.1/go.mod h1:SB80FxFtXn5/gwzCoN6QCtPD7Vbu5w2n1S0J5gFfTYk=
195-
k8s.io/apiextensions-apiserver v0.34.1 h1:NNPBva8FNAPt1iSVwIE0FsdrVriRXMsaWFMqJbII2CI=
196-
k8s.io/apiextensions-apiserver v0.34.1/go.mod h1:hP9Rld3zF5Ay2Of3BeEpLAToP+l4s5UlxiHfqRaRcMc=
197-
k8s.io/apimachinery v0.34.1 h1:dTlxFls/eikpJxmAC7MVE8oOeP1zryV7iRyIjB0gky4=
198-
k8s.io/apimachinery v0.34.1/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
199-
k8s.io/client-go v0.34.1 h1:ZUPJKgXsnKwVwmKKdPfw4tB58+7/Ik3CrjOEhsiZ7mY=
200-
k8s.io/client-go v0.34.1/go.mod h1:kA8v0FP+tk6sZA0yKLRG67LWjqufAoSHA2xVGKw9Of8=
193+
k8s.io/api v0.34.2 h1:fsSUNZhV+bnL6Aqrp6O7lMTy6o5x2C4XLjnh//8SLYY=
194+
k8s.io/api v0.34.2/go.mod h1:MMBPaWlED2a8w4RSeanD76f7opUoypY8TFYkSM+3XHw=
195+
k8s.io/apiextensions-apiserver v0.34.2 h1:WStKftnGeoKP4AZRz/BaAAEJvYp4mlZGN0UCv+uvsqo=
196+
k8s.io/apiextensions-apiserver v0.34.2/go.mod h1:398CJrsgXF1wytdaanynDpJ67zG4Xq7yj91GrmYN2SE=
197+
k8s.io/apimachinery v0.34.2 h1:zQ12Uk3eMHPxrsbUJgNF8bTauTVR2WgqJsTmwTE/NW4=
198+
k8s.io/apimachinery v0.34.2/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
199+
k8s.io/client-go v0.34.2 h1:Co6XiknN+uUZqiddlfAjT68184/37PS4QAzYvQvDR8M=
200+
k8s.io/client-go v0.34.2/go.mod h1:2VYDl1XXJsdcAxw7BenFslRQX28Dxz91U9MWKjX97fE=
201201
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
202202
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
203203
k8s.io/kube-openapi v0.0.0-20250814151709-d7b6acb124c3 h1:liMHz39T5dJO1aOKHLvwaCjDbf07wVh6yaUlTpunnkE=

cmd/mcp-operator/app/app.go

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,14 +136,20 @@ func (o *Options) runInit(ctx context.Context) error {
136136
installOptions := o.WebhooksFlags.InstallOptions
137137
installOptions = append(installOptions, webhooks.WithRemoteClient{Client: crateClient})
138138

139+
webhookTypes := []webhooks.APITypes{
140+
{
141+
Obj: &openmcpv1alpha1.ManagedControlPlane{},
142+
Validator: true,
143+
Defaulter: true,
144+
},
145+
}
146+
139147
// Install webhooks
140148
err = webhooks.Install(
141149
ctx,
142150
hostClient,
143151
sc,
144-
[]client.Object{
145-
&openmcpv1alpha1.ManagedControlPlane{},
146-
},
152+
webhookTypes,
147153
installOptions...,
148154
)
149155
if err != nil {

go.mod

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,19 @@ require (
1515
github.com/onsi/gomega v1.38.2
1616
github.com/openmcp-project/cluster-provider-gardener/api v0.9.1
1717
github.com/openmcp-project/control-plane-operator v0.1.19
18-
github.com/openmcp-project/controller-utils v0.23.4
18+
github.com/openmcp-project/controller-utils v0.24.0
1919
github.com/openmcp-project/mcp-operator/api v0.42.1
20-
github.com/openmcp-project/openmcp-operator/api v0.17.0
21-
github.com/openmcp-project/openmcp-operator/lib v0.17.0
20+
github.com/openmcp-project/openmcp-operator/api v0.17.1
21+
github.com/openmcp-project/openmcp-operator/lib v0.17.1
2222
github.com/openmcp-project/service-provider-landscaper v0.12.0
2323
github.com/spf13/cobra v1.10.1
2424
github.com/spf13/pflag v1.0.10
2525
github.com/stretchr/testify v1.11.1
2626
gopkg.in/yaml.v3 v3.0.1
27-
k8s.io/api v0.34.1
28-
k8s.io/apiextensions-apiserver v0.34.1
29-
k8s.io/apimachinery v0.34.1
30-
k8s.io/client-go v0.34.1
27+
k8s.io/api v0.34.2
28+
k8s.io/apiextensions-apiserver v0.34.2
29+
k8s.io/apimachinery v0.34.2
30+
k8s.io/client-go v0.34.2
3131
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
3232
sigs.k8s.io/controller-runtime v0.22.4
3333
sigs.k8s.io/yaml v1.6.0
@@ -82,7 +82,7 @@ require (
8282
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
8383
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
8484
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
85-
github.com/openmcp-project/controller-utils/api v0.23.4 // indirect
85+
github.com/openmcp-project/controller-utils/api v0.24.0 // indirect
8686
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
8787
github.com/prometheus/client_golang v1.23.2 // indirect
8888
github.com/prometheus/client_model v0.6.2 // indirect

go.sum

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -148,14 +148,14 @@ github.com/openmcp-project/cluster-provider-gardener/api v0.9.1 h1:9o+y6553tHra6
148148
github.com/openmcp-project/cluster-provider-gardener/api v0.9.1/go.mod h1:aCKg5HxZI7wIzLY+7mGe4w+XNWEHUk04Tpq3X1gPXQ0=
149149
github.com/openmcp-project/control-plane-operator v0.1.19 h1:ablgax+3hv6HR4jNVijLGQW5qTQZabIoz8bAygmrAY0=
150150
github.com/openmcp-project/control-plane-operator v0.1.19/go.mod h1:tiN7l8fitosSsjiy/3pOUZBMng2PPmOl+QSivDgI3qM=
151-
github.com/openmcp-project/controller-utils v0.23.4 h1:GUPa0tP0kccp5/DheQR9vWfPChEK37KwTpbFHVDQBhc=
152-
github.com/openmcp-project/controller-utils v0.23.4/go.mod h1:zGsvEJ7P+BjRnDQMVreCOp4Lsx5xpFQ36gm2fcVw34w=
153-
github.com/openmcp-project/controller-utils/api v0.23.4 h1:aTWK0bxEyeC4DR7/C7Ndu8S3Mbd2dqr5znqoVrUCN74=
154-
github.com/openmcp-project/controller-utils/api v0.23.4/go.mod h1:OrGanvSCTRofz6vc12RvrKzJqvVgzmvitDdZUVpgpcs=
155-
github.com/openmcp-project/openmcp-operator/api v0.17.0 h1:dhRbaGawtRx6Kd4oUbw5gSBnukEsS0xH29aTRjWIevY=
156-
github.com/openmcp-project/openmcp-operator/api v0.17.0/go.mod h1:xW9QjFThR4xntEyfhgGuJ5oRYY4mzoWOoZBjHjBBjPQ=
157-
github.com/openmcp-project/openmcp-operator/lib v0.17.0 h1:42yGu/1LoEd51/noWgr7Bmz33rfHjTm/HKKXlJjHif4=
158-
github.com/openmcp-project/openmcp-operator/lib v0.17.0/go.mod h1:ZUXmfwL8fPe0iTsx+PB5zHWPZavXTkLOYOj2qF1N6hY=
151+
github.com/openmcp-project/controller-utils v0.24.0 h1:r8mtA9JEb2GXgH4H60FR/jbe0h4/ZbYnAeHmacMsb0g=
152+
github.com/openmcp-project/controller-utils v0.24.0/go.mod h1:BjMecTCwaSewG7KV0H4P5Y/MeFzI07DGXQstp/dtF7s=
153+
github.com/openmcp-project/controller-utils/api v0.24.0 h1:ySMAABPFw1KHx0lVN1iMoGC2DOTQCtboU4CDrTW3ugk=
154+
github.com/openmcp-project/controller-utils/api v0.24.0/go.mod h1:N2miWSfJwHc3zrtQkojGzDXA6RTGSbR0/0z11xS/e0Y=
155+
github.com/openmcp-project/openmcp-operator/api v0.17.1 h1:ZJQWWUHtN7ml98IbSuaHiLfkG/my6LNehsLN62qxE80=
156+
github.com/openmcp-project/openmcp-operator/api v0.17.1/go.mod h1:4khFA0fuEVDcwptyDkHcH/7BGuMVhouUTUoiu61wqZQ=
157+
github.com/openmcp-project/openmcp-operator/lib v0.17.1 h1:gzqZXcEmnZxaytwafW/as91E9MtnjXGpo5VlggJLplk=
158+
github.com/openmcp-project/openmcp-operator/lib v0.17.1/go.mod h1:sqU7DBCqvrlMWIfw6kBTYDJhrVoLtSsazzPfs9hzd5I=
159159
github.com/openmcp-project/service-provider-landscaper v0.12.0 h1:el79p/E/4Fn8i68279ClBY04iSdBWLHKcsCYeF0uGrI=
160160
github.com/openmcp-project/service-provider-landscaper v0.12.0/go.mod h1:M+OfV2vAeGTNloWw7S/YsPGh4vQnlWehUaW7Ze/p2CI=
161161
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
@@ -287,14 +287,14 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
287287
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
288288
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
289289
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
290-
k8s.io/api v0.34.1 h1:jC+153630BMdlFukegoEL8E/yT7aLyQkIVuwhmwDgJM=
291-
k8s.io/api v0.34.1/go.mod h1:SB80FxFtXn5/gwzCoN6QCtPD7Vbu5w2n1S0J5gFfTYk=
292-
k8s.io/apiextensions-apiserver v0.34.1 h1:NNPBva8FNAPt1iSVwIE0FsdrVriRXMsaWFMqJbII2CI=
293-
k8s.io/apiextensions-apiserver v0.34.1/go.mod h1:hP9Rld3zF5Ay2Of3BeEpLAToP+l4s5UlxiHfqRaRcMc=
294-
k8s.io/apimachinery v0.34.1 h1:dTlxFls/eikpJxmAC7MVE8oOeP1zryV7iRyIjB0gky4=
295-
k8s.io/apimachinery v0.34.1/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
296-
k8s.io/client-go v0.34.1 h1:ZUPJKgXsnKwVwmKKdPfw4tB58+7/Ik3CrjOEhsiZ7mY=
297-
k8s.io/client-go v0.34.1/go.mod h1:kA8v0FP+tk6sZA0yKLRG67LWjqufAoSHA2xVGKw9Of8=
290+
k8s.io/api v0.34.2 h1:fsSUNZhV+bnL6Aqrp6O7lMTy6o5x2C4XLjnh//8SLYY=
291+
k8s.io/api v0.34.2/go.mod h1:MMBPaWlED2a8w4RSeanD76f7opUoypY8TFYkSM+3XHw=
292+
k8s.io/apiextensions-apiserver v0.34.2 h1:WStKftnGeoKP4AZRz/BaAAEJvYp4mlZGN0UCv+uvsqo=
293+
k8s.io/apiextensions-apiserver v0.34.2/go.mod h1:398CJrsgXF1wytdaanynDpJ67zG4Xq7yj91GrmYN2SE=
294+
k8s.io/apimachinery v0.34.2 h1:zQ12Uk3eMHPxrsbUJgNF8bTauTVR2WgqJsTmwTE/NW4=
295+
k8s.io/apimachinery v0.34.2/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
296+
k8s.io/client-go v0.34.2 h1:Co6XiknN+uUZqiddlfAjT68184/37PS4QAzYvQvDR8M=
297+
k8s.io/client-go v0.34.2/go.mod h1:2VYDl1XXJsdcAxw7BenFslRQX28Dxz91U9MWKjX97fE=
298298
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
299299
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
300300
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 h1:Y3gxNAuB0OBLImH611+UDZcmKS3g6CthxToOb37KgwE=

0 commit comments

Comments
 (0)