From 34cddc6b02c5e7e5da44c8d173e1ddb692c507cc Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 15 Oct 2025 06:14:02 +0000 Subject: [PATCH 1/2] fix(deps): update module github.com/openmcp-project/service-provider-landscaper to v0.10.0 --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index ffd8dfc..eb32dc9 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ require ( github.com/openmcp-project/mcp-operator/api v0.42.0 github.com/openmcp-project/openmcp-operator/api v0.15.2 github.com/openmcp-project/openmcp-operator/lib v0.15.2 - github.com/openmcp-project/service-provider-landscaper v0.7.0 + github.com/openmcp-project/service-provider-landscaper v0.10.0 github.com/spf13/cobra v1.10.1 github.com/spf13/pflag v1.0.10 github.com/stretchr/testify v1.11.1 From ff58aca3f2f2a8970597dd313599325dbee5db24 Mon Sep 17 00:00:00 2001 From: Robert Graeff Date: Wed, 15 Oct 2025 08:59:47 +0200 Subject: [PATCH 2/2] chore: switch from service-provider-landscaper/api/v1alpha1 to v1alpha2 --- go.sum | 4 ++-- .../core/landscaper/controller_test.go | 22 +++++++------------ internal/controller/core/landscaper/v2.go | 4 +--- 3 files changed, 11 insertions(+), 19 deletions(-) diff --git a/go.sum b/go.sum index e411c60..2fcafd6 100644 --- a/go.sum +++ b/go.sum @@ -134,8 +134,8 @@ github.com/openmcp-project/openmcp-operator/api v0.15.2 h1:Ujf0NLysUSj0Wiel3qnro github.com/openmcp-project/openmcp-operator/api v0.15.2/go.mod h1:0KytEWVi1Gw5SEjyclhNZmUXks+SqbivLW10fDe7vL4= github.com/openmcp-project/openmcp-operator/lib v0.15.2 h1:NYT8EVThaS9/7xnLJTbaXd5xg+Dw4drUmOpSRhBfwbw= github.com/openmcp-project/openmcp-operator/lib v0.15.2/go.mod h1:iDoSWWIWFewaA14azvjgLLfBEPsIG+U9tI8zK8qB+sI= -github.com/openmcp-project/service-provider-landscaper v0.7.0 h1:PkRdxArr/Tdi7qmvCrAZd45Uoj53aOGSkljRulXGnKc= -github.com/openmcp-project/service-provider-landscaper v0.7.0/go.mod h1:8TNpSqpMIYquanW5sq3TAhcI4Au1dXL4vzBYTgaZwQc= +github.com/openmcp-project/service-provider-landscaper v0.10.0 h1:BfKzMUV3W5TRdFqOGrmpgp/1JiFgnTm+utCyVLaAKjU= +github.com/openmcp-project/service-provider-landscaper v0.10.0/go.mod h1:H2kTwII4xvl1O+YVW3KA4dzxF3cDFqoLjn0P2SGRpNM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= diff --git a/internal/controller/core/landscaper/controller_test.go b/internal/controller/core/landscaper/controller_test.go index dff2356..2b6622c 100644 --- a/internal/controller/core/landscaper/controller_test.go +++ b/internal/controller/core/landscaper/controller_test.go @@ -3,30 +3,24 @@ package landscaper_test import ( "path" - openmcpls "github.com/openmcp-project/service-provider-landscaper/api/v1alpha1" - - "github.com/openmcp-project/mcp-operator/internal/components" - mcpocfg "github.com/openmcp-project/mcp-operator/internal/config" - componentutils "github.com/openmcp-project/mcp-operator/internal/utils/components" - - "github.com/openmcp-project/mcp-operator/internal/controller/core/landscaper" - + lssv1alpha1 "github.com/gardener/landscaper-service/pkg/apis/core/v1alpha1" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - - . "github.com/openmcp-project/mcp-operator/test/matchers" - - lssv1alpha1 "github.com/gardener/landscaper-service/pkg/apis/core/v1alpha1" + "github.com/openmcp-project/controller-utils/pkg/testing" + openmcpls "github.com/openmcp-project/service-provider-landscaper/api/v1alpha2" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/openmcp-project/controller-utils/pkg/testing" - cconst "github.com/openmcp-project/mcp-operator/api/constants" openmcpv1alpha1 "github.com/openmcp-project/mcp-operator/api/core/v1alpha1" + "github.com/openmcp-project/mcp-operator/internal/components" + mcpocfg "github.com/openmcp-project/mcp-operator/internal/config" + "github.com/openmcp-project/mcp-operator/internal/controller/core/landscaper" + componentutils "github.com/openmcp-project/mcp-operator/internal/utils/components" + . "github.com/openmcp-project/mcp-operator/test/matchers" testutils "github.com/openmcp-project/mcp-operator/test/utils" ) diff --git a/internal/controller/core/landscaper/v2.go b/internal/controller/core/landscaper/v2.go index 2ced67b..4478f33 100644 --- a/internal/controller/core/landscaper/v2.go +++ b/internal/controller/core/landscaper/v2.go @@ -7,10 +7,8 @@ import ( "github.com/openmcp-project/controller-utils/pkg/collections" "github.com/openmcp-project/controller-utils/pkg/logging" - commonapi "github.com/openmcp-project/openmcp-operator/api/common" - openmcpls "github.com/openmcp-project/service-provider-landscaper/api/v1alpha1" - + openmcpls "github.com/openmcp-project/service-provider-landscaper/api/v1alpha2" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ctrl "sigs.k8s.io/controller-runtime"