feat: introduce API groups in KLT (#547)

keptn · Jan 9, 2023 · b482d96 · b482d96
1 parent 90bbdba
commit b482d96
Show file tree

Hide file tree

Showing 124 changed files with 331 additions and 302 deletions.
diff --git a/operator/Makefile b/operator/Makefile
@@ -83,15 +83,15 @@ vet: ## Run go vet against code.
 
 .PHONY: test
 test: manifests fmt vet generate envtest ## Run tests.
-	go test ./api/... -v -coverprofile cover-api.out
+	go test ./apis/... -v -coverprofile cover-apis.out
 	go test ./controllers/... -v -coverprofile cover-pkg.out
 	go test ./webhooks/... -v -coverprofile cover-main.out
-	sed -i '/mode: set/d' "cover-api.out"
+	sed -i '/mode: set/d' "cover-apis.out"
 	sed -i '/mode: set/d' "cover-pkg.out"
 	sed -i '/mode: set/d' "cover-main.out"
 	echo "mode: set" > cover.out
-	cat cover-main.out cover-pkg.out cover-api.out >> cover.out
-	rm cover-pkg.out cover-main.out cover-api.out
+	cat cover-main.out cover-pkg.out cover-apis.out >> cover.out
+	rm cover-pkg.out cover-main.out cover-apis.out
 
 .PHONY: component-test
 component-test: manifests generate envtest ## Run tests.

diff --git a/operator/PROJECT b/operator/PROJECT
@@ -1,6 +1,7 @@
 domain: keptn.sh
 layout:
 - go.kubebuilder.io/v3
+multigroup: true
 projectName: keptn-lifecycle-toolkit
 repo: github.com/keptn/lifecycle-toolkit/operator
 resources:
@@ -11,7 +12,7 @@ resources:
   domain: keptn.sh
   group: lifecycle
   kind: KeptnTaskDefinition
-  path: github.com/keptn/lifecycle-toolkit/operator/api/v1alpha1
+  path: github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1
   version: v1alpha1
 - api:
     crdVersion: v1
@@ -20,7 +21,7 @@ resources:
   domain: keptn.sh
   group: lifecycle
   kind: KeptnTask
-  path: github.com/keptn/lifecycle-toolkit/operator/api/v1alpha1
+  path: github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1
   version: v1alpha1
 - api:
     crdVersion: v1
@@ -29,7 +30,7 @@ resources:
   domain: keptn.sh
   group: lifecycle
   kind: KeptnApp
-  path: github.com/keptn/lifecycle-toolkit/operator/api/v1alpha1
+  path: github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1
   version: v1alpha1
 - api:
     crdVersion: v1
@@ -38,7 +39,7 @@ resources:
   domain: keptn.sh
   group: lifecycle
   kind: KeptnWorkload
-  path: github.com/keptn/lifecycle-toolkit/operator/api/v1alpha1
+  path: github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1
   version: v1alpha1
 - api:
     crdVersion: v1
@@ -47,7 +48,7 @@ resources:
   domain: keptn.sh
   group: lifecycle
   kind: KeptnWorkloadInstance
-  path: github.com/keptn/lifecycle-toolkit/operator/api/v1alpha1
+  path: github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1
   version: v1alpha1
 - api:
     crdVersion: v1
@@ -56,7 +57,7 @@ resources:
   domain: keptn.sh
   group: lifecycle
   kind: KeptnAppVersion
-  path: github.com/keptn/lifecycle-toolkit/operator/api/v1alpha1
+  path: github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1
   version: v1alpha1
 - api:
     crdVersion: v1
@@ -65,15 +66,15 @@ resources:
   domain: keptn.sh
   group: lifecycle
   kind: KeptnEvaluationDefinition
-  path: github.com/keptn/lifecycle-toolkit/operator/api/v1alpha1
+  path: github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1
   version: v1alpha1
 - api:
     crdVersion: v1
     namespaced: true
   domain: keptn.sh
   group: lifecycle
   kind: KeptnEvaluationProvider
-  path: github.com/keptn/lifecycle-toolkit/operator/api/v1alpha1
+  path: github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1
   version: v1alpha1
 - api:
     crdVersion: v1
@@ -82,7 +83,7 @@ resources:
   domain: keptn.sh
   group: lifecycle
   kind: KeptnEvaluation
-  path: github.com/keptn/lifecycle-toolkit/operator/api/v1alpha1
+  path: github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1
   version: v1alpha1
 - api:
     crdVersion: v1
@@ -91,7 +92,7 @@ resources:
   domain: keptn.sh
   group: lifecycle
   kind: KeptnTaskDefinition
-  path: github.com/keptn/lifecycle-toolkit/operator/api/v1alpha2
+  path: github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2
   version: v1alpha2
 - api:
     crdVersion: v1
@@ -100,7 +101,7 @@ resources:
   domain: keptn.sh
   group: lifecycle
   kind: KeptnTask
-  path: github.com/keptn/lifecycle-toolkit/operator/api/v1alpha2
+  path: github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2
   version: v1alpha2
 - api:
     crdVersion: v1
@@ -109,7 +110,7 @@ resources:
   domain: keptn.sh
   group: lifecycle
   kind: KeptnApp
-  path: github.com/keptn/lifecycle-toolkit/operator/api/v1alpha2
+  path: github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2
   version: v1alpha2
   webhooks:
     conversion: true
@@ -121,7 +122,7 @@ resources:
   domain: keptn.sh
   group: lifecycle
   kind: KeptnWorkload
-  path: github.com/keptn/lifecycle-toolkit/operator/api/v1alpha2
+  path: github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2
   version: v1alpha2
 - api:
     crdVersion: v1
@@ -130,7 +131,7 @@ resources:
   domain: keptn.sh
   group: lifecycle
   kind: KeptnWorkloadInstance
-  path: github.com/keptn/lifecycle-toolkit/operator/api/v1alpha2
+  path: github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2
   version: v1alpha2
 - api:
     crdVersion: v1
@@ -139,7 +140,7 @@ resources:
   domain: keptn.sh
   group: lifecycle
   kind: KeptnAppVersion
-  path: github.com/keptn/lifecycle-toolkit/operator/api/v1alpha2
+  path: github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2
   version: v1alpha2
 - api:
     crdVersion: v1
@@ -148,15 +149,15 @@ resources:
   domain: keptn.sh
   group: lifecycle
   kind: KeptnEvaluationDefinition
-  path: github.com/keptn/lifecycle-toolkit/operator/api/v1alpha2
+  path: github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2
   version: v1alpha2
 - api:
     crdVersion: v1
     namespaced: true
   domain: keptn.sh
   group: lifecycle
   kind: KeptnEvaluationProvider
-  path: github.com/keptn/lifecycle-toolkit/operator/api/v1alpha2
+  path: github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2
   version: v1alpha2
 - api:
     crdVersion: v1
@@ -165,6 +166,6 @@ resources:
   domain: keptn.sh
   group: lifecycle
   kind: KeptnEvaluation
-  path: github.com/keptn/lifecycle-toolkit/operator/api/v1alpha2
+  path: github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2
   version: v1alpha2
 version: "3"
diff --git a/operator/api/v1alpha1/common/common.go → .../apis/lifecycle/v1alpha1/common/common.go b/operator/api/v1alpha1/common/common.go → .../apis/lifecycle/v1alpha1/common/common.go
diff --git a/operator/api/v1alpha1/common/common_test.go → .../lifecycle/v1alpha1/common/common_test.go b/operator/api/v1alpha1/common/common_test.go → .../lifecycle/v1alpha1/common/common_test.go
diff --git a/operator/api/v1alpha1/common/phases.go → .../apis/lifecycle/v1alpha1/common/phases.go b/operator/api/v1alpha1/common/phases.go → .../apis/lifecycle/v1alpha1/common/phases.go
diff --git a/operator/api/v1alpha1/common/phases_test.go → .../lifecycle/v1alpha1/common/phases_test.go b/operator/api/v1alpha1/common/phases_test.go → .../lifecycle/v1alpha1/common/phases_test.go
diff --git a/operator/api/v1alpha1/groupversion_info.go → ...s/lifecycle/v1alpha1/groupversion_info.go b/operator/api/v1alpha1/groupversion_info.go → ...s/lifecycle/v1alpha1/groupversion_info.go
diff --git a/operator/api/v1alpha1/keptnapp_conversion.go → ...lifecycle/v1alpha1/keptnapp_conversion.go b/operator/api/v1alpha1/keptnapp_conversion.go → ...lifecycle/v1alpha1/keptnapp_conversion.go
@@ -3,7 +3,7 @@ package v1alpha1
 import (
 	"fmt"
 
-	"github.com/keptn/lifecycle-toolkit/operator/api/v1alpha2"
+	"github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2"
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
 )
 

diff --git a/.../api/v1alpha1/keptnapp_conversion_test.go → ...ycle/v1alpha1/keptnapp_conversion_test.go b/.../api/v1alpha1/keptnapp_conversion_test.go → ...ycle/v1alpha1/keptnapp_conversion_test.go
@@ -3,7 +3,7 @@ package v1alpha1
 import (
 	"testing"
 
-	"github.com/keptn/lifecycle-toolkit/operator/api/v1alpha2"
+	"github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2"
 	"github.com/stretchr/testify/require"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	v2 "sigs.k8s.io/controller-runtime/pkg/webhook/conversion/testdata/api/v2"

diff --git a/operator/api/v1alpha1/keptnapp_test.go → .../apis/lifecycle/v1alpha1/keptnapp_test.go b/operator/api/v1alpha1/keptnapp_test.go → .../apis/lifecycle/v1alpha1/keptnapp_test.go
@@ -3,7 +3,7 @@ package v1alpha1
 import (
 	"testing"
 
-	"github.com/keptn/lifecycle-toolkit/operator/api/v1alpha1/common"
+	"github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1/common"
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/otel/attribute"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/operator/api/v1alpha1/keptnapp_types.go → ...apis/lifecycle/v1alpha1/keptnapp_types.go b/operator/api/v1alpha1/keptnapp_types.go → ...apis/lifecycle/v1alpha1/keptnapp_types.go
@@ -19,7 +19,7 @@ package v1alpha1
 import (
 	"strings"
 
-	"github.com/keptn/lifecycle-toolkit/operator/api/v1alpha1/common"
+	"github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1/common"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/trace"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/...ator/api/v1alpha1/keptnappversion_test.go → ...ifecycle/v1alpha1/keptnappversion_test.go b/...ator/api/v1alpha1/keptnappversion_test.go → ...ifecycle/v1alpha1/keptnappversion_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/keptn/lifecycle-toolkit/operator/api/v1alpha1/common"
+	"github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1/common"
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/propagation"

diff --git a/...tor/api/v1alpha1/keptnappversion_types.go → ...fecycle/v1alpha1/keptnappversion_types.go b/...tor/api/v1alpha1/keptnappversion_types.go → ...fecycle/v1alpha1/keptnappversion_types.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/keptn/lifecycle-toolkit/operator/api/v1alpha1/common"
+	"github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1/common"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/propagation"
 	"go.opentelemetry.io/otel/trace"

diff --git a/...ator/api/v1alpha1/keptnevaluation_test.go → ...ifecycle/v1alpha1/keptnevaluation_test.go b/...ator/api/v1alpha1/keptnevaluation_test.go → ...ifecycle/v1alpha1/keptnevaluation_test.go
@@ -3,7 +3,7 @@ package v1alpha1
 import (
 	"testing"
 
-	"github.com/keptn/lifecycle-toolkit/operator/api/v1alpha1/common"
+	"github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1/common"
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/otel/attribute"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/...tor/api/v1alpha1/keptnevaluation_types.go → ...fecycle/v1alpha1/keptnevaluation_types.go b/...tor/api/v1alpha1/keptnevaluation_types.go → ...fecycle/v1alpha1/keptnevaluation_types.go
@@ -19,7 +19,7 @@ package v1alpha1
 import (
 	"time"
 
-	"github.com/keptn/lifecycle-toolkit/operator/api/v1alpha1/common"
+	"github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1/common"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/propagation"
 	"go.opentelemetry.io/otel/trace"

diff --git a/...alpha1/keptnevaluationdefinition_types.go → ...alpha1/keptnevaluationdefinition_types.go b/...alpha1/keptnevaluationdefinition_types.go → ...alpha1/keptnevaluationdefinition_types.go
diff --git a/...v1alpha1/keptnevaluationprovider_types.go → ...v1alpha1/keptnevaluationprovider_types.go b/...v1alpha1/keptnevaluationprovider_types.go → ...v1alpha1/keptnevaluationprovider_types.go
diff --git a/operator/api/v1alpha1/keptntask_test.go → ...apis/lifecycle/v1alpha1/keptntask_test.go b/operator/api/v1alpha1/keptntask_test.go → ...apis/lifecycle/v1alpha1/keptntask_test.go
@@ -3,7 +3,7 @@ package v1alpha1
 import (
 	"testing"
 
-	"github.com/keptn/lifecycle-toolkit/operator/api/v1alpha1/common"
+	"github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1/common"
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/otel/attribute"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/operator/api/v1alpha1/keptntask_types.go → ...pis/lifecycle/v1alpha1/keptntask_types.go b/operator/api/v1alpha1/keptntask_types.go → ...pis/lifecycle/v1alpha1/keptntask_types.go
@@ -19,7 +19,7 @@ package v1alpha1
 import (
 	"time"
 
-	"github.com/keptn/lifecycle-toolkit/operator/api/v1alpha1/common"
+	"github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1/common"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/propagation"
 	"go.opentelemetry.io/otel/trace"

diff --git a/...api/v1alpha1/keptntaskdefinition_types.go → ...cle/v1alpha1/keptntaskdefinition_types.go b/...api/v1alpha1/keptntaskdefinition_types.go → ...cle/v1alpha1/keptntaskdefinition_types.go
diff --git a/operator/api/v1alpha1/keptnworkload_test.go → .../lifecycle/v1alpha1/keptnworkload_test.go b/operator/api/v1alpha1/keptnworkload_test.go → .../lifecycle/v1alpha1/keptnworkload_test.go
@@ -3,7 +3,7 @@ package v1alpha1
 import (
 	"testing"
 
-	"github.com/keptn/lifecycle-toolkit/operator/api/v1alpha1/common"
+	"github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1/common"
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/otel/attribute"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/operator/api/v1alpha1/keptnworkload_types.go → ...lifecycle/v1alpha1/keptnworkload_types.go b/operator/api/v1alpha1/keptnworkload_types.go → ...lifecycle/v1alpha1/keptnworkload_types.go
@@ -19,7 +19,7 @@ package v1alpha1
 import (
 	"strings"
 
-	"github.com/keptn/lifecycle-toolkit/operator/api/v1alpha1/common"
+	"github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1/common"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/trace"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/...pi/v1alpha1/keptnworkloadinstance_test.go → ...le/v1alpha1/keptnworkloadinstance_test.go b/...pi/v1alpha1/keptnworkloadinstance_test.go → ...le/v1alpha1/keptnworkloadinstance_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/keptn/lifecycle-toolkit/operator/api/v1alpha1/common"
+	"github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1/common"
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/propagation"

diff --git a/...i/v1alpha1/keptnworkloadinstance_types.go → ...e/v1alpha1/keptnworkloadinstance_types.go b/...i/v1alpha1/keptnworkloadinstance_types.go → ...e/v1alpha1/keptnworkloadinstance_types.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/keptn/lifecycle-toolkit/operator/api/v1alpha1/common"
+	"github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1/common"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/propagation"
 	"go.opentelemetry.io/otel/trace"

diff --git a/operator/api/v1alpha1/semconv/semconv.go → ...pis/lifecycle/v1alpha1/semconv/semconv.go b/operator/api/v1alpha1/semconv/semconv.go → ...pis/lifecycle/v1alpha1/semconv/semconv.go
@@ -1,7 +1,7 @@
 package semconv
 
 import (
-	"github.com/keptn/lifecycle-toolkit/operator/api/v1alpha1/common"
+	"github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1/common"
 	"go.opentelemetry.io/otel/trace"
 )
 

diff --git a/...tor/api/v1alpha1/zz_generated.deepcopy.go → ...fecycle/v1alpha1/zz_generated.deepcopy.go b/...tor/api/v1alpha1/zz_generated.deepcopy.go → ...fecycle/v1alpha1/zz_generated.deepcopy.go
diff --git a/operator/api/v1alpha2/common/common.go → .../apis/lifecycle/v1alpha2/common/common.go b/operator/api/v1alpha2/common/common.go → .../apis/lifecycle/v1alpha2/common/common.go
diff --git a/operator/api/v1alpha2/common/common_test.go → .../lifecycle/v1alpha2/common/common_test.go b/operator/api/v1alpha2/common/common_test.go → .../lifecycle/v1alpha2/common/common_test.go
diff --git a/operator/api/v1alpha2/common/phases.go → .../apis/lifecycle/v1alpha2/common/phases.go b/operator/api/v1alpha2/common/phases.go → .../apis/lifecycle/v1alpha2/common/phases.go
diff --git a/operator/api/v1alpha2/common/phases_test.go → .../lifecycle/v1alpha2/common/phases_test.go b/operator/api/v1alpha2/common/phases_test.go → .../lifecycle/v1alpha2/common/phases_test.go
diff --git a/operator/api/v1alpha2/groupversion_info.go → ...s/lifecycle/v1alpha2/groupversion_info.go b/operator/api/v1alpha2/groupversion_info.go → ...s/lifecycle/v1alpha2/groupversion_info.go
diff --git a/operator/api/v1alpha2/keptnapp_conversion.go → ...lifecycle/v1alpha2/keptnapp_conversion.go b/operator/api/v1alpha2/keptnapp_conversion.go → ...lifecycle/v1alpha2/keptnapp_conversion.go
diff --git a/operator/api/v1alpha2/keptnapp_test.go → .../apis/lifecycle/v1alpha2/keptnapp_test.go b/operator/api/v1alpha2/keptnapp_test.go → .../apis/lifecycle/v1alpha2/keptnapp_test.go
@@ -3,7 +3,7 @@ package v1alpha2
 import (
 	"testing"
 
-	"github.com/keptn/lifecycle-toolkit/operator/api/v1alpha2/common"
+	"github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2/common"
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/otel/attribute"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/operator/api/v1alpha2/keptnapp_types.go → ...apis/lifecycle/v1alpha2/keptnapp_types.go b/operator/api/v1alpha2/keptnapp_types.go → ...apis/lifecycle/v1alpha2/keptnapp_types.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/keptn/lifecycle-toolkit/operator/api/v1alpha2/common"
+	"github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2/common"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/trace"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/operator/api/v1alpha2/keptnapp_webhook.go → ...is/lifecycle/v1alpha2/keptnapp_webhook.go b/operator/api/v1alpha2/keptnapp_webhook.go → ...is/lifecycle/v1alpha2/keptnapp_webhook.go
diff --git a/...ator/api/v1alpha2/keptnappversion_test.go → ...ifecycle/v1alpha2/keptnappversion_test.go b/...ator/api/v1alpha2/keptnappversion_test.go → ...ifecycle/v1alpha2/keptnappversion_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/keptn/lifecycle-toolkit/operator/api/v1alpha2/common"
+	"github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2/common"
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/propagation"

diff --git a/...tor/api/v1alpha2/keptnappversion_types.go → ...fecycle/v1alpha2/keptnappversion_types.go b/...tor/api/v1alpha2/keptnappversion_types.go → ...fecycle/v1alpha2/keptnappversion_types.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/keptn/lifecycle-toolkit/operator/api/v1alpha2/common"
+	"github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2/common"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/propagation"
 	"go.opentelemetry.io/otel/trace"

diff --git a/...ator/api/v1alpha2/keptnevaluation_test.go → ...ifecycle/v1alpha2/keptnevaluation_test.go b/...ator/api/v1alpha2/keptnevaluation_test.go → ...ifecycle/v1alpha2/keptnevaluation_test.go
@@ -3,7 +3,7 @@ package v1alpha2
 import (
 	"testing"
 
-	"github.com/keptn/lifecycle-toolkit/operator/api/v1alpha2/common"
+	"github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2/common"
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/otel/attribute"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/...tor/api/v1alpha2/keptnevaluation_types.go → ...fecycle/v1alpha2/keptnevaluation_types.go b/...tor/api/v1alpha2/keptnevaluation_types.go → ...fecycle/v1alpha2/keptnevaluation_types.go
@@ -19,7 +19,7 @@ package v1alpha2
 import (
 	"time"
 
-	"github.com/keptn/lifecycle-toolkit/operator/api/v1alpha2/common"
+	"github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2/common"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/propagation"
 	"go.opentelemetry.io/otel/trace"

diff --git a/...alpha2/keptnevaluationdefinition_types.go → ...alpha2/keptnevaluationdefinition_types.go b/...alpha2/keptnevaluationdefinition_types.go → ...alpha2/keptnevaluationdefinition_types.go
diff --git a/.../v1alpha2/keptnevaluationprovider_test.go → .../v1alpha2/keptnevaluationprovider_test.go b/.../v1alpha2/keptnevaluationprovider_test.go → .../v1alpha2/keptnevaluationprovider_test.go
diff --git a/...v1alpha2/keptnevaluationprovider_types.go → ...v1alpha2/keptnevaluationprovider_types.go b/...v1alpha2/keptnevaluationprovider_types.go → ...v1alpha2/keptnevaluationprovider_types.go
diff --git a/operator/api/v1alpha2/keptntask_test.go → ...apis/lifecycle/v1alpha2/keptntask_test.go b/operator/api/v1alpha2/keptntask_test.go → ...apis/lifecycle/v1alpha2/keptntask_test.go
@@ -3,7 +3,7 @@ package v1alpha2
 import (
 	"testing"
 
-	"github.com/keptn/lifecycle-toolkit/operator/api/v1alpha2/common"
+	"github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2/common"
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/otel/attribute"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"