Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
22 changes: 8 additions & 14 deletions internal/controller/core/landscaper/controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 1 addition & 3 deletions internal/controller/core/landscaper/v2.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down