From afcbaaf3c4aa516006750e0696f28e06a91fcd24 Mon Sep 17 00:00:00 2001 From: Muhammad Faizan Date: Fri, 17 Nov 2023 17:52:24 +0500 Subject: [PATCH] changed dir name --- .../v1alpha1/eventing_types.go | 0 .../v1alpha1/eventing_types_test.go | 0 .../v1alpha1/groupversion_info.go | 0 .../v1alpha1/status.go | 0 .../v1alpha1/status_test.go | 0 .../v1alpha1/zz_generated.deepcopy.go | 2 +- cmd/main.go | 4 +- docs/user/02-configuration.md | 77 +++++++++---------- hack/e2e/cleanup/cleanup_test.go | 2 +- hack/e2e/common/fixtures/fixtures.go | 2 +- hack/e2e/common/k8s.go | 2 +- .../testenvironment/test_environment.go | 2 +- hack/e2e/env/env.go | 2 +- hack/e2e/setup/setup_test.go | 2 +- .../eventing/controller.go | 2 +- .../eventing/controller_test.go | 2 +- .../eventing/domain.go | 0 .../eventing/domain_test.go | 0 .../eventing/eventmesh.go | 2 +- .../eventing/eventmesh_test.go | 2 +- .../controller/integration_test.go | 4 +- .../controller_switching/integration_test.go | 4 +- .../controllersinglecr/integration_test.go | 2 +- .../nats_disabled/integration_test.go | 4 +- .../validation/integration_test.go | 2 +- .../without_apirule_crd/integration_test.go | 2 +- .../eventing/mocks/controller.go | 0 .../eventing/mocks/manager.go | 0 .../eventing/mocks/nats_config_handler.go | 2 +- .../eventing/nats.go | 2 +- .../eventing/nats_test.go | 4 +- .../eventing/service_instance_secret.go | 0 .../eventing/status.go | 2 +- .../eventing/unit_test.go | 4 +- .../eventing/utils.go | 2 +- .../eventing/utils_test.go | 2 +- .../eventing/webhook.go | 0 .../eventing/webhook_test.go | 0 pkg/env/nats_config.go | 2 +- pkg/eventing/deployment.go | 2 +- pkg/eventing/deployment_test.go | 2 +- pkg/eventing/manager.go | 2 +- pkg/eventing/manager_test.go | 2 +- pkg/eventing/mocks/manager.go | 2 +- pkg/eventing/utils.go | 2 +- pkg/eventing/utils_test.go | 2 +- pkg/subscriptionmanager/factory.go | 2 +- .../mocks/manager_factory.go | 2 +- test/matchers/matchers.go | 4 +- test/utils/integration/integration.go | 4 +- test/utils/options.go | 2 +- test/utils/utils.go | 2 +- 52 files changed, 84 insertions(+), 87 deletions(-) rename api/{batch => operator.kyma-project.io}/v1alpha1/eventing_types.go (100%) rename api/{batch => operator.kyma-project.io}/v1alpha1/eventing_types_test.go (100%) rename api/{batch => operator.kyma-project.io}/v1alpha1/groupversion_info.go (100%) rename api/{batch => operator.kyma-project.io}/v1alpha1/status.go (100%) rename api/{batch => operator.kyma-project.io}/v1alpha1/status_test.go (100%) rename api/{batch => operator.kyma-project.io}/v1alpha1/zz_generated.deepcopy.go (99%) rename internal/controller/{batch => operator.kyma-project.io}/eventing/controller.go (99%) rename internal/controller/{batch => operator.kyma-project.io}/eventing/controller_test.go (99%) rename internal/controller/{batch => operator.kyma-project.io}/eventing/domain.go (100%) rename internal/controller/{batch => operator.kyma-project.io}/eventing/domain_test.go (100%) rename internal/controller/{batch => operator.kyma-project.io}/eventing/eventmesh.go (99%) rename internal/controller/{batch => operator.kyma-project.io}/eventing/eventmesh_test.go (99%) rename internal/controller/{batch => operator.kyma-project.io}/eventing/integrationtests/controller/integration_test.go (99%) rename internal/controller/{batch => operator.kyma-project.io}/eventing/integrationtests/controller_switching/integration_test.go (98%) rename internal/controller/{batch => operator.kyma-project.io}/eventing/integrationtests/controllersinglecr/integration_test.go (99%) rename internal/controller/{batch => operator.kyma-project.io}/eventing/integrationtests/nats_disabled/integration_test.go (98%) rename internal/controller/{batch => operator.kyma-project.io}/eventing/integrationtests/validation/integration_test.go (99%) rename internal/controller/{batch => operator.kyma-project.io}/eventing/integrationtests/without_apirule_crd/integration_test.go (98%) rename internal/controller/{batch => operator.kyma-project.io}/eventing/mocks/controller.go (100%) rename internal/controller/{batch => operator.kyma-project.io}/eventing/mocks/manager.go (100%) rename internal/controller/{batch => operator.kyma-project.io}/eventing/mocks/nats_config_handler.go (96%) rename internal/controller/{batch => operator.kyma-project.io}/eventing/nats.go (98%) rename internal/controller/{batch => operator.kyma-project.io}/eventing/nats_test.go (99%) rename internal/controller/{batch => operator.kyma-project.io}/eventing/service_instance_secret.go (100%) rename internal/controller/{batch => operator.kyma-project.io}/eventing/status.go (99%) rename internal/controller/{batch => operator.kyma-project.io}/eventing/unit_test.go (97%) rename internal/controller/{batch => operator.kyma-project.io}/eventing/utils.go (98%) rename internal/controller/{batch => operator.kyma-project.io}/eventing/utils_test.go (98%) rename internal/controller/{batch => operator.kyma-project.io}/eventing/webhook.go (100%) rename internal/controller/{batch => operator.kyma-project.io}/eventing/webhook_test.go (100%) diff --git a/api/batch/v1alpha1/eventing_types.go b/api/operator.kyma-project.io/v1alpha1/eventing_types.go similarity index 100% rename from api/batch/v1alpha1/eventing_types.go rename to api/operator.kyma-project.io/v1alpha1/eventing_types.go diff --git a/api/batch/v1alpha1/eventing_types_test.go b/api/operator.kyma-project.io/v1alpha1/eventing_types_test.go similarity index 100% rename from api/batch/v1alpha1/eventing_types_test.go rename to api/operator.kyma-project.io/v1alpha1/eventing_types_test.go diff --git a/api/batch/v1alpha1/groupversion_info.go b/api/operator.kyma-project.io/v1alpha1/groupversion_info.go similarity index 100% rename from api/batch/v1alpha1/groupversion_info.go rename to api/operator.kyma-project.io/v1alpha1/groupversion_info.go diff --git a/api/batch/v1alpha1/status.go b/api/operator.kyma-project.io/v1alpha1/status.go similarity index 100% rename from api/batch/v1alpha1/status.go rename to api/operator.kyma-project.io/v1alpha1/status.go diff --git a/api/batch/v1alpha1/status_test.go b/api/operator.kyma-project.io/v1alpha1/status_test.go similarity index 100% rename from api/batch/v1alpha1/status_test.go rename to api/operator.kyma-project.io/v1alpha1/status_test.go diff --git a/api/batch/v1alpha1/zz_generated.deepcopy.go b/api/operator.kyma-project.io/v1alpha1/zz_generated.deepcopy.go similarity index 99% rename from api/batch/v1alpha1/zz_generated.deepcopy.go rename to api/operator.kyma-project.io/v1alpha1/zz_generated.deepcopy.go index 28204a61..99b1cdc5 100644 --- a/api/batch/v1alpha1/zz_generated.deepcopy.go +++ b/api/operator.kyma-project.io/v1alpha1/zz_generated.deepcopy.go @@ -22,7 +22,7 @@ limitations under the License. package v1alpha1 import ( - "k8s.io/apimachinery/pkg/apis/meta/v1" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" ) diff --git a/cmd/main.go b/cmd/main.go index 295c44a8..38df4ee3 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -22,7 +22,7 @@ import ( "log" "os" - eventingcontroller "github.com/kyma-project/eventing-manager/internal/controller/batch/eventing" + eventingcontroller "github.com/kyma-project/eventing-manager/internal/controller/operator.kyma-project.io/eventing" istiopeerauthentication "github.com/kyma-project/eventing-manager/pkg/istio/peerauthentication" @@ -58,7 +58,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/metrics/server" "sigs.k8s.io/controller-runtime/pkg/webhook" - eventingv1alpha1 "github.com/kyma-project/eventing-manager/api/batch/v1alpha1" + eventingv1alpha1 "github.com/kyma-project/eventing-manager/api/operator.kyma-project.io/v1alpha1" //+kubebuilder:scaffold:imports ) diff --git a/docs/user/02-configuration.md b/docs/user/02-configuration.md index a3303cd1..da4db46f 100644 --- a/docs/user/02-configuration.md +++ b/docs/user/02-configuration.md @@ -28,49 +28,46 @@ Use the following sample CRs as guidance. Each can be applied immediately when y **Spec:** -| Parameter | Type | Description | -| ---- | ----------- | ---- | -| **annotations** | map\[string\]string | Annotations allows to add annotations to resources. | -| **backend** (required) | object | Backend defines the active backend used by Eventing. | -| **backend.​config** | object | Config defines configuration for eventing backend. | -| **backend.​config.​domain** | string | Domain defines the cluster public domain used to configure the EventMesh Subscriptions and their corresponding ApiRules. | -| **backend.​config.​eventMeshSecret** | string | EventMeshSecret defines the namespaced name of K8s Secret containing EventMesh credentials. The format of name is "namespace/name". | -| **backend.​config.​eventTypePrefix** | string | | -| **backend.​config.​natsMaxMsgsPerTopic** | integer | NATSMaxMsgsPerTopic limits how many messages in the NATS stream to retain per subject. | -| **backend.​config.​natsStreamMaxSize** | \{integer or string\} | NATSStreamMaxSize defines the maximum storage size for stream data. | -| **backend.​config.​natsStreamReplicas** | integer | NATSStreamReplicas defines the number of replicas for stream. | -| **backend.​config.​natsStreamStorageType** | string | NATSStreamStorageType defines the storage type for stream data. | -| **backend.​type** (required) | string | Type defines which backend to use. The value is either `EventMesh`, or `NATS`. | -| **labels** | map\[string\]string | Labels allows to add Labels to resources. | -| **logging** | object | Logging defines the log level for eventing-manager. | -| **logging.​logLevel** | string | LogLevel defines the log level. | -| **publisher** | object | Publisher defines the configurations for eventing-publisher-proxy. | -| **publisher.​replicas** | object | Replicas defines the scaling min/max for eventing-publisher-proxy. | -| **publisher.​replicas.​max** | integer | Max defines maximum number of replicas. | -| **publisher.​replicas.​min** | integer | Min defines minimum number of replicas. | -| **publisher.​resources** | object | Resources defines resources for eventing-publisher-proxy. | -| **publisher.​resources.​claims** | \[\]object | Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. - This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. - This field is immutable. It can only be set for containers. | -| **publisher.​resources.​claims.​name** (required) | string | Name must match the name of one entry in pod.spec.resourceClaims of the Pod where this field is used. It makes that resource available inside a container. | -| **publisher.​resources.​limits** | map\[string\]\{integer or string\} | Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ | +| Parameter | Type | Description | +|----------------------------------------------------------|-----------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| **annotations** | map\[string\]string | Annotations allows to add annotations to resources. | +| **backend** (required) | object | Backend defines the active backend used by Eventing. | +| **backend.​config** | object | Config defines configuration for eventing backend. | +| **backend.​config.​domain** | string | Domain defines the cluster public domain used to configure the EventMesh Subscriptions and their corresponding ApiRules. | +| **backend.​config.​eventMeshSecret** | string | EventMeshSecret defines the namespaced name of K8s Secret containing EventMesh credentials. The format of name is "namespace/name". | +| **backend.​config.​eventTypePrefix** | string | | +| **backend.​config.​natsMaxMsgsPerTopic** | integer | NATSMaxMsgsPerTopic limits how many messages in the NATS stream to retain per subject. | +| **backend.​config.​natsStreamMaxSize** | \{integer or string\} | NATSStreamMaxSize defines the maximum storage size for stream data. | +| **backend.​config.​natsStreamReplicas** | integer | NATSStreamReplicas defines the number of replicas for stream. | +| **backend.​config.​natsStreamStorageType** | string | NATSStreamStorageType defines the storage type for stream data. | +| **backend.​type** (required) | string | Type defines which backend to use. The value is either `EventMesh`, or `NATS`. | +| **labels** | map\[string\]string | Labels allows to add Labels to resources. | +| **logging** | object | Logging defines the log level for eventing-manager. | +| **logging.​logLevel** | string | LogLevel defines the log level. | +| **publisher** | object | Publisher defines the configurations for eventing-publisher-proxy. | +| **publisher.​replicas** | object | Replicas defines the scaling min/max for eventing-publisher-proxy. | +| **publisher.​replicas.​max** | integer | Max defines maximum number of replicas. | +| **publisher.​replicas.​min** | integer | Min defines minimum number of replicas. | +| **publisher.​resources** | object | Resources defines resources for eventing-publisher-proxy. | +| **publisher.​resources.​claims** | \[\]object | Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. This field is immutable. It can only be set for containers. | +| **publisher.​resources.​claims.​name** (required) | string | Name must match the name of one entry in pod.spec.resourceClaims of the Pod where this field is used. It makes that resource available inside a container. | +| **publisher.​resources.​limits** | map\[string\]\{integer or string\} | Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ | | **publisher.​resources.​requests** | map\[string\]\{integer or string\} | Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ | **Status:** -| Parameter | Type | Description | -| ---- | ----------- | ---- | -| **activeBackend** (required) | string | | -| **conditions** | \[\]object | Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions. For example, - type FooStatus struct{ // Represents the observations of a foo's current state. // Known .status.conditions.type are: "Available", "Progressing", and "Degraded" // +patchMergeKey=type // +patchStrategy=merge // +listType=map // +listMapKey=type Conditions []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,1,rep,name=conditions"` - // other fields } | -| **conditions.​lastTransitionTime** (required) | string | lastTransitionTime is the last time the condition transitioned from one status to another. This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable. | -| **conditions.​message** (required) | string | message is a human readable message indicating details about the transition. This may be an empty string. | -| **conditions.​observedGeneration** | integer | observedGeneration represents the .metadata.generation that the condition was set based upon. For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date with respect to the current state of the instance. | -| **conditions.​reason** (required) | string | reason contains a programmatic identifier indicating the reason for the condition's last transition. Producers of specific condition types may define expected values and meanings for this field, and whether the values are considered a guaranteed API. The value should be a CamelCase string. This field may not be empty. | -| **conditions.​status** (required) | string | status of the condition, one of True, False, Unknown. | -| **conditions.​type** (required) | string | type of condition in CamelCase or in foo.example.com/CamelCase. --- Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be useful (see .node.status.conditions), the ability to deconflict is important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt) | -| **specHash** (required) | integer | | -| **state** (required) | string | | +| Parameter | Type | Description | +|------------------------------------------------------|------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| **activeBackend** (required) | string | | +| **conditions** | \[\]object | Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions. For example, type FooStatus struct{ // Represents the observations of a foo's current state. // Known .status.conditions.type are: "Available", "Progressing", and "Degraded" // +patchMergeKey=type // +patchStrategy=merge // +listType=map // +listMapKey=type Conditions []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,1,rep,name=conditions"` | +| // other fields } | | | +| **conditions.​lastTransitionTime** (required) | string | lastTransitionTime is the last time the condition transitioned from one status to another. This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable. | +| **conditions.​message** (required) | string | message is a human readable message indicating details about the transition. This may be an empty string. | +| **conditions.​observedGeneration** | integer | observedGeneration represents the .metadata.generation that the condition was set based upon. For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date with respect to the current state of the instance. | +| **conditions.​reason** (required) | string | reason contains a programmatic identifier indicating the reason for the condition's last transition. Producers of specific condition types may define expected values and meanings for this field, and whether the values are considered a guaranteed API. The value should be a CamelCase string. This field may not be empty. | +| **conditions.​status** (required) | string | status of the condition, one of `True`, `False`, `Unknown`. | +| **conditions.​type** (required) | string | type of condition in CamelCase or in foo.example.com/CamelCase. --- Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be useful (see .node.status.conditions), the ability to deconflict is important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt) | +| **specHash** (required) | integer | | +| **state** (required) | string | | diff --git a/hack/e2e/cleanup/cleanup_test.go b/hack/e2e/cleanup/cleanup_test.go index 190f1e53..d98c388f 100644 --- a/hack/e2e/cleanup/cleanup_test.go +++ b/hack/e2e/cleanup/cleanup_test.go @@ -17,7 +17,7 @@ import ( k8serrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - eventingv1alpha1 "github.com/kyma-project/eventing-manager/api/batch/v1alpha1" + eventingv1alpha1 "github.com/kyma-project/eventing-manager/api/operator.kyma-project.io/v1alpha1" "github.com/kyma-project/eventing-manager/hack/e2e/common/testenvironment" "github.com/kyma-project/eventing-manager/pkg/eventing" diff --git a/hack/e2e/common/fixtures/fixtures.go b/hack/e2e/common/fixtures/fixtures.go index 119fb2a8..f09e1895 100644 --- a/hack/e2e/common/fixtures/fixtures.go +++ b/hack/e2e/common/fixtures/fixtures.go @@ -12,7 +12,7 @@ import ( "github.com/kyma-project/eventing-manager/hack/e2e/common/eventing" - eventingv1alpha1 "github.com/kyma-project/eventing-manager/api/batch/v1alpha1" + eventingv1alpha1 "github.com/kyma-project/eventing-manager/api/operator.kyma-project.io/v1alpha1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/hack/e2e/common/k8s.go b/hack/e2e/common/k8s.go index 1ec1b1b5..7039dc54 100644 --- a/hack/e2e/common/k8s.go +++ b/hack/e2e/common/k8s.go @@ -9,7 +9,7 @@ import ( ecv1alpha1 "github.com/kyma-project/kyma/components/eventing-controller/api/v1alpha1" ecv1alpha2 "github.com/kyma-project/kyma/components/eventing-controller/api/v1alpha2" - eventingv1alpha1 "github.com/kyma-project/eventing-manager/api/batch/v1alpha1" + eventingv1alpha1 "github.com/kyma-project/eventing-manager/api/operator.kyma-project.io/v1alpha1" "k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes/scheme" diff --git a/hack/e2e/common/testenvironment/test_environment.go b/hack/e2e/common/testenvironment/test_environment.go index 9a0eefb0..f118580c 100644 --- a/hack/e2e/common/testenvironment/test_environment.go +++ b/hack/e2e/common/testenvironment/test_environment.go @@ -15,7 +15,7 @@ import ( cloudevents "github.com/cloudevents/sdk-go/v2" "github.com/cloudevents/sdk-go/v2/binding" - eventingv1alpha1 "github.com/kyma-project/eventing-manager/api/batch/v1alpha1" + eventingv1alpha1 "github.com/kyma-project/eventing-manager/api/operator.kyma-project.io/v1alpha1" ecv1alpha2 "github.com/kyma-project/kyma/components/eventing-controller/api/v1alpha2" "go.uber.org/zap" diff --git a/hack/e2e/env/env.go b/hack/e2e/env/env.go index 0838a0db..802fb64f 100644 --- a/hack/e2e/env/env.go +++ b/hack/e2e/env/env.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/kelseyhightower/envconfig" - eventingv1alpha1 "github.com/kyma-project/eventing-manager/api/batch/v1alpha1" + eventingv1alpha1 "github.com/kyma-project/eventing-manager/api/operator.kyma-project.io/v1alpha1" ) // E2EConfig represents the environment config for the end-to-end tests for eventing-manager. diff --git a/hack/e2e/setup/setup_test.go b/hack/e2e/setup/setup_test.go index 1212c24f..e7c5d7a7 100644 --- a/hack/e2e/setup/setup_test.go +++ b/hack/e2e/setup/setup_test.go @@ -19,7 +19,7 @@ import ( "github.com/pkg/errors" - eventingv1alpha1 "github.com/kyma-project/eventing-manager/api/batch/v1alpha1" + eventingv1alpha1 "github.com/kyma-project/eventing-manager/api/operator.kyma-project.io/v1alpha1" "github.com/kyma-project/eventing-manager/pkg/eventing" "github.com/stretchr/testify/require" diff --git a/internal/controller/batch/eventing/controller.go b/internal/controller/operator.kyma-project.io/eventing/controller.go similarity index 99% rename from internal/controller/batch/eventing/controller.go rename to internal/controller/operator.kyma-project.io/eventing/controller.go index c426c2a0..eb5b676d 100644 --- a/internal/controller/batch/eventing/controller.go +++ b/internal/controller/operator.kyma-project.io/eventing/controller.go @@ -43,7 +43,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" - eventingv1alpha1 "github.com/kyma-project/eventing-manager/api/batch/v1alpha1" + eventingv1alpha1 "github.com/kyma-project/eventing-manager/api/operator.kyma-project.io/v1alpha1" "github.com/kyma-project/eventing-manager/options" "github.com/kyma-project/eventing-manager/pkg/env" "github.com/kyma-project/eventing-manager/pkg/eventing" diff --git a/internal/controller/batch/eventing/controller_test.go b/internal/controller/operator.kyma-project.io/eventing/controller_test.go similarity index 99% rename from internal/controller/batch/eventing/controller_test.go rename to internal/controller/operator.kyma-project.io/eventing/controller_test.go index 93db4bce..337e1aca 100644 --- a/internal/controller/batch/eventing/controller_test.go +++ b/internal/controller/operator.kyma-project.io/eventing/controller_test.go @@ -9,7 +9,7 @@ import ( "github.com/kyma-project/eventing-manager/pkg/watcher" - eventingv1alpha1 "github.com/kyma-project/eventing-manager/api/batch/v1alpha1" + eventingv1alpha1 "github.com/kyma-project/eventing-manager/api/operator.kyma-project.io/v1alpha1" submanagermocks "github.com/kyma-project/eventing-manager/pkg/subscriptionmanager/manager/mocks" watchmock "github.com/kyma-project/eventing-manager/pkg/watcher/mocks" testutils "github.com/kyma-project/eventing-manager/test/utils" diff --git a/internal/controller/batch/eventing/domain.go b/internal/controller/operator.kyma-project.io/eventing/domain.go similarity index 100% rename from internal/controller/batch/eventing/domain.go rename to internal/controller/operator.kyma-project.io/eventing/domain.go diff --git a/internal/controller/batch/eventing/domain_test.go b/internal/controller/operator.kyma-project.io/eventing/domain_test.go similarity index 100% rename from internal/controller/batch/eventing/domain_test.go rename to internal/controller/operator.kyma-project.io/eventing/domain_test.go diff --git a/internal/controller/batch/eventing/eventmesh.go b/internal/controller/operator.kyma-project.io/eventing/eventmesh.go similarity index 99% rename from internal/controller/batch/eventing/eventmesh.go rename to internal/controller/operator.kyma-project.io/eventing/eventmesh.go index 07b4ef70..8c6bbbd1 100644 --- a/internal/controller/batch/eventing/eventmesh.go +++ b/internal/controller/operator.kyma-project.io/eventing/eventmesh.go @@ -14,7 +14,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "github.com/kyma-project/eventing-manager/api/batch/v1alpha1" + "github.com/kyma-project/eventing-manager/api/operator.kyma-project.io/v1alpha1" "github.com/kyma-project/eventing-manager/pkg/env" "github.com/kyma-project/eventing-manager/pkg/eventing" subscriptionmanager "github.com/kyma-project/eventing-manager/pkg/subscriptionmanager/manager" diff --git a/internal/controller/batch/eventing/eventmesh_test.go b/internal/controller/operator.kyma-project.io/eventing/eventmesh_test.go similarity index 99% rename from internal/controller/batch/eventing/eventmesh_test.go rename to internal/controller/operator.kyma-project.io/eventing/eventmesh_test.go index f9d200ff..9aa3f916 100644 --- a/internal/controller/batch/eventing/eventmesh_test.go +++ b/internal/controller/operator.kyma-project.io/eventing/eventmesh_test.go @@ -7,7 +7,7 @@ import ( "github.com/kyma-project/eventing-manager/pkg/eventing" - "github.com/kyma-project/eventing-manager/api/batch/v1alpha1" + "github.com/kyma-project/eventing-manager/api/operator.kyma-project.io/v1alpha1" "github.com/kyma-project/eventing-manager/pkg/k8s" k8smocks "github.com/kyma-project/eventing-manager/pkg/k8s/mocks" diff --git a/internal/controller/batch/eventing/integrationtests/controller/integration_test.go b/internal/controller/operator.kyma-project.io/eventing/integrationtests/controller/integration_test.go similarity index 99% rename from internal/controller/batch/eventing/integrationtests/controller/integration_test.go rename to internal/controller/operator.kyma-project.io/eventing/integrationtests/controller/integration_test.go index 2a206c38..1e16b67e 100644 --- a/internal/controller/batch/eventing/integrationtests/controller/integration_test.go +++ b/internal/controller/operator.kyma-project.io/eventing/integrationtests/controller/integration_test.go @@ -7,7 +7,7 @@ import ( "os" "testing" - eventing2 "github.com/kyma-project/eventing-manager/internal/controller/batch/eventing" + eventing2 "github.com/kyma-project/eventing-manager/internal/controller/operator.kyma-project.io/eventing" "github.com/onsi/gomega" gomegatypes "github.com/onsi/gomega/types" @@ -21,7 +21,7 @@ import ( natsv1alpha1 "github.com/kyma-project/nats-manager/api/v1alpha1" natstestutils "github.com/kyma-project/nats-manager/testutils" - eventingv1alpha1 "github.com/kyma-project/eventing-manager/api/batch/v1alpha1" + eventingv1alpha1 "github.com/kyma-project/eventing-manager/api/operator.kyma-project.io/v1alpha1" "github.com/kyma-project/eventing-manager/pkg/eventing" "github.com/kyma-project/eventing-manager/pkg/k8s" "github.com/kyma-project/eventing-manager/test/matchers" diff --git a/internal/controller/batch/eventing/integrationtests/controller_switching/integration_test.go b/internal/controller/operator.kyma-project.io/eventing/integrationtests/controller_switching/integration_test.go similarity index 98% rename from internal/controller/batch/eventing/integrationtests/controller_switching/integration_test.go rename to internal/controller/operator.kyma-project.io/eventing/integrationtests/controller_switching/integration_test.go index 896d9503..a35a9406 100644 --- a/internal/controller/batch/eventing/integrationtests/controller_switching/integration_test.go +++ b/internal/controller/operator.kyma-project.io/eventing/integrationtests/controller_switching/integration_test.go @@ -5,9 +5,9 @@ import ( "os" "testing" - eventingcontroller "github.com/kyma-project/eventing-manager/internal/controller/batch/eventing" + eventingcontroller "github.com/kyma-project/eventing-manager/internal/controller/operator.kyma-project.io/eventing" - eventingv1alpha1 "github.com/kyma-project/eventing-manager/api/batch/v1alpha1" + eventingv1alpha1 "github.com/kyma-project/eventing-manager/api/operator.kyma-project.io/v1alpha1" "github.com/kyma-project/eventing-manager/pkg/eventing" "github.com/kyma-project/eventing-manager/test/matchers" "github.com/kyma-project/eventing-manager/test/utils" diff --git a/internal/controller/batch/eventing/integrationtests/controllersinglecr/integration_test.go b/internal/controller/operator.kyma-project.io/eventing/integrationtests/controllersinglecr/integration_test.go similarity index 99% rename from internal/controller/batch/eventing/integrationtests/controllersinglecr/integration_test.go rename to internal/controller/operator.kyma-project.io/eventing/integrationtests/controllersinglecr/integration_test.go index 5a7c1da1..bab75f13 100644 --- a/internal/controller/batch/eventing/integrationtests/controllersinglecr/integration_test.go +++ b/internal/controller/operator.kyma-project.io/eventing/integrationtests/controllersinglecr/integration_test.go @@ -7,7 +7,7 @@ import ( natstestutils "github.com/kyma-project/nats-manager/testutils" - eventingv1alpha1 "github.com/kyma-project/eventing-manager/api/batch/v1alpha1" + eventingv1alpha1 "github.com/kyma-project/eventing-manager/api/operator.kyma-project.io/v1alpha1" "github.com/kyma-project/eventing-manager/test/matchers" testutils "github.com/kyma-project/eventing-manager/test/utils" diff --git a/internal/controller/batch/eventing/integrationtests/nats_disabled/integration_test.go b/internal/controller/operator.kyma-project.io/eventing/integrationtests/nats_disabled/integration_test.go similarity index 98% rename from internal/controller/batch/eventing/integrationtests/nats_disabled/integration_test.go rename to internal/controller/operator.kyma-project.io/eventing/integrationtests/nats_disabled/integration_test.go index 357e5dac..6b250c94 100644 --- a/internal/controller/batch/eventing/integrationtests/nats_disabled/integration_test.go +++ b/internal/controller/operator.kyma-project.io/eventing/integrationtests/nats_disabled/integration_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - eventingcontroller "github.com/kyma-project/eventing-manager/internal/controller/batch/eventing" + eventingcontroller "github.com/kyma-project/eventing-manager/internal/controller/operator.kyma-project.io/eventing" "github.com/kyma-project/eventing-manager/pkg/k8s" "github.com/kyma-project/eventing-manager/test/matchers" @@ -13,7 +13,7 @@ import ( natstestutils "github.com/kyma-project/nats-manager/testutils" "github.com/onsi/gomega" - eventingv1alpha1 "github.com/kyma-project/eventing-manager/api/batch/v1alpha1" + eventingv1alpha1 "github.com/kyma-project/eventing-manager/api/operator.kyma-project.io/v1alpha1" "github.com/kyma-project/eventing-manager/pkg/eventing" testutils "github.com/kyma-project/eventing-manager/test/utils/integration" "github.com/stretchr/testify/require" diff --git a/internal/controller/batch/eventing/integrationtests/validation/integration_test.go b/internal/controller/operator.kyma-project.io/eventing/integrationtests/validation/integration_test.go similarity index 99% rename from internal/controller/batch/eventing/integrationtests/validation/integration_test.go rename to internal/controller/operator.kyma-project.io/eventing/integrationtests/validation/integration_test.go index 5921811a..0bae7405 100644 --- a/internal/controller/batch/eventing/integrationtests/validation/integration_test.go +++ b/internal/controller/operator.kyma-project.io/eventing/integrationtests/validation/integration_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - "github.com/kyma-project/eventing-manager/api/batch/v1alpha1" + "github.com/kyma-project/eventing-manager/api/operator.kyma-project.io/v1alpha1" "github.com/kyma-project/eventing-manager/test" eventingMatchers "github.com/kyma-project/eventing-manager/test/matchers" "github.com/kyma-project/eventing-manager/test/utils/integration" diff --git a/internal/controller/batch/eventing/integrationtests/without_apirule_crd/integration_test.go b/internal/controller/operator.kyma-project.io/eventing/integrationtests/without_apirule_crd/integration_test.go similarity index 98% rename from internal/controller/batch/eventing/integrationtests/without_apirule_crd/integration_test.go rename to internal/controller/operator.kyma-project.io/eventing/integrationtests/without_apirule_crd/integration_test.go index 7dc5f415..584d62d0 100644 --- a/internal/controller/batch/eventing/integrationtests/without_apirule_crd/integration_test.go +++ b/internal/controller/operator.kyma-project.io/eventing/integrationtests/without_apirule_crd/integration_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - eventingv1alpha1 "github.com/kyma-project/eventing-manager/api/batch/v1alpha1" + eventingv1alpha1 "github.com/kyma-project/eventing-manager/api/operator.kyma-project.io/v1alpha1" "github.com/kyma-project/eventing-manager/test/matchers" "github.com/kyma-project/eventing-manager/test/utils" testutils "github.com/kyma-project/eventing-manager/test/utils/integration" diff --git a/internal/controller/batch/eventing/mocks/controller.go b/internal/controller/operator.kyma-project.io/eventing/mocks/controller.go similarity index 100% rename from internal/controller/batch/eventing/mocks/controller.go rename to internal/controller/operator.kyma-project.io/eventing/mocks/controller.go diff --git a/internal/controller/batch/eventing/mocks/manager.go b/internal/controller/operator.kyma-project.io/eventing/mocks/manager.go similarity index 100% rename from internal/controller/batch/eventing/mocks/manager.go rename to internal/controller/operator.kyma-project.io/eventing/mocks/manager.go diff --git a/internal/controller/batch/eventing/mocks/nats_config_handler.go b/internal/controller/operator.kyma-project.io/eventing/mocks/nats_config_handler.go similarity index 96% rename from internal/controller/batch/eventing/mocks/nats_config_handler.go rename to internal/controller/operator.kyma-project.io/eventing/mocks/nats_config_handler.go index 4d0d4023..c1e1c6c0 100644 --- a/internal/controller/batch/eventing/mocks/nats_config_handler.go +++ b/internal/controller/operator.kyma-project.io/eventing/mocks/nats_config_handler.go @@ -9,7 +9,7 @@ import ( mock "github.com/stretchr/testify/mock" - v1alpha1 "github.com/kyma-project/eventing-manager/api/batch/v1alpha1" + v1alpha1 "github.com/kyma-project/eventing-manager/api/operator.kyma-project.io/v1alpha1" ) // NatsConfigHandler is an autogenerated mock type for the NatsConfigHandler type diff --git a/internal/controller/batch/eventing/nats.go b/internal/controller/operator.kyma-project.io/eventing/nats.go similarity index 98% rename from internal/controller/batch/eventing/nats.go rename to internal/controller/operator.kyma-project.io/eventing/nats.go index 88b3829f..621f3c47 100644 --- a/internal/controller/batch/eventing/nats.go +++ b/internal/controller/operator.kyma-project.io/eventing/nats.go @@ -6,7 +6,7 @@ import ( "github.com/kyma-project/eventing-manager/pkg/subscriptionmanager/manager" - "github.com/kyma-project/eventing-manager/api/batch/v1alpha1" + "github.com/kyma-project/eventing-manager/api/operator.kyma-project.io/v1alpha1" "github.com/kyma-project/eventing-manager/options" "github.com/kyma-project/eventing-manager/pkg/env" "github.com/kyma-project/eventing-manager/pkg/k8s" diff --git a/internal/controller/batch/eventing/nats_test.go b/internal/controller/operator.kyma-project.io/eventing/nats_test.go similarity index 99% rename from internal/controller/batch/eventing/nats_test.go rename to internal/controller/operator.kyma-project.io/eventing/nats_test.go index 2b5dab17..388a8942 100644 --- a/internal/controller/batch/eventing/nats_test.go +++ b/internal/controller/operator.kyma-project.io/eventing/nats_test.go @@ -7,11 +7,11 @@ import ( "testing" "time" - "github.com/kyma-project/eventing-manager/internal/controller/batch/eventing/mocks" + "github.com/kyma-project/eventing-manager/internal/controller/operator.kyma-project.io/eventing/mocks" submanagermocks "github.com/kyma-project/eventing-manager/pkg/subscriptionmanager/manager/mocks" - "github.com/kyma-project/eventing-manager/api/batch/v1alpha1" + "github.com/kyma-project/eventing-manager/api/operator.kyma-project.io/v1alpha1" "github.com/kyma-project/eventing-manager/options" "github.com/kyma-project/eventing-manager/pkg/env" managermocks "github.com/kyma-project/eventing-manager/pkg/eventing/mocks" diff --git a/internal/controller/batch/eventing/service_instance_secret.go b/internal/controller/operator.kyma-project.io/eventing/service_instance_secret.go similarity index 100% rename from internal/controller/batch/eventing/service_instance_secret.go rename to internal/controller/operator.kyma-project.io/eventing/service_instance_secret.go diff --git a/internal/controller/batch/eventing/status.go b/internal/controller/operator.kyma-project.io/eventing/status.go similarity index 99% rename from internal/controller/batch/eventing/status.go rename to internal/controller/operator.kyma-project.io/eventing/status.go index fbbf295d..2182ea0d 100644 --- a/internal/controller/batch/eventing/status.go +++ b/internal/controller/operator.kyma-project.io/eventing/status.go @@ -5,7 +5,7 @@ import ( "errors" "time" - eventingv1alpha1 "github.com/kyma-project/eventing-manager/api/batch/v1alpha1" + eventingv1alpha1 "github.com/kyma-project/eventing-manager/api/operator.kyma-project.io/v1alpha1" "go.uber.org/zap" v1 "k8s.io/api/apps/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/internal/controller/batch/eventing/unit_test.go b/internal/controller/operator.kyma-project.io/eventing/unit_test.go similarity index 97% rename from internal/controller/batch/eventing/unit_test.go rename to internal/controller/operator.kyma-project.io/eventing/unit_test.go index cd146c66..1a49086f 100644 --- a/internal/controller/batch/eventing/unit_test.go +++ b/internal/controller/operator.kyma-project.io/eventing/unit_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - ctrlmocks "github.com/kyma-project/eventing-manager/internal/controller/batch/eventing/mocks" + ctrlmocks "github.com/kyma-project/eventing-manager/internal/controller/operator.kyma-project.io/eventing/mocks" apiclientsetfake "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake" @@ -20,7 +20,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" - eventingv1alpha1 "github.com/kyma-project/eventing-manager/api/batch/v1alpha1" + eventingv1alpha1 "github.com/kyma-project/eventing-manager/api/operator.kyma-project.io/v1alpha1" managermocks "github.com/kyma-project/eventing-manager/pkg/eventing/mocks" natsv1alpha1 "github.com/kyma-project/nats-manager/api/v1alpha1" "github.com/stretchr/testify/require" diff --git a/internal/controller/batch/eventing/utils.go b/internal/controller/operator.kyma-project.io/eventing/utils.go similarity index 98% rename from internal/controller/batch/eventing/utils.go rename to internal/controller/operator.kyma-project.io/eventing/utils.go index 0db500cc..e6234c12 100644 --- a/internal/controller/batch/eventing/utils.go +++ b/internal/controller/operator.kyma-project.io/eventing/utils.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - eventingv1alpha1 "github.com/kyma-project/eventing-manager/api/batch/v1alpha1" + eventingv1alpha1 "github.com/kyma-project/eventing-manager/api/operator.kyma-project.io/v1alpha1" "github.com/kyma-project/eventing-manager/pkg/env" "github.com/mitchellh/hashstructure/v2" ctrl "sigs.k8s.io/controller-runtime" diff --git a/internal/controller/batch/eventing/utils_test.go b/internal/controller/operator.kyma-project.io/eventing/utils_test.go similarity index 98% rename from internal/controller/batch/eventing/utils_test.go rename to internal/controller/operator.kyma-project.io/eventing/utils_test.go index 22771186..1172930d 100644 --- a/internal/controller/batch/eventing/utils_test.go +++ b/internal/controller/operator.kyma-project.io/eventing/utils_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - eventingv1alpha1 "github.com/kyma-project/eventing-manager/api/batch/v1alpha1" + eventingv1alpha1 "github.com/kyma-project/eventing-manager/api/operator.kyma-project.io/v1alpha1" "github.com/kyma-project/eventing-manager/test/utils" "github.com/stretchr/testify/require" ) diff --git a/internal/controller/batch/eventing/webhook.go b/internal/controller/operator.kyma-project.io/eventing/webhook.go similarity index 100% rename from internal/controller/batch/eventing/webhook.go rename to internal/controller/operator.kyma-project.io/eventing/webhook.go diff --git a/internal/controller/batch/eventing/webhook_test.go b/internal/controller/operator.kyma-project.io/eventing/webhook_test.go similarity index 100% rename from internal/controller/batch/eventing/webhook_test.go rename to internal/controller/operator.kyma-project.io/eventing/webhook_test.go diff --git a/pkg/env/nats_config.go b/pkg/env/nats_config.go index 52926e4d..6ab9a8a3 100644 --- a/pkg/env/nats_config.go +++ b/pkg/env/nats_config.go @@ -4,7 +4,7 @@ import ( "strings" "time" - "github.com/kyma-project/eventing-manager/api/batch/v1alpha1" + "github.com/kyma-project/eventing-manager/api/operator.kyma-project.io/v1alpha1" "github.com/kelseyhightower/envconfig" ) diff --git a/pkg/eventing/deployment.go b/pkg/eventing/deployment.go index 368784bf..d3a18316 100644 --- a/pkg/eventing/deployment.go +++ b/pkg/eventing/deployment.go @@ -11,7 +11,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" - "github.com/kyma-project/eventing-manager/api/batch/v1alpha1" + "github.com/kyma-project/eventing-manager/api/operator.kyma-project.io/v1alpha1" "github.com/kyma-project/eventing-manager/pkg/env" "github.com/kyma-project/eventing-manager/pkg/utils" ) diff --git a/pkg/eventing/deployment_test.go b/pkg/eventing/deployment_test.go index 343abfe8..1d0ff82a 100644 --- a/pkg/eventing/deployment_test.go +++ b/pkg/eventing/deployment_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/require" v1 "k8s.io/api/core/v1" - "github.com/kyma-project/eventing-manager/api/batch/v1alpha1" + "github.com/kyma-project/eventing-manager/api/operator.kyma-project.io/v1alpha1" "github.com/kyma-project/eventing-manager/pkg/env" "github.com/kyma-project/eventing-manager/test" testutils "github.com/kyma-project/eventing-manager/test/utils" diff --git a/pkg/eventing/manager.go b/pkg/eventing/manager.go index 3f7486ea..3e2f0adf 100644 --- a/pkg/eventing/manager.go +++ b/pkg/eventing/manager.go @@ -11,7 +11,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - "github.com/kyma-project/eventing-manager/api/batch/v1alpha1" + "github.com/kyma-project/eventing-manager/api/operator.kyma-project.io/v1alpha1" "github.com/kyma-project/eventing-manager/pkg/env" "github.com/kyma-project/eventing-manager/pkg/k8s" "github.com/kyma-project/eventing-manager/pkg/logger" diff --git a/pkg/eventing/manager_test.go b/pkg/eventing/manager_test.go index 84f684e3..363b7176 100644 --- a/pkg/eventing/manager_test.go +++ b/pkg/eventing/manager_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/require" appsv1 "k8s.io/api/apps/v1" - "github.com/kyma-project/eventing-manager/api/batch/v1alpha1" + "github.com/kyma-project/eventing-manager/api/operator.kyma-project.io/v1alpha1" "github.com/kyma-project/eventing-manager/pkg/env" k8smocks "github.com/kyma-project/eventing-manager/pkg/k8s/mocks" testutils "github.com/kyma-project/eventing-manager/test/utils" diff --git a/pkg/eventing/mocks/manager.go b/pkg/eventing/mocks/manager.go index d39723a1..3d927b26 100644 --- a/pkg/eventing/mocks/manager.go +++ b/pkg/eventing/mocks/manager.go @@ -11,7 +11,7 @@ import ( v1 "k8s.io/api/apps/v1" - v1alpha1 "github.com/kyma-project/eventing-manager/api/batch/v1alpha1" + v1alpha1 "github.com/kyma-project/eventing-manager/api/operator.kyma-project.io/v1alpha1" ) // Manager is an autogenerated mock type for the Manager type diff --git a/pkg/eventing/utils.go b/pkg/eventing/utils.go index b2ff85fe..d8421bfb 100644 --- a/pkg/eventing/utils.go +++ b/pkg/eventing/utils.go @@ -3,7 +3,7 @@ package eventing import ( "fmt" - "github.com/kyma-project/eventing-manager/api/batch/v1alpha1" + "github.com/kyma-project/eventing-manager/api/operator.kyma-project.io/v1alpha1" ecv1alpha1 "github.com/kyma-project/kyma/components/eventing-controller/api/v1alpha1" autoscalingv2 "k8s.io/api/autoscaling/v2" corev1 "k8s.io/api/core/v1" diff --git a/pkg/eventing/utils_test.go b/pkg/eventing/utils_test.go index d9518c97..635d6fda 100644 --- a/pkg/eventing/utils_test.go +++ b/pkg/eventing/utils_test.go @@ -3,7 +3,7 @@ package eventing import ( "testing" - "github.com/kyma-project/eventing-manager/api/batch/v1alpha1" + "github.com/kyma-project/eventing-manager/api/operator.kyma-project.io/v1alpha1" "github.com/stretchr/testify/require" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/subscriptionmanager/factory.go b/pkg/subscriptionmanager/factory.go index 1f4b4209..ba1db706 100644 --- a/pkg/subscriptionmanager/factory.go +++ b/pkg/subscriptionmanager/factory.go @@ -6,7 +6,7 @@ import ( "github.com/kyma-project/eventing-manager/pkg/backend/metrics" "github.com/kyma-project/eventing-manager/pkg/subscriptionmanager/manager" - "github.com/kyma-project/eventing-manager/api/batch/v1alpha1" + "github.com/kyma-project/eventing-manager/api/operator.kyma-project.io/v1alpha1" "github.com/kyma-project/eventing-manager/pkg/env" eclogger "github.com/kyma-project/eventing-manager/pkg/logger" "github.com/kyma-project/eventing-manager/pkg/subscriptionmanager/eventmesh" diff --git a/pkg/subscriptionmanager/mocks/manager_factory.go b/pkg/subscriptionmanager/mocks/manager_factory.go index a78d5f95..4477f8e7 100644 --- a/pkg/subscriptionmanager/mocks/manager_factory.go +++ b/pkg/subscriptionmanager/mocks/manager_factory.go @@ -7,7 +7,7 @@ import ( manager "github.com/kyma-project/eventing-manager/pkg/subscriptionmanager/manager" mock "github.com/stretchr/testify/mock" - v1alpha1 "github.com/kyma-project/eventing-manager/api/batch/v1alpha1" + v1alpha1 "github.com/kyma-project/eventing-manager/api/operator.kyma-project.io/v1alpha1" ) // ManagerFactory is an autogenerated mock type for the ManagerFactory type diff --git a/test/matchers/matchers.go b/test/matchers/matchers.go index 35e8df15..67de9ec5 100644 --- a/test/matchers/matchers.go +++ b/test/matchers/matchers.go @@ -1,8 +1,8 @@ package matchers import ( - "github.com/kyma-project/eventing-manager/api/batch/v1alpha1" - "github.com/kyma-project/eventing-manager/internal/controller/batch/eventing" + "github.com/kyma-project/eventing-manager/api/operator.kyma-project.io/v1alpha1" + "github.com/kyma-project/eventing-manager/internal/controller/operator.kyma-project.io/eventing" "github.com/onsi/gomega" "github.com/onsi/gomega/gstruct" gomegatypes "github.com/onsi/gomega/types" diff --git a/test/utils/integration/integration.go b/test/utils/integration/integration.go index 7a682df1..a5b5ea31 100644 --- a/test/utils/integration/integration.go +++ b/test/utils/integration/integration.go @@ -11,7 +11,7 @@ import ( "testing" "time" - eventing2 "github.com/kyma-project/eventing-manager/internal/controller/batch/eventing" + eventing2 "github.com/kyma-project/eventing-manager/internal/controller/operator.kyma-project.io/eventing" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" "github.com/kyma-project/eventing-manager/pkg/subscriptionmanager" @@ -53,7 +53,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "github.com/kyma-project/eventing-manager/api/batch/v1alpha1" + "github.com/kyma-project/eventing-manager/api/operator.kyma-project.io/v1alpha1" "github.com/kyma-project/eventing-manager/options" "github.com/kyma-project/eventing-manager/pkg/env" "github.com/kyma-project/eventing-manager/pkg/eventing" diff --git a/test/utils/options.go b/test/utils/options.go index 55f4e2f4..ea9cca2d 100644 --- a/test/utils/options.go +++ b/test/utils/options.go @@ -1,7 +1,7 @@ package utils import ( - "github.com/kyma-project/eventing-manager/api/batch/v1alpha1" + "github.com/kyma-project/eventing-manager/api/operator.kyma-project.io/v1alpha1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/test/utils/utils.go b/test/utils/utils.go index a4fd2294..7f70223a 100644 --- a/test/utils/utils.go +++ b/test/utils/utils.go @@ -20,7 +20,7 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/kyma-project/eventing-manager/api/batch/v1alpha1" + "github.com/kyma-project/eventing-manager/api/operator.kyma-project.io/v1alpha1" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" )