diff --git a/VERSION b/VERSION index 35c3704..8a45319 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v0.34.1-dev \ No newline at end of file +v0.35.0 \ No newline at end of file diff --git a/api/go.mod b/api/go.mod index 93d069b..71447de 100644 --- a/api/go.mod +++ b/api/go.mod @@ -5,7 +5,7 @@ go 1.24.6 require ( github.com/onsi/ginkgo/v2 v2.23.4 github.com/onsi/gomega v1.38.0 - github.com/openmcp-project/controller-utils v0.13.1 + github.com/openmcp-project/controller-utils v0.16.0 k8s.io/api v0.33.3 k8s.io/apiextensions-apiserver v0.33.3 k8s.io/apimachinery v0.33.3 @@ -47,7 +47,7 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.62.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect - github.com/spf13/pflag v1.0.6 // indirect + github.com/spf13/pflag v1.0.7 // indirect github.com/x448/float16 v0.8.4 // indirect go.uber.org/automaxprocs v1.6.0 // indirect go.uber.org/multierr v1.11.0 // indirect diff --git a/api/go.sum b/api/go.sum index ef5eb4d..66c7f56 100644 --- a/api/go.sum +++ b/api/go.sum @@ -73,8 +73,8 @@ github.com/onsi/ginkgo/v2 v2.23.4 h1:ktYTpKJAVZnDT4VjxSbiBenUjmlL/5QkBEocaWXiQus github.com/onsi/ginkgo/v2 v2.23.4/go.mod h1:Bt66ApGPBFzHyR+JO10Zbt0Gsp4uWxu5mIOTusL46e8= github.com/onsi/gomega v1.38.0 h1:c/WX+w8SLAinvuKKQFh77WEucCnPk4j2OTUr7lt7BeY= github.com/onsi/gomega v1.38.0/go.mod h1:OcXcwId0b9QsE7Y49u+BTrL4IdKOBOKnD6VQNTJEB6o= -github.com/openmcp-project/controller-utils v0.13.1 h1:+06c0bs1BIO+hBsTcuiEK5y8vpDFoZPml59WNm8fagM= -github.com/openmcp-project/controller-utils v0.13.1/go.mod h1:Z1ytVshYcgJq3VQVGqkuZsjO/BCr4UYAaVpHl6JSIMI= +github.com/openmcp-project/controller-utils v0.16.0 h1:m7j+FGjLONix6VtZFxT2lIORobDg7hrJ4fKroHuv5QQ= +github.com/openmcp-project/controller-utils v0.16.0/go.mod h1:b0IZGgTiAyuiXiQ/necY7C5UVtrSmdjajRWzSRKkNcA= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= 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 github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= -github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o= -github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/pflag v1.0.7 h1:vN6T9TfwStFPFM5XzjsvmzZkLuaLX+HS+0SeFLRgU6M= +github.com/spf13/pflag v1.0.7/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= diff --git a/charts/mcp-operator/Chart.yaml b/charts/mcp-operator/Chart.yaml index 2e1c37b..55bc39c 100644 --- a/charts/mcp-operator/Chart.yaml +++ b/charts/mcp-operator/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: mcp-operator description: A Helm chart for the mcp-operator type: application -version: v0.34.1 -appVersion: v0.34.1 +version: v0.35.0 +appVersion: v0.35.0 home: https://github.com/openmcp-project/mcp-operator sources: - https://github.com/openmcp-project/mcp-operator \ No newline at end of file diff --git a/charts/mcp-operator/values.yaml b/charts/mcp-operator/values.yaml index 8bad902..7e692d0 100644 --- a/charts/mcp-operator/values.yaml +++ b/charts/mcp-operator/values.yaml @@ -14,7 +14,7 @@ deployment: image: repository: ghcr.io/openmcp-project/images/mcp-operator - tag: v0.34.1 + tag: v0.35.0 pullPolicy: IfNotPresent imagePullSecrets: [] diff --git a/go.mod b/go.mod index 1ded0ac..923a4d4 100644 --- a/go.mod +++ b/go.mod @@ -15,8 +15,8 @@ require ( github.com/onsi/gomega v1.38.0 github.com/openmcp-project/cluster-provider-gardener/api v0.3.0 github.com/openmcp-project/control-plane-operator v0.1.12 - github.com/openmcp-project/controller-utils v0.14.0 - github.com/openmcp-project/mcp-operator/api v0.34.1 + github.com/openmcp-project/controller-utils v0.16.0 + github.com/openmcp-project/mcp-operator/api v0.35.0 github.com/openmcp-project/openmcp-operator/api v0.10.0 github.com/openmcp-project/openmcp-operator/lib v0.10.0 github.com/openmcp-project/service-provider-landscaper v0.4.0 @@ -71,7 +71,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect - github.com/openmcp-project/controller-utils/api v0.14.0 // indirect + github.com/openmcp-project/controller-utils/api v0.16.0 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_golang v1.22.0 // indirect diff --git a/go.sum b/go.sum index d02e4c2..c4f153a 100644 --- a/go.sum +++ b/go.sum @@ -115,10 +115,10 @@ github.com/openmcp-project/cluster-provider-gardener/api v0.3.0 h1:KVnpvhEFgNA3G github.com/openmcp-project/cluster-provider-gardener/api v0.3.0/go.mod h1:kQQ68UM/tSqwRytGXiBdwxgbNz2i1RF0L5t8vf7akJg= github.com/openmcp-project/control-plane-operator v0.1.12 h1:g/SbNAnQnlkuVB31O2+ZhUpoab/vnH2tXNVNwZ3Y3gY= github.com/openmcp-project/control-plane-operator v0.1.12/go.mod h1:dSFqUTbiNnqGzS4Umy8AndBi2QBPpqEUsdainA8KVEI= -github.com/openmcp-project/controller-utils v0.14.0 h1:semDlO6fmEmTp7mT1j2ZmT1cCG3TtNujrMyKBU5Tzic= -github.com/openmcp-project/controller-utils v0.14.0/go.mod h1:BA5sey3z1ISAqOP5CzgWGVcPeA906XgXEq4uBOpNfg4= -github.com/openmcp-project/controller-utils/api v0.14.0 h1:9Rt0TN5jXiGiRKFoPOWkrXwM8UaRy37I6frmtBW8l0w= -github.com/openmcp-project/controller-utils/api v0.14.0/go.mod h1:O5TCgsXeoxQMNUV8YvjAm4E1e21I/iqE5V0Hib0tU7k= +github.com/openmcp-project/controller-utils v0.16.0 h1:m7j+FGjLONix6VtZFxT2lIORobDg7hrJ4fKroHuv5QQ= +github.com/openmcp-project/controller-utils v0.16.0/go.mod h1:b0IZGgTiAyuiXiQ/necY7C5UVtrSmdjajRWzSRKkNcA= +github.com/openmcp-project/controller-utils/api v0.16.0 h1:gFI5kgSANuzpF4RQ1JyTZn+2eXuVRGzJGBFzEo3OXjg= +github.com/openmcp-project/controller-utils/api v0.16.0/go.mod h1:vJLFwuqyElkiP0DjkWYRSH0DjCxWrM0+uiS7ck1ncUs= github.com/openmcp-project/openmcp-operator/api v0.10.0 h1:+3Pwz7esGwBKmE4Q861rKv5AZdKicdCbmWbu1bqc5h8= github.com/openmcp-project/openmcp-operator/api v0.10.0/go.mod h1:8PexUhnIukhbjTA5ybxo86vh6W3FNzfHEhC86770MRs= github.com/openmcp-project/openmcp-operator/lib v0.10.0 h1:rhlyGso5HSkGaD/SLJ0kE1Jb1Bpa/ioWphQppYQ3poA= diff --git a/internal/controller/core/apiserver/v2.go b/internal/controller/core/apiserver/v2.go index 2581862..7df0c8c 100644 --- a/internal/controller/core/apiserver/v2.go +++ b/internal/controller/core/apiserver/v2.go @@ -110,7 +110,7 @@ func v2HandleCreateOrUpdate(ctx context.Context, as *openmcpv1alpha1.APIServer, clusterReadyCon.Status = openmcpv1alpha1.ComponentConditionStatusFromBool(cluster.Status.Phase == clustersv1alpha1.CLUSTER_PHASE_READY) if clusterReadyCon.Status != openmcpv1alpha1.ComponentConditionStatusTrue { clusterReadyCon.Reason = cconst.ReasonClusterNotReady - clusterReadyCon.Message = strings.Join(collections.ProjectSlice(cluster.Status.Conditions, func(con metav1.Condition) string { + clusterReadyCon.Message = strings.Join(collections.ProjectSliceToSlice(cluster.Status.Conditions, func(con metav1.Condition) string { return fmt.Sprintf("[%s] %s", con.Reason, con.Message) }), "\n") if clusterReadyCon.Message == "" { @@ -166,7 +166,7 @@ func v2HandleCreateOrUpdate(ctx context.Context, as *openmcpv1alpha1.APIServer, clusterRequestGrantedCon.Status = openmcpv1alpha1.ComponentConditionStatusFalse clusterRequestGrantedCon.Reason = cconst.ReasonClusterRequestNotGranted crReason := cconst.ReasonClusterRequestNotGranted - crMessage := strings.Join(collections.ProjectSlice(cr.Status.Conditions, func(con metav1.Condition) string { + crMessage := strings.Join(collections.ProjectSliceToSlice(cr.Status.Conditions, func(con metav1.Condition) string { return fmt.Sprintf("[%s] %s", con.Reason, con.Message) }), "\n") if crMessage == "" { @@ -233,7 +233,7 @@ func v2HandleCreateOrUpdate(ctx context.Context, as *openmcpv1alpha1.APIServer, accessRequestGrantedCon.Status = openmcpv1alpha1.ComponentConditionStatusFalse accessRequestGrantedCon.Reason = cconst.ReasonAccessRequestNotGranted arReason := cconst.ReasonAccessRequestNotGranted - arMessage := strings.Join(collections.ProjectSlice(ar.Status.Conditions, func(con metav1.Condition) string { + arMessage := strings.Join(collections.ProjectSliceToSlice(ar.Status.Conditions, func(con metav1.Condition) string { return fmt.Sprintf("[%s] %s", con.Reason, con.Message) }), "\n") if arMessage == "" { diff --git a/internal/controller/core/landscaper/v2.go b/internal/controller/core/landscaper/v2.go index 07eb2ba..2ced67b 100644 --- a/internal/controller/core/landscaper/v2.go +++ b/internal/controller/core/landscaper/v2.go @@ -48,7 +48,7 @@ func (r *LandscaperConnector) v2HandleCreateOrUpdate(ctx context.Context, ls *op } ready := lsv2.Status.Phase == commonapi.StatusPhaseReady && lsv2.Status.ObservedGeneration == lsv2.Generation - cons := collections.ProjectSlice(lsv2.Status.Conditions, func(v2con metav1.Condition) openmcpv1alpha1.ComponentCondition { + cons := collections.ProjectSliceToSlice(lsv2.Status.Conditions, func(v2con metav1.Condition) openmcpv1alpha1.ComponentCondition { return components.NewCondition("LSv2_"+v2con.Type, components.ComponentConditionStatusFromMetav1ConditionStatus(v2con.Status), v2con.Reason, v2con.Message) }) con.Status = openmcpv1alpha1.ComponentConditionStatusTrue @@ -90,7 +90,7 @@ func (r *LandscaperConnector) v2HandleDelete(ctx context.Context, ls *openmcpv1a log.Info("Waiting for Landscaper v2 resource to be deleted", "resourceName", lsv2.Name, "resourceNamespace", lsv2.Namespace) } - cons := collections.ProjectSlice(lsv2.Status.Conditions, func(v2con metav1.Condition) openmcpv1alpha1.ComponentCondition { + cons := collections.ProjectSliceToSlice(lsv2.Status.Conditions, func(v2con metav1.Condition) openmcpv1alpha1.ComponentCondition { return components.NewCondition("LSv2_"+v2con.Type, components.ComponentConditionStatusFromMetav1ConditionStatus(v2con.Status), v2con.Reason, v2con.Message) }) con.Status = openmcpv1alpha1.ComponentConditionStatusFalse diff --git a/renovate.json b/renovate.json index 30901c1..c74bf33 100644 --- a/renovate.json +++ b/renovate.json @@ -30,10 +30,23 @@ { "matchPackageNames": [ "github.com/gardener/landscaper", - "github.com/gardener/landscaper-service", - "github.com/openmcp-project/*" + "github.com/gardener/landscaper-service" ], - "description": "Update all components from openmcp-project and landscaper immediately", + "description": "Update all components from landscaper immediately", + "rebaseWhen": "auto", + "minimumReleaseAge": "0 days", + "enabled": true + }, + { + "description": "Combine openmcp-project updates in a single PR", + "matchDatasources": [ + "go" + ], + "matchPackageNames": [ + "^github\\.com/openmcp-project/.*" + ], + "groupName": "openmcp-project dependencies", + "groupSlug": "openmcp-project-dependencies", "rebaseWhen": "auto", "minimumReleaseAge": "0 days", "enabled": true