Skip to content

Commit ac45a85

Browse files
renovate[bot]guewa
renovate[bot]
and
guewa
authored
fix(deps): update module github.com/openmcp-project/controller-utils to v0.16.0 (#124)
* fix(deps): update module github.com/openmcp-project/controller-utils to v0.16.0 * feat: release v0.35.0 --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Günther Wannenmacher <[email protected]>
1 parent bf49da0 commit ac45a85

File tree

10 files changed

+38
-25
lines changed

10 files changed

+38
-25
lines changed

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v0.34.1-dev
1+
v0.35.0

‎api/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.24.6
55
require (
66
github.com/onsi/ginkgo/v2 v2.23.4
77
github.com/onsi/gomega v1.38.0
8-
github.com/openmcp-project/controller-utils v0.13.1
8+
github.com/openmcp-project/controller-utils v0.16.0
99
k8s.io/api v0.33.3
1010
k8s.io/apiextensions-apiserver v0.33.3
1111
k8s.io/apimachinery v0.33.3
@@ -47,7 +47,7 @@ require (
4747
github.com/prometheus/client_model v0.6.1 // indirect
4848
github.com/prometheus/common v0.62.0 // indirect
4949
github.com/prometheus/procfs v0.15.1 // indirect
50-
github.com/spf13/pflag v1.0.6 // indirect
50+
github.com/spf13/pflag v1.0.7 // indirect
5151
github.com/x448/float16 v0.8.4 // indirect
5252
go.uber.org/automaxprocs v1.6.0 // indirect
5353
go.uber.org/multierr v1.11.0 // indirect

‎api/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ github.com/onsi/ginkgo/v2 v2.23.4 h1:ktYTpKJAVZnDT4VjxSbiBenUjmlL/5QkBEocaWXiQus
7373
github.com/onsi/ginkgo/v2 v2.23.4/go.mod h1:Bt66ApGPBFzHyR+JO10Zbt0Gsp4uWxu5mIOTusL46e8=
7474
github.com/onsi/gomega v1.38.0 h1:c/WX+w8SLAinvuKKQFh77WEucCnPk4j2OTUr7lt7BeY=
7575
github.com/onsi/gomega v1.38.0/go.mod h1:OcXcwId0b9QsE7Y49u+BTrL4IdKOBOKnD6VQNTJEB6o=
76-
github.com/openmcp-project/controller-utils v0.13.1 h1:+06c0bs1BIO+hBsTcuiEK5y8vpDFoZPml59WNm8fagM=
77-
github.com/openmcp-project/controller-utils v0.13.1/go.mod h1:Z1ytVshYcgJq3VQVGqkuZsjO/BCr4UYAaVpHl6JSIMI=
76+
github.com/openmcp-project/controller-utils v0.16.0 h1:m7j+FGjLONix6VtZFxT2lIORobDg7hrJ4fKroHuv5QQ=
77+
github.com/openmcp-project/controller-utils v0.16.0/go.mod h1:b0IZGgTiAyuiXiQ/necY7C5UVtrSmdjajRWzSRKkNcA=
7878
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
7979
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
8080
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
@@ -92,8 +92,8 @@ github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0leargg
9292
github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
9393
github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
9494
github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
95-
github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
96-
github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
95+
github.com/spf13/pflag v1.0.7 h1:vN6T9TfwStFPFM5XzjsvmzZkLuaLX+HS+0SeFLRgU6M=
96+
github.com/spf13/pflag v1.0.7/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
9797
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
9898
github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
9999
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=

‎charts/mcp-operator/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ apiVersion: v2
22
name: mcp-operator
33
description: A Helm chart for the mcp-operator
44
type: application
5-
version: v0.34.1
6-
appVersion: v0.34.1
5+
version: v0.35.0
6+
appVersion: v0.35.0
77
home: https://github.com/openmcp-project/mcp-operator
88
sources:
99
- https://github.com/openmcp-project/mcp-operator

‎charts/mcp-operator/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ deployment:
1414

1515
image:
1616
repository: ghcr.io/openmcp-project/images/mcp-operator
17-
tag: v0.34.1
17+
tag: v0.35.0
1818
pullPolicy: IfNotPresent
1919

2020
imagePullSecrets: []

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ require (
1515
github.com/onsi/gomega v1.38.0
1616
github.com/openmcp-project/cluster-provider-gardener/api v0.3.0
1717
github.com/openmcp-project/control-plane-operator v0.1.12
18-
github.com/openmcp-project/controller-utils v0.14.0
19-
github.com/openmcp-project/mcp-operator/api v0.34.1
18+
github.com/openmcp-project/controller-utils v0.16.0
19+
github.com/openmcp-project/mcp-operator/api v0.35.0
2020
github.com/openmcp-project/openmcp-operator/api v0.10.0
2121
github.com/openmcp-project/openmcp-operator/lib v0.10.0
2222
github.com/openmcp-project/service-provider-landscaper v0.4.0
@@ -71,7 +71,7 @@ require (
7171
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7272
github.com/modern-go/reflect2 v1.0.2 // indirect
7373
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
74-
github.com/openmcp-project/controller-utils/api v0.14.0 // indirect
74+
github.com/openmcp-project/controller-utils/api v0.16.0 // indirect
7575
github.com/pkg/errors v0.9.1 // indirect
7676
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
7777
github.com/prometheus/client_golang v1.22.0 // indirect

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,10 @@ github.com/openmcp-project/cluster-provider-gardener/api v0.3.0 h1:KVnpvhEFgNA3G
115115
github.com/openmcp-project/cluster-provider-gardener/api v0.3.0/go.mod h1:kQQ68UM/tSqwRytGXiBdwxgbNz2i1RF0L5t8vf7akJg=
116116
github.com/openmcp-project/control-plane-operator v0.1.12 h1:g/SbNAnQnlkuVB31O2+ZhUpoab/vnH2tXNVNwZ3Y3gY=
117117
github.com/openmcp-project/control-plane-operator v0.1.12/go.mod h1:dSFqUTbiNnqGzS4Umy8AndBi2QBPpqEUsdainA8KVEI=
118-
github.com/openmcp-project/controller-utils v0.14.0 h1:semDlO6fmEmTp7mT1j2ZmT1cCG3TtNujrMyKBU5Tzic=
119-
github.com/openmcp-project/controller-utils v0.14.0/go.mod h1:BA5sey3z1ISAqOP5CzgWGVcPeA906XgXEq4uBOpNfg4=
120-
github.com/openmcp-project/controller-utils/api v0.14.0 h1:9Rt0TN5jXiGiRKFoPOWkrXwM8UaRy37I6frmtBW8l0w=
121-
github.com/openmcp-project/controller-utils/api v0.14.0/go.mod h1:O5TCgsXeoxQMNUV8YvjAm4E1e21I/iqE5V0Hib0tU7k=
118+
github.com/openmcp-project/controller-utils v0.16.0 h1:m7j+FGjLONix6VtZFxT2lIORobDg7hrJ4fKroHuv5QQ=
119+
github.com/openmcp-project/controller-utils v0.16.0/go.mod h1:b0IZGgTiAyuiXiQ/necY7C5UVtrSmdjajRWzSRKkNcA=
120+
github.com/openmcp-project/controller-utils/api v0.16.0 h1:gFI5kgSANuzpF4RQ1JyTZn+2eXuVRGzJGBFzEo3OXjg=
121+
github.com/openmcp-project/controller-utils/api v0.16.0/go.mod h1:vJLFwuqyElkiP0DjkWYRSH0DjCxWrM0+uiS7ck1ncUs=
122122
github.com/openmcp-project/openmcp-operator/api v0.10.0 h1:+3Pwz7esGwBKmE4Q861rKv5AZdKicdCbmWbu1bqc5h8=
123123
github.com/openmcp-project/openmcp-operator/api v0.10.0/go.mod h1:8PexUhnIukhbjTA5ybxo86vh6W3FNzfHEhC86770MRs=
124124
github.com/openmcp-project/openmcp-operator/lib v0.10.0 h1:rhlyGso5HSkGaD/SLJ0kE1Jb1Bpa/ioWphQppYQ3poA=

‎internal/controller/core/apiserver/v2.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ func v2HandleCreateOrUpdate(ctx context.Context, as *openmcpv1alpha1.APIServer,
110110
clusterReadyCon.Status = openmcpv1alpha1.ComponentConditionStatusFromBool(cluster.Status.Phase == clustersv1alpha1.CLUSTER_PHASE_READY)
111111
if clusterReadyCon.Status != openmcpv1alpha1.ComponentConditionStatusTrue {
112112
clusterReadyCon.Reason = cconst.ReasonClusterNotReady
113-
clusterReadyCon.Message = strings.Join(collections.ProjectSlice(cluster.Status.Conditions, func(con metav1.Condition) string {
113+
clusterReadyCon.Message = strings.Join(collections.ProjectSliceToSlice(cluster.Status.Conditions, func(con metav1.Condition) string {
114114
return fmt.Sprintf("[%s] %s", con.Reason, con.Message)
115115
}), "\n")
116116
if clusterReadyCon.Message == "" {
@@ -166,7 +166,7 @@ func v2HandleCreateOrUpdate(ctx context.Context, as *openmcpv1alpha1.APIServer,
166166
clusterRequestGrantedCon.Status = openmcpv1alpha1.ComponentConditionStatusFalse
167167
clusterRequestGrantedCon.Reason = cconst.ReasonClusterRequestNotGranted
168168
crReason := cconst.ReasonClusterRequestNotGranted
169-
crMessage := strings.Join(collections.ProjectSlice(cr.Status.Conditions, func(con metav1.Condition) string {
169+
crMessage := strings.Join(collections.ProjectSliceToSlice(cr.Status.Conditions, func(con metav1.Condition) string {
170170
return fmt.Sprintf("[%s] %s", con.Reason, con.Message)
171171
}), "\n")
172172
if crMessage == "" {
@@ -233,7 +233,7 @@ func v2HandleCreateOrUpdate(ctx context.Context, as *openmcpv1alpha1.APIServer,
233233
accessRequestGrantedCon.Status = openmcpv1alpha1.ComponentConditionStatusFalse
234234
accessRequestGrantedCon.Reason = cconst.ReasonAccessRequestNotGranted
235235
arReason := cconst.ReasonAccessRequestNotGranted
236-
arMessage := strings.Join(collections.ProjectSlice(ar.Status.Conditions, func(con metav1.Condition) string {
236+
arMessage := strings.Join(collections.ProjectSliceToSlice(ar.Status.Conditions, func(con metav1.Condition) string {
237237
return fmt.Sprintf("[%s] %s", con.Reason, con.Message)
238238
}), "\n")
239239
if arMessage == "" {

‎internal/controller/core/landscaper/v2.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func (r *LandscaperConnector) v2HandleCreateOrUpdate(ctx context.Context, ls *op
4848
}
4949

5050
ready := lsv2.Status.Phase == commonapi.StatusPhaseReady && lsv2.Status.ObservedGeneration == lsv2.Generation
51-
cons := collections.ProjectSlice(lsv2.Status.Conditions, func(v2con metav1.Condition) openmcpv1alpha1.ComponentCondition {
51+
cons := collections.ProjectSliceToSlice(lsv2.Status.Conditions, func(v2con metav1.Condition) openmcpv1alpha1.ComponentCondition {
5252
return components.NewCondition("LSv2_"+v2con.Type, components.ComponentConditionStatusFromMetav1ConditionStatus(v2con.Status), v2con.Reason, v2con.Message)
5353
})
5454
con.Status = openmcpv1alpha1.ComponentConditionStatusTrue
@@ -90,7 +90,7 @@ func (r *LandscaperConnector) v2HandleDelete(ctx context.Context, ls *openmcpv1a
9090
log.Info("Waiting for Landscaper v2 resource to be deleted", "resourceName", lsv2.Name, "resourceNamespace", lsv2.Namespace)
9191
}
9292

93-
cons := collections.ProjectSlice(lsv2.Status.Conditions, func(v2con metav1.Condition) openmcpv1alpha1.ComponentCondition {
93+
cons := collections.ProjectSliceToSlice(lsv2.Status.Conditions, func(v2con metav1.Condition) openmcpv1alpha1.ComponentCondition {
9494
return components.NewCondition("LSv2_"+v2con.Type, components.ComponentConditionStatusFromMetav1ConditionStatus(v2con.Status), v2con.Reason, v2con.Message)
9595
})
9696
con.Status = openmcpv1alpha1.ComponentConditionStatusFalse

‎renovate.json‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,23 @@
3030
{
3131
"matchPackageNames": [
3232
"github.com/gardener/landscaper",
33-
"github.com/gardener/landscaper-service",
34-
"github.com/openmcp-project/*"
33+
"github.com/gardener/landscaper-service"
3534
],
36-
"description": "Update all components from openmcp-project and landscaper immediately",
35+
"description": "Update all components from landscaper immediately",
36+
"rebaseWhen": "auto",
37+
"minimumReleaseAge": "0 days",
38+
"enabled": true
39+
},
40+
{
41+
"description": "Combine openmcp-project updates in a single PR",
42+
"matchDatasources": [
43+
"go"
44+
],
45+
"matchPackageNames": [
46+
"^github\\.com/openmcp-project/.*"
47+
],
48+
"groupName": "openmcp-project dependencies",
49+
"groupSlug": "openmcp-project-dependencies",
3750
"rebaseWhen": "auto",
3851
"minimumReleaseAge": "0 days",
3952
"enabled": true

0 commit comments

Comments
 (0)