From 97a2d25919c0a02165dd0dc6c7c82d57ad200139 Mon Sep 17 00:00:00 2001 From: Moritz Wiesinger Date: Thu, 3 Aug 2023 10:46:42 +0200 Subject: [PATCH] chore: rename operator folder to lifecycle-operator (#1819) Co-authored-by: Florian Bacher --- .github/labeler.yml | 4 +- .../crd-docs-generator-config.yaml | 2 +- .../generate-crd-docs/generate-crd-docs.sh | 4 +- .github/workflows/CI.yaml | 4 +- .github/workflows/component-test.yml | 4 +- .github/workflows/e2e-test.yml | 2 +- .github/workflows/golangci-lint.yml | 4 +- .github/workflows/helm-checks.yaml | 2 +- .github/workflows/htmltest.yaml | 2 +- .github/workflows/markdown-checks.yaml | 7 ++- .github/workflows/performance-test.yml | 2 +- .github/workflows/release.yml | 14 ++--- .github/workflows/security-scans.yml | 10 ++-- .github/workflows/validate-semantic-pr.yml | 2 +- .gitignore | 2 +- .yamllint | 4 +- Makefile | 12 ++-- README.md | 2 +- codecov.yml | 4 +- docs/.htmltest.yml | 1 - .../docs/crd-ref/lifecycle/v1alpha1/_index.md | 4 +- .../docs/crd-ref/lifecycle/v1alpha2/_index.md | 4 +- .../docs/crd-ref/lifecycle/v1alpha3/_index.md | 6 +- .../docs/crd-ref/metrics/v1alpha2/_index.md | 4 +- .../docs/crd-ref/metrics/v1alpha3/_index.md | 4 +- .../docs/crd-ref/options/v1alpha1/_index.md | 6 +- examples/support/observability/README.md | 2 +- helm/chart/README.md | 2 +- helm/chart/doc.yaml | 2 +- helm/overlay/kustomization.yaml | 2 +- kuttl-test-local.yaml | 2 +- kuttl-test.yaml | 2 +- .../.dockerignore | 0 {operator => lifecycle-operator}/.gitignore | 0 {operator => lifecycle-operator}/Dockerfile | 0 {operator => lifecycle-operator}/Makefile | 14 ++--- {operator => lifecycle-operator}/PROJECT | 60 +++++++++---------- {operator => lifecycle-operator}/README.md | 0 .../apis/lifecycle/v1alpha1/common/common.go | 2 - .../lifecycle/v1alpha1/common/common_test.go | 0 .../apis/lifecycle/v1alpha1/common/phases.go | 0 .../lifecycle/v1alpha1/common/phases_test.go | 0 .../lifecycle/v1alpha1/groupversion_info.go | 0 .../lifecycle/v1alpha1/keptnapp_conversion.go | 4 +- .../v1alpha1/keptnapp_conversion_test.go | 4 +- .../apis/lifecycle/v1alpha1/keptnapp_test.go | 2 +- .../apis/lifecycle/v1alpha1/keptnapp_types.go | 2 +- .../v1alpha1/keptnappversion_conversion.go | 6 +- .../keptnappversion_conversion_test.go | 6 +- .../v1alpha1/keptnappversion_test.go | 2 +- .../v1alpha1/keptnappversion_types.go | 2 +- .../v1alpha1/keptnevaluation_test.go | 2 +- .../v1alpha1/keptnevaluation_types.go | 2 +- .../keptnevaluationdefinition_types.go | 3 +- .../keptnevaluationprovider_conversion.go | 4 +- ...keptnevaluationprovider_conversion_test.go | 4 +- .../v1alpha1/keptnevaluationprovider_types.go | 3 +- .../apis/lifecycle/v1alpha1/keptntask_test.go | 2 +- .../lifecycle/v1alpha1/keptntask_types.go | 2 +- .../v1alpha1/keptntaskdefinition_types.go | 0 .../lifecycle/v1alpha1/keptnworkload_test.go | 2 +- .../lifecycle/v1alpha1/keptnworkload_types.go | 2 +- .../keptnworkloadinstance_conversion.go | 6 +- .../keptnworkloadinstance_conversion_test.go | 6 +- .../v1alpha1/keptnworkloadinstance_test.go | 2 +- .../v1alpha1/keptnworkloadinstance_types.go | 2 +- .../lifecycle/v1alpha1/semconv/semconv.go | 2 +- .../v1alpha1/zz_generated.deepcopy.go | 4 +- .../apis/lifecycle/v1alpha2/common/common.go | 2 - .../lifecycle/v1alpha2/common/common_test.go | 0 .../apis/lifecycle/v1alpha2/common/phases.go | 0 .../lifecycle/v1alpha2/common/phases_test.go | 0 .../lifecycle/v1alpha2/groupversion_info.go | 0 .../lifecycle/v1alpha2/keptnapp_conversion.go | 4 +- .../v1alpha2/keptnapp_conversion_test.go | 4 +- .../apis/lifecycle/v1alpha2/keptnapp_test.go | 2 +- .../apis/lifecycle/v1alpha2/keptnapp_types.go | 2 +- .../v1alpha2/keptnappversion_conversion.go | 6 +- .../keptnappversion_conversion_test.go | 6 +- .../v1alpha2/keptnappversion_test.go | 2 +- .../v1alpha2/keptnappversion_types.go | 2 +- .../v1alpha2/keptnevaluation_test.go | 2 +- .../v1alpha2/keptnevaluation_types.go | 2 +- .../keptnevaluationdefinition_types.go | 3 +- .../keptnevaluationprovider_conversion.go | 4 +- ...keptnevaluationprovider_conversion_test.go | 4 +- .../v1alpha2/keptnevaluationprovider_test.go | 0 .../v1alpha2/keptnevaluationprovider_types.go | 3 +- .../apis/lifecycle/v1alpha2/keptntask_test.go | 2 +- .../lifecycle/v1alpha2/keptntask_types.go | 2 +- .../v1alpha2/keptntaskdefinition_types.go | 0 .../lifecycle/v1alpha2/keptnworkload_test.go | 2 +- .../lifecycle/v1alpha2/keptnworkload_types.go | 2 +- .../keptnworkloadinstance_conversion.go | 6 +- .../keptnworkloadinstance_conversion_test.go | 6 +- .../v1alpha2/keptnworkloadinstance_test.go | 2 +- .../v1alpha2/keptnworkloadinstance_types.go | 2 +- .../lifecycle/v1alpha2/semconv/semconv.go | 2 +- .../v1alpha2/zz_generated.deepcopy.go | 4 +- .../apis/lifecycle/v1alpha3/common/common.go | 4 +- .../lifecycle/v1alpha3/common/common_test.go | 0 .../apis/lifecycle/v1alpha3/common/phases.go | 0 .../lifecycle/v1alpha3/common/phases_test.go | 0 .../lifecycle/v1alpha3/groupversion_info.go | 0 .../lifecycle/v1alpha3/keptnapp_conversion.go | 0 .../apis/lifecycle/v1alpha3/keptnapp_test.go | 2 +- .../apis/lifecycle/v1alpha3/keptnapp_types.go | 12 ++-- .../lifecycle/v1alpha3/keptnapp_webhook.go | 0 .../v1alpha3/keptnappcreationrequest_types.go | 10 ++-- .../keptnappcreationrequest_types_test.go | 2 +- .../v1alpha3/keptnappversion_conversion.go | 0 .../v1alpha3/keptnappversion_test.go | 2 +- .../v1alpha3/keptnappversion_types.go | 14 ++--- .../v1alpha3/keptnappversion_webhook.go | 0 .../v1alpha3/keptnevaluation_test.go | 2 +- .../v1alpha3/keptnevaluation_types.go | 26 ++++---- .../keptnevaluationdefinition_types.go | 13 ++-- .../keptnevaluationprovider_conversion.go | 0 .../v1alpha3/keptnevaluationprovider_types.go | 11 ++-- .../keptnevaluationprovider_webhook.go | 0 .../apis/lifecycle/v1alpha3/keptntask_test.go | 2 +- .../lifecycle/v1alpha3/keptntask_types.go | 4 +- .../v1alpha3/keptntaskdefinition_types.go | 0 .../v1alpha3/keptntaskdefinition_webhook.go | 0 .../keptntaskdefinition_webhook_test.go | 0 .../lifecycle/v1alpha3/keptnworkload_test.go | 2 +- .../lifecycle/v1alpha3/keptnworkload_types.go | 12 ++-- .../v1alpha3/keptnworkload_types_test.go | 0 .../keptnworkloadinstance_conversion.go | 0 .../v1alpha3/keptnworkloadinstance_test.go | 2 +- .../v1alpha3/keptnworkloadinstance_types.go | 12 ++-- .../v1alpha3/keptnworkloadinstance_webhook.go | 0 .../lifecycle/v1alpha3/semconv/semconv.go | 2 +- .../v1alpha3/zz_generated.deepcopy.go | 5 +- .../options/v1alpha1/groupversion_info.go | 0 .../options/v1alpha1/keptnconfig_types.go | 6 +- .../options/v1alpha1/zz_generated.deepcopy.go | 16 ----- .../cmd/config/config.go | 0 .../cmd/config/config_test.go | 0 .../cmd/fake/manager_mock.go | 0 .../cmd/fake/provider_mock.go | 0 .../cmd/fake/webhookmanager_mock.go | 0 .../cmd/manager/manager.go | 0 .../common/common.go | 0 .../common/common_test.go | 0 ...cle.keptn.sh_keptnappcreationrequests.yaml | 2 +- .../bases/lifecycle.keptn.sh_keptnapps.yaml | 0 .../lifecycle.keptn.sh_keptnappversions.yaml | 0 ...e.keptn.sh_keptnevaluationdefinitions.yaml | 6 +- ...cle.keptn.sh_keptnevaluationproviders.yaml | 6 +- .../lifecycle.keptn.sh_keptnevaluations.yaml | 0 ...fecycle.keptn.sh_keptntaskdefinitions.yaml | 0 .../bases/lifecycle.keptn.sh_keptntasks.yaml | 0 ...cycle.keptn.sh_keptnworkloadinstances.yaml | 0 .../lifecycle.keptn.sh_keptnworkloads.yaml | 0 .../bases/options.keptn.sh_keptnconfigs.yaml | 4 +- .../config/crd/kustomization.yaml | 0 .../config/crd/kustomizeconfig.yaml | 0 .../config/crd/patches/.gitignore | 0 ...in_lifecycle_keptnappcreationrequests.yaml | 0 .../webhook_in_lifecycle_keptnapps.yaml | 0 ...webhook_in_lifecycle_keptnappversions.yaml | 0 ..._lifecycle_keptnevaluationdefinitions.yaml | 0 ...in_lifecycle_keptnevaluationproviders.yaml | 0 ...webhook_in_lifecycle_keptnevaluations.yaml | 0 ...ook_in_lifecycle_keptntaskdefinitions.yaml | 0 .../webhook_in_lifecycle_keptntasks.yaml | 0 ...k_in_lifecycle_keptnworkloadinstances.yaml | 0 .../webhook_in_lifecycle_keptnworkloads.yaml | 0 .../webhook_in_options_keptnconfigs.yaml | 0 .../config/default/.gitignore | 0 .../config/default/kustomization.yaml | 0 .../config/default/manager_webhook_patch.yaml | 0 .../default/webhooknamespaces_patch.yaml | 2 +- .../manager/controller_manager_config.yaml | 0 .../config/manager/kustomization.yaml | 0 .../config/manager/manager.yaml | 0 .../config/manager/service.yaml | 0 .../config/rbac/extra_role_binding.yaml | 0 .../config/rbac/extra_roles.yaml | 0 .../config/rbac/keptnapp_editor_role.yaml | 0 .../config/rbac/keptnapp_viewer_role.yaml | 0 .../rbac/keptnappversion_editor_role.yaml | 0 .../rbac/keptnappversion_viewer_role.yaml | 0 .../rbac/keptnevaluation_editor_role.yaml | 0 .../rbac/keptnevaluation_viewer_role.yaml | 0 ...keptnevaluationdefinition_editor_role.yaml | 0 ...keptnevaluationdefinition_viewer_role.yaml | 0 .../config/rbac/keptntask_editor_role.yaml | 0 .../config/rbac/keptntask_viewer_role.yaml | 0 .../rbac/keptntaskdefinition_editor_role.yaml | 0 .../rbac/keptntaskdefinition_viewer_role.yaml | 0 .../rbac/keptnworkload_editor_role.yaml | 0 .../rbac/keptnworkload_viewer_role.yaml | 0 .../keptnworkloadinstance_editor_role.yaml | 0 .../keptnworkloadinstance_viewer_role.yaml | 0 .../config/rbac/kustomization.yaml | 0 .../config/rbac/leader_election_role.yaml | 0 .../rbac/leader_election_role_binding.yaml | 0 .../rbac/lifecycle_keptnapp_editor_role.yaml | 0 .../rbac/lifecycle_keptnapp_viewer_role.yaml | 0 ...e_keptnappcreationrequest_editor_role.yaml | 0 ...e_keptnappcreationrequest_viewer_role.yaml | 0 ...lifecycle_keptnappversion_editor_role.yaml | 0 ...lifecycle_keptnappversion_viewer_role.yaml | 0 ...lifecycle_keptnevaluation_editor_role.yaml | 0 ...lifecycle_keptnevaluation_viewer_role.yaml | 0 ...keptnevaluationdefinition_editor_role.yaml | 0 ...keptnevaluationdefinition_viewer_role.yaml | 0 ...e_keptnevaluationprovider_editor_role.yaml | 0 ...e_keptnevaluationprovider_viewer_role.yaml | 0 .../rbac/lifecycle_keptntask_editor_role.yaml | 0 .../rbac/lifecycle_keptntask_viewer_role.yaml | 0 ...cycle_keptntaskdefinition_editor_role.yaml | 0 ...cycle_keptntaskdefinition_viewer_role.yaml | 0 .../lifecycle_keptnworkload_editor_role.yaml | 0 .../lifecycle_keptnworkload_viewer_role.yaml | 0 ...cle_keptnworkloadinstance_editor_role.yaml | 0 ...cle_keptnworkloadinstance_viewer_role.yaml | 0 .../rbac/options_keptnconfig_editor_role.yaml | 0 .../rbac/options_keptnconfig_viewer_role.yaml | 0 .../config/rbac/role.yaml | 0 .../config/rbac/role_binding.yaml | 0 .../config/rbac/service_account.yaml | 0 .../config/rendered/.gitkeep | 0 .../config/samples/deployment.yaml | 0 .../function_execution/task_schedule.yaml | 0 .../function_execution/task_slack.yaml | 0 .../taskdefinition_function.yaml | 0 .../taskdefinition_function_configmap.yaml | 0 .../taskdefinition_function_inline.yaml | 0 .../taskdefinition_function_inline_slack.yaml | 0 .../taskdefinition_function_upstream.yaml | 0 ...efinition_function_upstream_scheduler.yaml | 0 ...askdefinition_function_upstream_slack.yaml | 0 .../samples/lifecycle_v1alpha1_keptnapp.yaml | 0 .../lifecycle_v1alpha1_keptnappversion.yaml | 0 .../lifecycle_v1alpha1_keptnevaluation.yaml | 0 ...le_v1alpha1_keptnevaluationdefinition.yaml | 0 ...ycle_v1alpha1_keptnevaluationprovider.yaml | 0 .../samples/lifecycle_v1alpha1_keptntask.yaml | 0 ...ifecycle_v1alpha1_keptntaskdefinition.yaml | 0 .../lifecycle_v1alpha1_keptnworkload.yaml | 0 ...ecycle_v1alpha1_keptnworkloadinstance.yaml | 0 .../samples/lifecycle_v1alpha2_keptnapp.yaml | 0 .../lifecycle_v1alpha2_keptnappversion.yaml | 0 .../lifecycle_v1alpha2_keptnevaluation.yaml | 0 ...le_v1alpha2_keptnevaluationdefinition.yaml | 0 ...ycle_v1alpha2_keptnevaluationprovider.yaml | 0 .../samples/lifecycle_v1alpha2_keptntask.yaml | 0 ...ifecycle_v1alpha2_keptntaskdefinition.yaml | 0 .../lifecycle_v1alpha2_keptnworkload.yaml | 0 ...ecycle_v1alpha2_keptnworkloadinstance.yaml | 0 .../samples/lifecycle_v1alpha3_keptnapp.yaml | 0 ...ycle_v1alpha3_keptnappcreationrequest.yaml | 0 .../lifecycle_v1alpha3_keptnappversion.yaml | 0 .../lifecycle_v1alpha3_keptnevaluation.yaml | 0 ...le_v1alpha3_keptnevaluationdefinition.yaml | 0 ...ycle_v1alpha3_keptnevaluationprovider.yaml | 0 .../samples/lifecycle_v1alpha3_keptntask.yaml | 0 ...1alpha3_keptntaskdefinition_container.yaml | 0 ...cycle_v1alpha3_keptntaskdefinition_js.yaml | 0 .../lifecycle_v1alpha3_keptnworkload.yaml | 0 ...ecycle_v1alpha3_keptnworkloadinstance.yaml | 0 .../samples/options_v1alpha1_keptnconfig.yaml | 0 .../taskdefinition_pyfunction_configmap.yaml | 0 .../taskdefinition_pyfunction_inline.yaml | 0 ...nition_pyfunction_inline_printargs_py.yaml | 0 .../taskdefinition_pyfunction_recursive.yaml | 0 ...efinition_pyfunction_upstream_hellopy.yaml | 0 ...taskdefinition_pyfunction_use_envvars.yaml | 0 .../config/webhook/kustomization.yaml | 0 .../config/webhook/kustomizeconfig.yaml | 0 .../config/webhook/manifests.yaml | 0 .../config/webhook/service.yaml | 0 .../controllers/common/config/config.go | 0 .../controllers/common/config/config_test.go | 0 .../common/config/fake/config_mock.go | 0 .../controllers/common/evaluationhandler.go | 8 +-- .../common/evaluationhandler_test.go | 8 +-- .../controllers/common/eventsender.go | 2 +- .../controllers/common/eventsender_test.go | 4 +- .../controllers/common/fake/fakeclient.go | 4 +- .../common/fake/spanhandler_mock.go | 0 .../controllers/common/fake/tracer_mock.go | 0 .../common/fake/tracerfactory_mock.go | 0 .../controllers/common/helperfunctions.go | 6 +- .../common/helperfunctions_test.go | 4 +- .../controllers/common/metrics.go | 4 +- .../controllers/common/metrics_test.go | 6 +- .../controllers/common/otel_utils.go | 6 +- .../controllers/common/otel_utils_test.go | 6 +- .../controllers/common/phasehandler.go | 6 +- .../controllers/common/phasehandler_test.go | 4 +- .../controllers/common/providers/common.go | 0 .../providers/keptnmetric/keptnmetric.go | 4 +- .../providers/keptnmetric/keptnmetric_test.go | 8 +-- .../controllers/common/spanhandler.go | 2 +- .../controllers/common/spanhandler_test.go | 4 +- .../common/taskdefinitionhandler.go | 4 +- .../common/taskdefinitionhandler_test.go | 2 +- .../controllers/common/taskhandler.go | 8 +-- .../controllers/common/taskhandler_test.go | 8 +-- .../controllers/common/test_utils.go | 4 +- .../controllers/common/tracer.go | 0 .../controllers/errors/errors.go | 0 .../interfaces/activemetricsobject.go | 2 +- .../interfaces/activemetricsobject_test.go | 6 +- .../lifecycle/interfaces/controller.go | 0 .../lifecycle/interfaces/eventobject.go | 2 +- .../lifecycle/interfaces/eventobject_test.go | 6 +- .../fake/activemetricsobject_mock.go | 0 .../interfaces/fake/eventobject_mock.go | 0 .../interfaces/fake/listitem_mock.go | 0 .../lifecycle/interfaces/fake/meter_mock.go | 0 .../interfaces/fake/metricsobject_mock.go | 0 .../interfaces/fake/phaseitem_mock.go | 4 +- .../interfaces/fake/spanitem_mock.go | 0 .../lifecycle/interfaces/listitem.go | 2 +- .../lifecycle/interfaces/listitem_test.go | 6 +- .../controllers/lifecycle/interfaces/meter.go | 0 .../lifecycle/interfaces/metricsobject.go | 2 +- .../interfaces/metricsobject_test.go | 6 +- .../lifecycle/interfaces/phaseitem.go | 6 +- .../lifecycle/interfaces/phaseitem_test.go | 6 +- .../lifecycle/interfaces/spanitem.go | 2 +- .../lifecycle/interfaces/spanitem_test.go | 6 +- .../lifecycle/keptnapp/controller.go | 12 ++-- .../lifecycle/keptnapp/controller_test.go | 18 +++--- .../keptnappcreationrequest/controller.go | 12 ++-- .../controller_test.go | 4 +- .../lifecycle/keptnappversion/controller.go | 10 ++-- .../keptnappversion/controller_test.go | 24 ++++---- .../reconcile_prepostdeployment.go | 6 +- .../reconcile_prepostevaluation.go | 6 +- .../reconcile_workloadsstate.go | 6 +- .../reconcile_workloadstate_test.go | 4 +- .../lifecycle/keptnevaluation/common.go | 2 +- .../lifecycle/keptnevaluation/common_test.go | 2 +- .../lifecycle/keptnevaluation/controller.go | 12 ++-- .../keptnevaluation/controller_test.go | 10 ++-- .../lifecycle/keptntask/container_builder.go | 4 +- .../keptntask/container_builder_test.go | 2 +- .../lifecycle/keptntask/controller.go | 8 +-- .../lifecycle/keptntask/job_runner_builder.go | 4 +- .../keptntask/job_runner_builder_test.go | 2 +- .../lifecycle/keptntask/job_utils.go | 8 +-- .../lifecycle/keptntask/job_utils_test.go | 8 +-- .../lifecycle/keptntask/runtime_builder.go | 8 +-- .../keptntask/runtime_builder_test.go | 18 +++--- .../keptntaskdefinition/controller.go | 18 +++--- .../keptntaskdefinition/reconcile_function.go | 14 ++--- .../lifecycle/keptnworkload/controller.go | 10 ++-- .../keptnworkloadinstance/controller.go | 10 ++-- .../keptnworkloadinstance/controller_test.go | 14 ++--- .../reconcile_deploymentstate.go | 6 +- .../reconcile_prepostdeployment.go | 6 +- .../reconcile_prepostevaluation.go | 6 +- .../options/keptnconfig_controller.go | 6 +- .../options/keptnconfig_controller_test.go | 6 +- {operator => lifecycle-operator}/go.mod | 2 +- {operator => lifecycle-operator}/go.sum | 0 .../hack/boilerplate.go.txt | 0 {operator => lifecycle-operator}/main.go | 32 +++++----- .../api/metrics/v1alpha3/groupversion_info.go | 0 .../api/metrics/v1alpha3/keptnmetric_types.go | 0 .../metrics/v1alpha3/zz_generated.deepcopy.go | 0 .../test/component/DEVELOPER.md | 0 .../test/component/app/app_suite_test.go | 10 ++-- .../test/component/app/app_test.go | 6 +- .../appversion/appversion_suite_test.go | 10 ++-- .../component/appversion/appversion_test.go | 6 +- .../test/component/common/common.go | 8 +-- .../evaluation/evaluation_suite_test.go | 10 ++-- .../component/evaluation/evaluation_test.go | 10 ++-- .../test/component/load/load_suite_test.go | 10 ++-- .../test/component/load/load_test.go | 6 +- .../test/component/task/task_suite_test.go | 10 ++-- .../test/component/task/task_test.go | 8 +-- .../taskdefinition_suite_test.go | 10 ++-- .../taskdefinition/taskdefinition_test.go | 4 +- .../component/workload/workload_suite_test.go | 10 ++-- .../test/component/workload/workload_test.go | 6 +- .../workloadinstance_suite_test.go | 10 ++-- .../workloadinstance/workloadinstance_test.go | 6 +- .../test/e2e/DEVELOPER.md | 2 +- .../test/e2e/operator_test.go | 0 .../test/e2e/suite_test.go | 4 +- .../webhooks/config.go | 0 .../pod_mutator/pod_mutating_webhook.go | 10 ++-- .../pod_mutator/pod_mutating_webhook_test.go | 8 +-- .../v1alpha2/keptnmetricsprovider_types.go | 12 ++-- .../api/v1alpha2/zz_generated.deepcopy.go | 16 ----- .../v1alpha3/keptnmetricsprovider_types.go | 4 +- .../api/v1alpha3/zz_generated.deepcopy.go | 16 ----- ...etrics.keptn.sh_keptnmetricsproviders.yaml | 4 +- 396 files changed, 583 insertions(+), 660 deletions(-) rename {operator => lifecycle-operator}/.dockerignore (100%) rename {operator => lifecycle-operator}/.gitignore (100%) rename {operator => lifecycle-operator}/Dockerfile (100%) rename {operator => lifecycle-operator}/Makefile (95%) rename {operator => lifecycle-operator}/PROJECT (63%) rename {operator => lifecycle-operator}/README.md (100%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha1/common/common.go (99%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha1/common/common_test.go (100%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha1/common/phases.go (100%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha1/common/phases_test.go (100%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha1/groupversion_info.go (100%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha1/keptnapp_conversion.go (92%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha1/keptnapp_conversion_test.go (97%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha1/keptnapp_test.go (91%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha1/keptnapp_types.go (97%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha1/keptnappversion_conversion.go (96%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha1/keptnappversion_conversion_test.go (98%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha1/keptnappversion_test.go (99%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha1/keptnappversion_types.go (99%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha1/keptnevaluation_test.go (96%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha1/keptnevaluation_types.go (98%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha1/keptnevaluationdefinition_types.go (93%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha1/keptnevaluationprovider_conversion.go (89%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha1/keptnevaluationprovider_conversion_test.go (96%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha1/keptnevaluationprovider_types.go (93%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha1/keptntask_test.go (97%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha1/keptntask_types.go (98%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha1/keptntaskdefinition_types.go (100%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha1/keptnworkload_test.go (93%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha1/keptnworkload_types.go (97%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha1/keptnworkloadinstance_conversion.go (96%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha1/keptnworkloadinstance_conversion_test.go (98%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha1/keptnworkloadinstance_test.go (99%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha1/keptnworkloadinstance_types.go (99%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha1/semconv/semconv.go (81%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha1/zz_generated.deepcopy.go (99%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha2/common/common.go (99%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha2/common/common_test.go (100%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha2/common/phases.go (100%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha2/common/phases_test.go (100%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha2/groupversion_info.go (100%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha2/keptnapp_conversion.go (92%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha2/keptnapp_conversion_test.go (97%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha2/keptnapp_test.go (92%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha2/keptnapp_types.go (97%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha2/keptnappversion_conversion.go (96%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha2/keptnappversion_conversion_test.go (98%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha2/keptnappversion_test.go (99%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha2/keptnappversion_types.go (99%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha2/keptnevaluation_test.go (97%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha2/keptnevaluation_types.go (98%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha2/keptnevaluationdefinition_types.go (93%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha2/keptnevaluationprovider_conversion.go (90%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha2/keptnevaluationprovider_conversion_test.go (96%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha2/keptnevaluationprovider_test.go (100%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha2/keptnevaluationprovider_types.go (94%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha2/keptntask_test.go (97%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha2/keptntask_types.go (98%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha2/keptntaskdefinition_types.go (100%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha2/keptnworkload_test.go (93%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha2/keptnworkload_types.go (97%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha2/keptnworkloadinstance_conversion.go (96%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha2/keptnworkloadinstance_conversion_test.go (98%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha2/keptnworkloadinstance_test.go (99%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha2/keptnworkloadinstance_types.go (99%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha2/semconv/semconv.go (81%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha2/zz_generated.deepcopy.go (99%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha3/common/common.go (98%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha3/common/common_test.go (100%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha3/common/phases.go (100%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha3/common/phases_test.go (100%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha3/groupversion_info.go (100%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha3/keptnapp_conversion.go (100%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha3/keptnapp_test.go (93%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha3/keptnapp_types.go (94%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha3/keptnapp_webhook.go (100%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha3/keptnappcreationrequest_types.go (91%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha3/keptnappcreationrequest_types_test.go (94%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha3/keptnappversion_conversion.go (100%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha3/keptnappversion_test.go (99%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha3/keptnappversion_types.go (97%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha3/keptnappversion_webhook.go (100%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha3/keptnevaluation_test.go (97%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha3/keptnevaluation_types.go (89%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha3/keptnevaluationdefinition_types.go (88%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha3/keptnevaluationprovider_conversion.go (100%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha3/keptnevaluationprovider_types.go (86%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha3/keptnevaluationprovider_webhook.go (100%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha3/keptntask_test.go (97%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha3/keptntask_types.go (98%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha3/keptntaskdefinition_types.go (100%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha3/keptntaskdefinition_webhook.go (100%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha3/keptntaskdefinition_webhook_test.go (100%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha3/keptnworkload_test.go (93%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha3/keptnworkload_types.go (94%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha3/keptnworkload_types_test.go (100%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha3/keptnworkloadinstance_conversion.go (100%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha3/keptnworkloadinstance_test.go (99%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha3/keptnworkloadinstance_types.go (98%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha3/keptnworkloadinstance_webhook.go (100%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha3/semconv/semconv.go (81%) rename {operator => lifecycle-operator}/apis/lifecycle/v1alpha3/zz_generated.deepcopy.go (99%) rename {operator => lifecycle-operator}/apis/options/v1alpha1/groupversion_info.go (100%) rename {operator => lifecycle-operator}/apis/options/v1alpha1/keptnconfig_types.go (95%) rename {operator => lifecycle-operator}/apis/options/v1alpha1/zz_generated.deepcopy.go (86%) rename {operator => lifecycle-operator}/cmd/config/config.go (100%) rename {operator => lifecycle-operator}/cmd/config/config_test.go (100%) rename {operator => lifecycle-operator}/cmd/fake/manager_mock.go (100%) rename {operator => lifecycle-operator}/cmd/fake/provider_mock.go (100%) rename {operator => lifecycle-operator}/cmd/fake/webhookmanager_mock.go (100%) rename {operator => lifecycle-operator}/cmd/manager/manager.go (100%) rename {operator => lifecycle-operator}/common/common.go (100%) rename {operator => lifecycle-operator}/common/common_test.go (100%) rename {operator => lifecycle-operator}/config/crd/bases/lifecycle.keptn.sh_keptnappcreationrequests.yaml (98%) rename {operator => lifecycle-operator}/config/crd/bases/lifecycle.keptn.sh_keptnapps.yaml (100%) rename {operator => lifecycle-operator}/config/crd/bases/lifecycle.keptn.sh_keptnappversions.yaml (100%) rename {operator => lifecycle-operator}/config/crd/bases/lifecycle.keptn.sh_keptnevaluationdefinitions.yaml (98%) rename {operator => lifecycle-operator}/config/crd/bases/lifecycle.keptn.sh_keptnevaluationproviders.yaml (98%) rename {operator => lifecycle-operator}/config/crd/bases/lifecycle.keptn.sh_keptnevaluations.yaml (100%) rename {operator => lifecycle-operator}/config/crd/bases/lifecycle.keptn.sh_keptntaskdefinitions.yaml (100%) rename {operator => lifecycle-operator}/config/crd/bases/lifecycle.keptn.sh_keptntasks.yaml (100%) rename {operator => lifecycle-operator}/config/crd/bases/lifecycle.keptn.sh_keptnworkloadinstances.yaml (100%) rename {operator => lifecycle-operator}/config/crd/bases/lifecycle.keptn.sh_keptnworkloads.yaml (100%) rename {operator => lifecycle-operator}/config/crd/bases/options.keptn.sh_keptnconfigs.yaml (95%) rename {operator => lifecycle-operator}/config/crd/kustomization.yaml (100%) rename {operator => lifecycle-operator}/config/crd/kustomizeconfig.yaml (100%) rename {operator => lifecycle-operator}/config/crd/patches/.gitignore (100%) rename {operator => lifecycle-operator}/config/crd/patches/webhook_in_lifecycle_keptnappcreationrequests.yaml (100%) rename {operator => lifecycle-operator}/config/crd/patches/webhook_in_lifecycle_keptnapps.yaml (100%) rename {operator => lifecycle-operator}/config/crd/patches/webhook_in_lifecycle_keptnappversions.yaml (100%) rename {operator => lifecycle-operator}/config/crd/patches/webhook_in_lifecycle_keptnevaluationdefinitions.yaml (100%) rename {operator => lifecycle-operator}/config/crd/patches/webhook_in_lifecycle_keptnevaluationproviders.yaml (100%) rename {operator => lifecycle-operator}/config/crd/patches/webhook_in_lifecycle_keptnevaluations.yaml (100%) rename {operator => lifecycle-operator}/config/crd/patches/webhook_in_lifecycle_keptntaskdefinitions.yaml (100%) rename {operator => lifecycle-operator}/config/crd/patches/webhook_in_lifecycle_keptntasks.yaml (100%) rename {operator => lifecycle-operator}/config/crd/patches/webhook_in_lifecycle_keptnworkloadinstances.yaml (100%) rename {operator => lifecycle-operator}/config/crd/patches/webhook_in_lifecycle_keptnworkloads.yaml (100%) rename {operator => lifecycle-operator}/config/crd/patches/webhook_in_options_keptnconfigs.yaml (100%) rename {operator => lifecycle-operator}/config/default/.gitignore (100%) rename {operator => lifecycle-operator}/config/default/kustomization.yaml (100%) rename {operator => lifecycle-operator}/config/default/manager_webhook_patch.yaml (100%) rename {operator => lifecycle-operator}/config/default/webhooknamespaces_patch.yaml (85%) rename {operator => lifecycle-operator}/config/manager/controller_manager_config.yaml (100%) rename {operator => lifecycle-operator}/config/manager/kustomization.yaml (100%) rename {operator => lifecycle-operator}/config/manager/manager.yaml (100%) rename {operator => lifecycle-operator}/config/manager/service.yaml (100%) rename {operator => lifecycle-operator}/config/rbac/extra_role_binding.yaml (100%) rename {operator => lifecycle-operator}/config/rbac/extra_roles.yaml (100%) rename {operator => lifecycle-operator}/config/rbac/keptnapp_editor_role.yaml (100%) rename {operator => lifecycle-operator}/config/rbac/keptnapp_viewer_role.yaml (100%) rename {operator => lifecycle-operator}/config/rbac/keptnappversion_editor_role.yaml (100%) rename {operator => lifecycle-operator}/config/rbac/keptnappversion_viewer_role.yaml (100%) rename {operator => lifecycle-operator}/config/rbac/keptnevaluation_editor_role.yaml (100%) rename {operator => lifecycle-operator}/config/rbac/keptnevaluation_viewer_role.yaml (100%) rename {operator => lifecycle-operator}/config/rbac/keptnevaluationdefinition_editor_role.yaml (100%) rename {operator => lifecycle-operator}/config/rbac/keptnevaluationdefinition_viewer_role.yaml (100%) rename {operator => lifecycle-operator}/config/rbac/keptntask_editor_role.yaml (100%) rename {operator => lifecycle-operator}/config/rbac/keptntask_viewer_role.yaml (100%) rename {operator => lifecycle-operator}/config/rbac/keptntaskdefinition_editor_role.yaml (100%) rename {operator => lifecycle-operator}/config/rbac/keptntaskdefinition_viewer_role.yaml (100%) rename {operator => lifecycle-operator}/config/rbac/keptnworkload_editor_role.yaml (100%) rename {operator => lifecycle-operator}/config/rbac/keptnworkload_viewer_role.yaml (100%) rename {operator => lifecycle-operator}/config/rbac/keptnworkloadinstance_editor_role.yaml (100%) rename {operator => lifecycle-operator}/config/rbac/keptnworkloadinstance_viewer_role.yaml (100%) rename {operator => lifecycle-operator}/config/rbac/kustomization.yaml (100%) rename {operator => lifecycle-operator}/config/rbac/leader_election_role.yaml (100%) rename {operator => lifecycle-operator}/config/rbac/leader_election_role_binding.yaml (100%) rename {operator => lifecycle-operator}/config/rbac/lifecycle_keptnapp_editor_role.yaml (100%) rename {operator => lifecycle-operator}/config/rbac/lifecycle_keptnapp_viewer_role.yaml (100%) rename {operator => lifecycle-operator}/config/rbac/lifecycle_keptnappcreationrequest_editor_role.yaml (100%) rename {operator => lifecycle-operator}/config/rbac/lifecycle_keptnappcreationrequest_viewer_role.yaml (100%) rename {operator => lifecycle-operator}/config/rbac/lifecycle_keptnappversion_editor_role.yaml (100%) rename {operator => lifecycle-operator}/config/rbac/lifecycle_keptnappversion_viewer_role.yaml (100%) rename {operator => lifecycle-operator}/config/rbac/lifecycle_keptnevaluation_editor_role.yaml (100%) rename {operator => lifecycle-operator}/config/rbac/lifecycle_keptnevaluation_viewer_role.yaml (100%) rename {operator => lifecycle-operator}/config/rbac/lifecycle_keptnevaluationdefinition_editor_role.yaml (100%) rename {operator => lifecycle-operator}/config/rbac/lifecycle_keptnevaluationdefinition_viewer_role.yaml (100%) rename {operator => lifecycle-operator}/config/rbac/lifecycle_keptnevaluationprovider_editor_role.yaml (100%) rename {operator => lifecycle-operator}/config/rbac/lifecycle_keptnevaluationprovider_viewer_role.yaml (100%) rename {operator => lifecycle-operator}/config/rbac/lifecycle_keptntask_editor_role.yaml (100%) rename {operator => lifecycle-operator}/config/rbac/lifecycle_keptntask_viewer_role.yaml (100%) rename {operator => lifecycle-operator}/config/rbac/lifecycle_keptntaskdefinition_editor_role.yaml (100%) rename {operator => lifecycle-operator}/config/rbac/lifecycle_keptntaskdefinition_viewer_role.yaml (100%) rename {operator => lifecycle-operator}/config/rbac/lifecycle_keptnworkload_editor_role.yaml (100%) rename {operator => lifecycle-operator}/config/rbac/lifecycle_keptnworkload_viewer_role.yaml (100%) rename {operator => lifecycle-operator}/config/rbac/lifecycle_keptnworkloadinstance_editor_role.yaml (100%) rename {operator => lifecycle-operator}/config/rbac/lifecycle_keptnworkloadinstance_viewer_role.yaml (100%) rename {operator => lifecycle-operator}/config/rbac/options_keptnconfig_editor_role.yaml (100%) rename {operator => lifecycle-operator}/config/rbac/options_keptnconfig_viewer_role.yaml (100%) rename {operator => lifecycle-operator}/config/rbac/role.yaml (100%) rename {operator => lifecycle-operator}/config/rbac/role_binding.yaml (100%) rename {operator => lifecycle-operator}/config/rbac/service_account.yaml (100%) rename {operator => lifecycle-operator}/config/rendered/.gitkeep (100%) rename {operator => lifecycle-operator}/config/samples/deployment.yaml (100%) rename {operator => lifecycle-operator}/config/samples/function_execution/task_schedule.yaml (100%) rename {operator => lifecycle-operator}/config/samples/function_execution/task_slack.yaml (100%) rename {operator => lifecycle-operator}/config/samples/function_execution/taskdefinition_function.yaml (100%) rename {operator => lifecycle-operator}/config/samples/function_execution/taskdefinition_function_configmap.yaml (100%) rename {operator => lifecycle-operator}/config/samples/function_execution/taskdefinition_function_inline.yaml (100%) rename {operator => lifecycle-operator}/config/samples/function_execution/taskdefinition_function_inline_slack.yaml (100%) rename {operator => lifecycle-operator}/config/samples/function_execution/taskdefinition_function_upstream.yaml (100%) rename {operator => lifecycle-operator}/config/samples/function_execution/taskdefinition_function_upstream_scheduler.yaml (100%) rename {operator => lifecycle-operator}/config/samples/function_execution/taskdefinition_function_upstream_slack.yaml (100%) rename {operator => lifecycle-operator}/config/samples/lifecycle_v1alpha1_keptnapp.yaml (100%) rename {operator => lifecycle-operator}/config/samples/lifecycle_v1alpha1_keptnappversion.yaml (100%) rename {operator => lifecycle-operator}/config/samples/lifecycle_v1alpha1_keptnevaluation.yaml (100%) rename {operator => lifecycle-operator}/config/samples/lifecycle_v1alpha1_keptnevaluationdefinition.yaml (100%) rename {operator => lifecycle-operator}/config/samples/lifecycle_v1alpha1_keptnevaluationprovider.yaml (100%) rename {operator => lifecycle-operator}/config/samples/lifecycle_v1alpha1_keptntask.yaml (100%) rename {operator => lifecycle-operator}/config/samples/lifecycle_v1alpha1_keptntaskdefinition.yaml (100%) rename {operator => lifecycle-operator}/config/samples/lifecycle_v1alpha1_keptnworkload.yaml (100%) rename {operator => lifecycle-operator}/config/samples/lifecycle_v1alpha1_keptnworkloadinstance.yaml (100%) rename {operator => lifecycle-operator}/config/samples/lifecycle_v1alpha2_keptnapp.yaml (100%) rename {operator => lifecycle-operator}/config/samples/lifecycle_v1alpha2_keptnappversion.yaml (100%) rename {operator => lifecycle-operator}/config/samples/lifecycle_v1alpha2_keptnevaluation.yaml (100%) rename {operator => lifecycle-operator}/config/samples/lifecycle_v1alpha2_keptnevaluationdefinition.yaml (100%) rename {operator => lifecycle-operator}/config/samples/lifecycle_v1alpha2_keptnevaluationprovider.yaml (100%) rename {operator => lifecycle-operator}/config/samples/lifecycle_v1alpha2_keptntask.yaml (100%) rename {operator => lifecycle-operator}/config/samples/lifecycle_v1alpha2_keptntaskdefinition.yaml (100%) rename {operator => lifecycle-operator}/config/samples/lifecycle_v1alpha2_keptnworkload.yaml (100%) rename {operator => lifecycle-operator}/config/samples/lifecycle_v1alpha2_keptnworkloadinstance.yaml (100%) rename {operator => lifecycle-operator}/config/samples/lifecycle_v1alpha3_keptnapp.yaml (100%) rename {operator => lifecycle-operator}/config/samples/lifecycle_v1alpha3_keptnappcreationrequest.yaml (100%) rename {operator => lifecycle-operator}/config/samples/lifecycle_v1alpha3_keptnappversion.yaml (100%) rename {operator => lifecycle-operator}/config/samples/lifecycle_v1alpha3_keptnevaluation.yaml (100%) rename {operator => lifecycle-operator}/config/samples/lifecycle_v1alpha3_keptnevaluationdefinition.yaml (100%) rename {operator => lifecycle-operator}/config/samples/lifecycle_v1alpha3_keptnevaluationprovider.yaml (100%) rename {operator => lifecycle-operator}/config/samples/lifecycle_v1alpha3_keptntask.yaml (100%) rename {operator => lifecycle-operator}/config/samples/lifecycle_v1alpha3_keptntaskdefinition_container.yaml (100%) rename {operator => lifecycle-operator}/config/samples/lifecycle_v1alpha3_keptntaskdefinition_js.yaml (100%) rename {operator => lifecycle-operator}/config/samples/lifecycle_v1alpha3_keptnworkload.yaml (100%) rename {operator => lifecycle-operator}/config/samples/lifecycle_v1alpha3_keptnworkloadinstance.yaml (100%) rename {operator => lifecycle-operator}/config/samples/options_v1alpha1_keptnconfig.yaml (100%) rename {operator => lifecycle-operator}/config/samples/python_execution/taskdefinition_pyfunction_configmap.yaml (100%) rename {operator => lifecycle-operator}/config/samples/python_execution/taskdefinition_pyfunction_inline.yaml (100%) rename {operator => lifecycle-operator}/config/samples/python_execution/taskdefinition_pyfunction_inline_printargs_py.yaml (100%) rename {operator => lifecycle-operator}/config/samples/python_execution/taskdefinition_pyfunction_recursive.yaml (100%) rename {operator => lifecycle-operator}/config/samples/python_execution/taskdefinition_pyfunction_upstream_hellopy.yaml (100%) rename {operator => lifecycle-operator}/config/samples/python_execution/taskdefinition_pyfunction_use_envvars.yaml (100%) rename {operator => lifecycle-operator}/config/webhook/kustomization.yaml (100%) rename {operator => lifecycle-operator}/config/webhook/kustomizeconfig.yaml (100%) rename {operator => lifecycle-operator}/config/webhook/manifests.yaml (100%) rename {operator => lifecycle-operator}/config/webhook/service.yaml (100%) rename {operator => lifecycle-operator}/controllers/common/config/config.go (100%) rename {operator => lifecycle-operator}/controllers/common/config/config_test.go (100%) rename {operator => lifecycle-operator}/controllers/common/config/fake/config_mock.go (100%) rename {operator => lifecycle-operator}/controllers/common/evaluationhandler.go (95%) rename {operator => lifecycle-operator}/controllers/common/evaluationhandler_test.go (96%) rename {operator => lifecycle-operator}/controllers/common/eventsender.go (88%) rename {operator => lifecycle-operator}/controllers/common/eventsender_test.go (80%) rename {operator => lifecycle-operator}/controllers/common/fake/fakeclient.go (83%) rename {operator => lifecycle-operator}/controllers/common/fake/spanhandler_mock.go (100%) rename {operator => lifecycle-operator}/controllers/common/fake/tracer_mock.go (100%) rename {operator => lifecycle-operator}/controllers/common/fake/tracerfactory_mock.go (100%) rename {operator => lifecycle-operator}/controllers/common/helperfunctions.go (93%) rename {operator => lifecycle-operator}/controllers/common/helperfunctions_test.go (98%) rename {operator => lifecycle-operator}/controllers/common/metrics.go (95%) rename {operator => lifecycle-operator}/controllers/common/metrics_test.go (97%) rename {operator => lifecycle-operator}/controllers/common/otel_utils.go (97%) rename {operator => lifecycle-operator}/controllers/common/otel_utils_test.go (96%) rename {operator => lifecycle-operator}/controllers/common/phasehandler.go (93%) rename {operator => lifecycle-operator}/controllers/common/phasehandler_test.go (97%) rename {operator => lifecycle-operator}/controllers/common/providers/common.go (100%) rename {operator => lifecycle-operator}/controllers/common/providers/keptnmetric/keptnmetric.go (93%) rename {operator => lifecycle-operator}/controllers/common/providers/keptnmetric/keptnmetric_test.go (94%) rename {operator => lifecycle-operator}/controllers/common/spanhandler.go (95%) rename {operator => lifecycle-operator}/controllers/common/spanhandler_test.go (93%) rename {operator => lifecycle-operator}/controllers/common/taskdefinitionhandler.go (92%) rename {operator => lifecycle-operator}/controllers/common/taskdefinitionhandler_test.go (99%) rename {operator => lifecycle-operator}/controllers/common/taskhandler.go (94%) rename {operator => lifecycle-operator}/controllers/common/taskhandler_test.go (97%) rename {operator => lifecycle-operator}/controllers/common/test_utils.go (93%) rename {operator => lifecycle-operator}/controllers/common/tracer.go (100%) rename {operator => lifecycle-operator}/controllers/errors/errors.go (100%) rename {operator => lifecycle-operator}/controllers/lifecycle/interfaces/activemetricsobject.go (92%) rename {operator => lifecycle-operator}/controllers/lifecycle/interfaces/activemetricsobject_test.go (78%) rename {operator => lifecycle-operator}/controllers/lifecycle/interfaces/controller.go (100%) rename {operator => lifecycle-operator}/controllers/lifecycle/interfaces/eventobject.go (90%) rename {operator => lifecycle-operator}/controllers/lifecycle/interfaces/eventobject_test.go (72%) rename {operator => lifecycle-operator}/controllers/lifecycle/interfaces/fake/activemetricsobject_mock.go (100%) rename {operator => lifecycle-operator}/controllers/lifecycle/interfaces/fake/eventobject_mock.go (100%) rename {operator => lifecycle-operator}/controllers/lifecycle/interfaces/fake/listitem_mock.go (100%) rename {operator => lifecycle-operator}/controllers/lifecycle/interfaces/fake/meter_mock.go (100%) rename {operator => lifecycle-operator}/controllers/lifecycle/interfaces/fake/metricsobject_mock.go (100%) rename {operator => lifecycle-operator}/controllers/lifecycle/interfaces/fake/phaseitem_mock.go (99%) rename {operator => lifecycle-operator}/controllers/lifecycle/interfaces/fake/spanitem_mock.go (100%) rename {operator => lifecycle-operator}/controllers/lifecycle/interfaces/listitem.go (88%) rename {operator => lifecycle-operator}/controllers/lifecycle/interfaces/listitem_test.go (74%) rename {operator => lifecycle-operator}/controllers/lifecycle/interfaces/meter.go (100%) rename {operator => lifecycle-operator}/controllers/lifecycle/interfaces/metricsobject.go (95%) rename {operator => lifecycle-operator}/controllers/lifecycle/interfaces/metricsobject_test.go (87%) rename {operator => lifecycle-operator}/controllers/lifecycle/interfaces/phaseitem.go (94%) rename {operator => lifecycle-operator}/controllers/lifecycle/interfaces/phaseitem_test.go (95%) rename {operator => lifecycle-operator}/controllers/lifecycle/interfaces/spanitem.go (93%) rename {operator => lifecycle-operator}/controllers/lifecycle/interfaces/spanitem_test.go (84%) rename {operator => lifecycle-operator}/controllers/lifecycle/keptnapp/controller.go (93%) rename {operator => lifecycle-operator}/controllers/lifecycle/keptnapp/controller_test.go (92%) rename {operator => lifecycle-operator}/controllers/lifecycle/keptnappcreationrequest/controller.go (94%) rename {operator => lifecycle-operator}/controllers/lifecycle/keptnappcreationrequest/controller_test.go (99%) rename {operator => lifecycle-operator}/controllers/lifecycle/keptnappversion/controller.go (95%) rename {operator => lifecycle-operator}/controllers/lifecycle/keptnappversion/controller_test.go (94%) rename {operator => lifecycle-operator}/controllers/lifecycle/keptnappversion/reconcile_prepostdeployment.go (82%) rename {operator => lifecycle-operator}/controllers/lifecycle/keptnappversion/reconcile_prepostevaluation.go (83%) rename {operator => lifecycle-operator}/controllers/lifecycle/keptnappversion/reconcile_workloadsstate.go (92%) rename {operator => lifecycle-operator}/controllers/lifecycle/keptnappversion/reconcile_workloadstate_test.go (97%) rename {operator => lifecycle-operator}/controllers/lifecycle/keptnevaluation/common.go (89%) rename {operator => lifecycle-operator}/controllers/lifecycle/keptnevaluation/common_test.go (98%) rename {operator => lifecycle-operator}/controllers/lifecycle/keptnevaluation/controller.go (95%) rename {operator => lifecycle-operator}/controllers/lifecycle/keptnevaluation/controller_test.go (94%) rename {operator => lifecycle-operator}/controllers/lifecycle/keptntask/container_builder.go (88%) rename {operator => lifecycle-operator}/controllers/lifecycle/keptntask/container_builder_test.go (98%) rename {operator => lifecycle-operator}/controllers/lifecycle/keptntask/controller.go (93%) rename {operator => lifecycle-operator}/controllers/lifecycle/keptntask/job_runner_builder.go (86%) rename {operator => lifecycle-operator}/controllers/lifecycle/keptntask/job_runner_builder_test.go (92%) rename {operator => lifecycle-operator}/controllers/lifecycle/keptntask/job_utils.go (92%) rename {operator => lifecycle-operator}/controllers/lifecycle/keptntask/job_utils_test.go (95%) rename {operator => lifecycle-operator}/controllers/lifecycle/keptntask/runtime_builder.go (95%) rename {operator => lifecycle-operator}/controllers/lifecycle/keptntask/runtime_builder_test.go (92%) rename {operator => lifecycle-operator}/controllers/lifecycle/keptntaskdefinition/controller.go (84%) rename {operator => lifecycle-operator}/controllers/lifecycle/keptntaskdefinition/reconcile_function.go (83%) rename {operator => lifecycle-operator}/controllers/lifecycle/keptnworkload/controller.go (93%) rename {operator => lifecycle-operator}/controllers/lifecycle/keptnworkloadinstance/controller.go (97%) rename {operator => lifecycle-operator}/controllers/lifecycle/keptnworkloadinstance/controller_test.go (98%) rename {operator => lifecycle-operator}/controllers/lifecycle/keptnworkloadinstance/reconcile_deploymentstate.go (93%) rename {operator => lifecycle-operator}/controllers/lifecycle/keptnworkloadinstance/reconcile_prepostdeployment.go (83%) rename {operator => lifecycle-operator}/controllers/lifecycle/keptnworkloadinstance/reconcile_prepostevaluation.go (84%) rename {operator => lifecycle-operator}/controllers/options/keptnconfig_controller.go (91%) rename {operator => lifecycle-operator}/controllers/options/keptnconfig_controller_test.go (97%) rename {operator => lifecycle-operator}/go.mod (98%) rename {operator => lifecycle-operator}/go.sum (100%) rename {operator => lifecycle-operator}/hack/boilerplate.go.txt (100%) rename {operator => lifecycle-operator}/main.go (91%) rename {operator => lifecycle-operator}/test/api/metrics/v1alpha3/groupversion_info.go (100%) rename {operator => lifecycle-operator}/test/api/metrics/v1alpha3/keptnmetric_types.go (100%) rename {operator => lifecycle-operator}/test/api/metrics/v1alpha3/zz_generated.deepcopy.go (100%) rename {operator => lifecycle-operator}/test/component/DEVELOPER.md (100%) rename {operator => lifecycle-operator}/test/component/app/app_suite_test.go (80%) rename {operator => lifecycle-operator}/test/component/app/app_test.go (91%) rename {operator => lifecycle-operator}/test/component/appversion/appversion_suite_test.go (81%) rename {operator => lifecycle-operator}/test/component/appversion/appversion_test.go (95%) rename {operator => lifecycle-operator}/test/component/common/common.go (95%) rename {operator => lifecycle-operator}/test/component/evaluation/evaluation_suite_test.go (82%) rename {operator => lifecycle-operator}/test/component/evaluation/evaluation_test.go (95%) rename {operator => lifecycle-operator}/test/component/load/load_suite_test.go (80%) rename {operator => lifecycle-operator}/test/component/load/load_test.go (89%) rename {operator => lifecycle-operator}/test/component/task/task_suite_test.go (81%) rename {operator => lifecycle-operator}/test/component/task/task_test.go (96%) rename {operator => lifecycle-operator}/test/component/taskdefinition/taskdefinition_suite_test.go (77%) rename {operator => lifecycle-operator}/test/component/taskdefinition/taskdefinition_test.go (97%) rename {operator => lifecycle-operator}/test/component/workload/workload_suite_test.go (80%) rename {operator => lifecycle-operator}/test/component/workload/workload_test.go (93%) rename {operator => lifecycle-operator}/test/component/workloadinstance/workloadinstance_suite_test.go (81%) rename {operator => lifecycle-operator}/test/component/workloadinstance/workloadinstance_test.go (98%) rename {operator => lifecycle-operator}/test/e2e/DEVELOPER.md (97%) rename {operator => lifecycle-operator}/test/e2e/operator_test.go (100%) rename {operator => lifecycle-operator}/test/e2e/suite_test.go (95%) rename {operator => lifecycle-operator}/webhooks/config.go (100%) rename {operator => lifecycle-operator}/webhooks/pod_mutator/pod_mutating_webhook.go (97%) rename {operator => lifecycle-operator}/webhooks/pod_mutator/pod_mutating_webhook_test.go (99%) diff --git a/.github/labeler.yml b/.github/labeler.yml index 55d9de5316..86b3ad8b49 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -2,8 +2,8 @@ documentation: - docs/**/* - "**/*.md" -operator: - - operator/**/* +lifecycle-operator: + - lifecycle-operator/**/* scheduler: - scheduler/**/* diff --git a/.github/scripts/generate-crd-docs/crd-docs-generator-config.yaml b/.github/scripts/generate-crd-docs/crd-docs-generator-config.yaml index 0a1fdff5dc..3dd0d4bb40 100644 --- a/.github/scripts/generate-crd-docs/crd-docs-generator-config.yaml +++ b/.github/scripts/generate-crd-docs/crd-docs-generator-config.yaml @@ -1,7 +1,7 @@ processor: useRawDocstring: true ignoreTypes: - - "nomatch" # this needs to be in place as a workaround to avoid generation bugs + - "EmptyStatus$" ignoreFields: - "TypeMeta$" - "EmptyStatus$" diff --git a/.github/scripts/generate-crd-docs/generate-crd-docs.sh b/.github/scripts/generate-crd-docs/generate-crd-docs.sh index 91d3c37aef..bc42706175 100755 --- a/.github/scripts/generate-crd-docs/generate-crd-docs.sh +++ b/.github/scripts/generate-crd-docs/generate-crd-docs.sh @@ -2,7 +2,7 @@ # CRD docs auto generation script # -# This script goes through all API definitions in the operator/apis folder +# This script goes through all API definitions in the lifecycle-operator/apis folder # and generates docs from code for each API group and version # # Inputs: None @@ -10,7 +10,7 @@ # renovate: datasource=github-releases depName=elastic/crd-ref-docs GENERATOR_VERSION=master API_DOMAIN="keptn.sh" -OPERATOR_API_ROOT='operator/apis/' +OPERATOR_API_ROOT='lifecycle-operator/apis/' METRICS_API_ROOT='metrics-operator/api/' TEMPLATE_DIR='.github/scripts/generate-crd-docs/templates' RENDERER='markdown' diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml index 88c9a686c0..058551c13e 100644 --- a/.github/workflows/CI.yaml +++ b/.github/workflows/CI.yaml @@ -77,7 +77,7 @@ jobs: matrix: config: - name: "lifecycle-operator" - folder: "operator/" + folder: "lifecycle-operator/" - name: "metrics-operator" folder: "metrics-operator/" - name: "scheduler" @@ -119,7 +119,7 @@ jobs: matrix: config: - name: "lifecycle-operator" - folder: "operator/" + folder: "lifecycle-operator/" - name: "metrics-operator" folder: "metrics-operator/" - name: "scheduler" diff --git a/.github/workflows/component-test.yml b/.github/workflows/component-test.yml index be2529fcee..b0874ad90e 100644 --- a/.github/workflows/component-test.yml +++ b/.github/workflows/component-test.yml @@ -19,11 +19,11 @@ jobs: with: go-version: ${{ env.GO_VERSION }} cache: true - cache-dependency-path: 'operator/go.sum' + cache-dependency-path: 'lifecycle-operator/go.sum' check-latest: true - name: Execute Component Tests - working-directory: operator + working-directory: lifecycle-operator run: make component-test - name: Report code coverage diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml index 22d6ec9e4f..2b1f4401c1 100644 --- a/.github/workflows/e2e-test.yml +++ b/.github/workflows/e2e-test.yml @@ -20,7 +20,7 @@ jobs: matrix: config: - name: "lifecycle-operator" - folder: "operator/" + folder: "lifecycle-operator/" - name: "scheduler" folder: "scheduler/" steps: diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 077871e169..9a2bcad8fd 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -28,7 +28,7 @@ jobs: matrix: config: - name: "lifecycle-operator" - folder: "operator/" + folder: "lifecycle-operator/" - name: "metrics-operator" folder: "metrics-operator/" - name: "scheduler" @@ -43,6 +43,8 @@ jobs: with: go-version: ${{ env.GO_VERSION }} check-latest: true + cache: true + cache-dependency-path: '${{ matrix.config.folder }}go.sum' - name: golangci-lint uses: golangci/golangci-lint-action@v3 diff --git a/.github/workflows/helm-checks.yaml b/.github/workflows/helm-checks.yaml index acdbd7d4b5..7e0f0dc2cd 100644 --- a/.github/workflows/helm-checks.yaml +++ b/.github/workflows/helm-checks.yaml @@ -55,7 +55,7 @@ jobs: matrix: config: - name: "lifecycle-operator" - folder: "operator/" + folder: "lifecycle-operator/" - name: "metrics-operator" folder: "metrics-operator/" - name: "scheduler" diff --git a/.github/workflows/htmltest.yaml b/.github/workflows/htmltest.yaml index 3caeea3ced..fd794fbc3c 100644 --- a/.github/workflows/htmltest.yaml +++ b/.github/workflows/htmltest.yaml @@ -38,7 +38,7 @@ jobs: with: path: | docs/tmp/.hugo - key: ${{ runner.os }}-hugo + key: ${{ runner.os }}-hugo-${{ hashFiles('docs/go.sum') }} - name: Check HTML run: make htmltest diff --git a/.github/workflows/markdown-checks.yaml b/.github/workflows/markdown-checks.yaml index c51a653aa5..2e0847c5bc 100644 --- a/.github/workflows/markdown-checks.yaml +++ b/.github/workflows/markdown-checks.yaml @@ -7,15 +7,15 @@ on: - '[0-9]+.[1-9][0-9]*.x' paths: - '**.md' - - 'operator/apis' - - 'metrics-operator/api' + - 'lifecycle-operator/apis/**' + - 'metrics-operator/api/**' pull_request: branches: - 'main' - '[0-9]+.[1-9][0-9]*.x' paths: - '**.md' - - 'operator/apis/**' + - 'lifecycle-operator/apis/**' - 'metrics-operator/api/**' env: @@ -76,6 +76,7 @@ jobs: with: go-version: ${{ env.GO_VERSION }} check-latest: true + cache: false - name: Copy old docs run: | diff --git a/.github/workflows/performance-test.yml b/.github/workflows/performance-test.yml index b5384ab281..a3f4577cc9 100644 --- a/.github/workflows/performance-test.yml +++ b/.github/workflows/performance-test.yml @@ -26,7 +26,7 @@ jobs: runtime_tag: ${{ inputs.runtime_tag }} - name: Execute Performance Tests - working-directory: operator + working-directory: lifecycle-operator run: | make performance-test diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 778fbd197a..faffb2c986 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -61,7 +61,7 @@ jobs: const kltMatrix = [ { name: "lifecycle-operator", - folder: "operator/", + folder: "lifecycle-operator/", tagName: KLT_TAG }, { @@ -199,12 +199,12 @@ jobs: - name: Checkout uses: actions/checkout@v3 - - name: Cache build tools operator + - name: Cache build tools lifecycle-operator if: needs.release-please.outputs.klt-release-created == 'true' - id: cache-build-tools-operator + id: cache-build-tools-lifecycle-operator uses: actions/cache@v3 with: - path: ./operator/bin + path: ./lifecycle-operator/bin key: build-tools-${{ github.ref_name }} - name: Cache build tools metrics-operator @@ -245,14 +245,14 @@ jobs: run: | cd scheduler make release-manifests - cd ../operator + cd ../lifecycle-operator make controller-gen release-manifests cd ../klt-cert-manager make controller-gen release-manifests cd ../metrics-operator make controller-gen release-manifests cd .. - echo "---" >> operator/config/rendered/release.yaml + echo "---" >> lifecycle-operator/config/rendered/release.yaml echo "---" >> scheduler/config/rendered/release.yaml echo "---" >> klt-cert-manager/config/rendered/release.yaml cat >> namespace.yaml << EOF @@ -264,7 +264,7 @@ jobs: --- EOF cat namespace.yaml \ - operator/config/rendered/release.yaml \ + lifecycle-operator/config/rendered/release.yaml \ scheduler/config/rendered/release.yaml \ klt-cert-manager/config/rendered/release.yaml \ metrics-operator/config/rendered/release.yaml > klt-manifest.yaml diff --git a/.github/workflows/security-scans.yml b/.github/workflows/security-scans.yml index 5309d79910..f97f9c1de5 100644 --- a/.github/workflows/security-scans.yml +++ b/.github/workflows/security-scans.yml @@ -146,8 +146,8 @@ jobs: go install github.com/yannh/kubeconform/cmd/kubeconform@${{ matrix.version }} echo "::endgroup::" - cd operator/config/default - sed -i 's/\- ..\/crd//' kustomization.yaml && kustomize build ./ > /tmp/operator-manifest.yaml + cd lifecycle-operator/config/default + sed -i 's/\- ..\/crd//' kustomization.yaml && kustomize build ./ > /tmp/lifecycle-operator-manifest.yaml cd ../crd && kustomize build ./ > /tmp/crds.yaml cd ../../../metrics-operator/config/default sed -i 's/\- ..\/crd//' kustomization.yaml && kustomize build ./ > /tmp/metrics-operator-manifest.yaml @@ -159,9 +159,9 @@ jobs: mkdir -p /tmp/schema && cd /tmp/schema python3 ../openapi2jsonschema.py ../crds.yaml cd .. && \ - echo "---" >> operator-manifest.yaml && \ + echo "---" >> lifecycle-operator-manifest.yaml && \ echo "---" >> scheduler-manifest.yaml && \ - cat operator-manifest.yaml scheduler-manifest.yaml metrics-operator-manifest.yaml > manifest.yaml + cat lifecycle-operator-manifest.yaml scheduler-manifest.yaml metrics-operator-manifest.yaml > manifest.yaml kubeconform \ -schema-location default \ -schema-location './schema/{{ .ResourceKind }}_{{ .ResourceAPIVersion }}.json' \ @@ -221,7 +221,7 @@ jobs: fail-fast: false matrix: artifact: - - "operator" + - "lifecycle-operator" - "metrics-operator" - "scheduler" - "klt-cert-manager" diff --git a/.github/workflows/validate-semantic-pr.yml b/.github/workflows/validate-semantic-pr.yml index 6d266e2039..16a2a7c7e6 100644 --- a/.github/workflows/validate-semantic-pr.yml +++ b/.github/workflows/validate-semantic-pr.yml @@ -35,7 +35,7 @@ jobs: scopes: | helm-chart scheduler - operator + lifecycle-operator cert-manager metrics-operator functions-runtime diff --git a/.gitignore b/.gitignore index 1f6b1f65c2..653ba8c78e 100644 --- a/.gitignore +++ b/.gitignore @@ -25,7 +25,7 @@ kubeconfig manifests/ /scheduler/config/rendered/release.yaml -/operator/config/rendered/release.yaml +/lifecycle-operator/config/rendered/release.yaml /metrics-operator/config/rendered/release.yaml /klt-cert-manager/config/rendered/release.yaml # macOS diff --git a/.yamllint b/.yamllint index ddb236d18e..ecdd76fd14 100644 --- a/.yamllint +++ b/.yamllint @@ -7,10 +7,10 @@ ignore: | **/rendered/release.yaml examples/support/observability/config/prometheus dashboards/grafana - operator/config/crd/bases/* + lifecycle-operator/config/crd/bases/* metrics-operator/config/crd/bases/* klt-cert-manager/config/crd/bases/* - operator/config/rbac/role.yaml + lifecycle-operator/config/rbac/role.yaml metrics-operator/config/rbac/role.yaml klt-cert-manager/config/rbac/role.yaml helm/chart/templates diff --git a/Makefile b/Makefile index 642fc000a2..9f1f5e2b40 100644 --- a/Makefile +++ b/Makefile @@ -85,22 +85,22 @@ helm-package: .PHONY: build-release-manifests build-release-manifests: - $(MAKE) -C operator generate + $(MAKE) -C lifecycle-operator generate $(MAKE) -C klt-cert-manager generate $(MAKE) -C metrics-operator generate - $(MAKE) -C operator release-manifests RELEASE_REGISTRY=$(RELEASE_REGISTRY) TAG=$(TAG) ARCH=$(ARCH) CHART_APPVERSION=$(CHART_APPVERSION) + $(MAKE) -C lifecycle-operator release-manifests RELEASE_REGISTRY=$(RELEASE_REGISTRY) TAG=$(TAG) ARCH=$(ARCH) CHART_APPVERSION=$(CHART_APPVERSION) $(MAKE) -C scheduler release-manifests RELEASE_REGISTRY=$(RELEASE_REGISTRY) TAG=$(TAG) ARCH=$(ARCH) CHART_APPVERSION=$(CHART_APPVERSION) $(MAKE) -C klt-cert-manager release-manifests RELEASE_REGISTRY=$(RELEASE_REGISTRY) TAG=$(TAG) ARCH=$(ARCH) CHART_APPVERSION=$(CHART_APPVERSION) $(MAKE) -C metrics-operator release-manifests RELEASE_REGISTRY=$(RELEASE_REGISTRY) TAG=$(TAG) ARCH=$(ARCH) CHART_APPVERSION=$(CHART_APPVERSION) .PHONY: build-deploy-operator build-deploy-operator: - $(MAKE) -C operator release-local.$(ARCH) RELEASE_REGISTRY=$(RELEASE_REGISTRY) TAG=$(TAG) - $(MAKE) -C operator push-local RELEASE_REGISTRY=$(RELEASE_REGISTRY) TAG=$(TAG) - $(MAKE) -C operator release-manifests RELEASE_REGISTRY=$(RELEASE_REGISTRY) CHART_APPVERSION=$(TAG) ARCH=$(ARCH) + $(MAKE) -C lifecycle-operator release-local.$(ARCH) RELEASE_REGISTRY=$(RELEASE_REGISTRY) TAG=$(TAG) + $(MAKE) -C lifecycle-operator push-local RELEASE_REGISTRY=$(RELEASE_REGISTRY) TAG=$(TAG) + $(MAKE) -C lifecycle-operator release-manifests RELEASE_REGISTRY=$(RELEASE_REGISTRY) CHART_APPVERSION=$(TAG) ARCH=$(ARCH) - kubectl apply -f operator/config/rendered/release.yaml + kubectl apply -f lifecycle-operator/config/rendered/release.yaml .PHONY: build-deploy-metrics-operator build-deploy-metrics-operator: diff --git a/README.md b/README.md index 2a91d3f105..ccc29b1738 100644 --- a/README.md +++ b/README.md @@ -514,7 +514,7 @@ The [GitHub CLI](https://cli.github.com/) can be used to download the manifests ```bash gh run list --repo keptn/lifecycle-toolkit # find the id of a run gh run download 3152895000 --repo keptn/lifecycle-toolkit # download the artifacts -kubectl apply -f ./keptn-lifecycle-operator-manifest/release.yaml # install the operator +kubectl apply -f ./keptn-lifecycle-operator-manifest/release.yaml # install the lifecycle-operator kubectl apply -f ./scheduler-manifest/release.yaml # install the scheduler ``` diff --git a/codecov.yml b/codecov.yml index 435cf7f81c..1a146422fb 100644 --- a/codecov.yml +++ b/codecov.yml @@ -27,7 +27,7 @@ github_checks: flags: keptn-lifecycle-operator: paths: - - operator/ + - lifecycle-operator/ carryforward: true scheduler: paths: @@ -35,5 +35,5 @@ flags: carryforward: true component-tests: paths: - - operator/ + - lifecycle-operator/ carryforward: true diff --git a/docs/.htmltest.yml b/docs/.htmltest.yml index df24819fb8..675761922c 100644 --- a/docs/.htmltest.yml +++ b/docs/.htmltest.yml @@ -3,7 +3,6 @@ CheckDoctype: false IgnoreDirectoryMissingTrailingSlash: true IgnoreDirs: - favicons - - docs/crd-ref/lifecycle/ - community/ IgnoreURLs: - "linkedin.com" diff --git a/docs/content/en/docs/crd-ref/lifecycle/v1alpha1/_index.md b/docs/content/en/docs/crd-ref/lifecycle/v1alpha1/_index.md index 038de5f2d2..e66645a631 100644 --- a/docs/content/en/docs/crd-ref/lifecycle/v1alpha1/_index.md +++ b/docs/content/en/docs/crd-ref/lifecycle/v1alpha1/_index.md @@ -345,7 +345,7 @@ _Appears in:_ | `kind` _string_ | `KeptnEvaluationDefinition` | `metadata` _[ObjectMeta](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.24/#objectmeta-v1-meta)_ | Refer to Kubernetes API documentation for fields of `metadata`. | | `spec` _[KeptnEvaluationDefinitionSpec](#keptnevaluationdefinitionspec)_ | | -| `status` _[EmptyStatus](#emptystatus)_ | unused field | +| `status` _string_ | unused field | #### KeptnEvaluationDefinitionList @@ -410,7 +410,7 @@ _Appears in:_ | `kind` _string_ | `KeptnEvaluationProvider` | `metadata` _[ObjectMeta](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.24/#objectmeta-v1-meta)_ | Refer to Kubernetes API documentation for fields of `metadata`. | | `spec` _[KeptnEvaluationProviderSpec](#keptnevaluationproviderspec)_ | | -| `status` _[EmptyStatus](#emptystatus)_ | unused field | +| `status` _string_ | unused field | #### KeptnEvaluationProviderList diff --git a/docs/content/en/docs/crd-ref/lifecycle/v1alpha2/_index.md b/docs/content/en/docs/crd-ref/lifecycle/v1alpha2/_index.md index 03911f14b6..12f43f676a 100644 --- a/docs/content/en/docs/crd-ref/lifecycle/v1alpha2/_index.md +++ b/docs/content/en/docs/crd-ref/lifecycle/v1alpha2/_index.md @@ -347,7 +347,7 @@ _Appears in:_ | `kind` _string_ | `KeptnEvaluationDefinition` | `metadata` _[ObjectMeta](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.24/#objectmeta-v1-meta)_ | Refer to Kubernetes API documentation for fields of `metadata`. | | `spec` _[KeptnEvaluationDefinitionSpec](#keptnevaluationdefinitionspec)_ | | -| `status` _[EmptyStatus](#emptystatus)_ | unused field | +| `status` _string_ | unused field | #### KeptnEvaluationDefinitionList @@ -412,7 +412,7 @@ _Appears in:_ | `kind` _string_ | `KeptnEvaluationProvider` | `metadata` _[ObjectMeta](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.24/#objectmeta-v1-meta)_ | Refer to Kubernetes API documentation for fields of `metadata`. | | `spec` _[KeptnEvaluationProviderSpec](#keptnevaluationproviderspec)_ | | -| `status` _[EmptyStatus](#emptystatus)_ | unused field | +| `status` _string_ | unused field | #### KeptnEvaluationProviderList diff --git a/docs/content/en/docs/crd-ref/lifecycle/v1alpha3/_index.md b/docs/content/en/docs/crd-ref/lifecycle/v1alpha3/_index.md index 290061b868..e6ac79ab04 100644 --- a/docs/content/en/docs/crd-ref/lifecycle/v1alpha3/_index.md +++ b/docs/content/en/docs/crd-ref/lifecycle/v1alpha3/_index.md @@ -209,7 +209,7 @@ _Appears in:_ | `kind` _string_ | `KeptnAppCreationRequest` | `metadata` _[ObjectMeta](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.24/#objectmeta-v1-meta)_ | Refer to Kubernetes API documentation for fields of `metadata`. | | `spec` _[KeptnAppCreationRequestSpec](#keptnappcreationrequestspec)_ | Spec describes the desired state of the KeptnAppCreationRequest. | -| `status` _[EmptyStatus](#emptystatus)_ | Status describes the current state of the KeptnAppCreationRequest. | +| `status` _string_ | Status describes the current state of the KeptnAppCreationRequest. | #### KeptnAppCreationRequestList @@ -411,7 +411,7 @@ _Appears in:_ | `kind` _string_ | `KeptnEvaluationDefinition` | `metadata` _[ObjectMeta](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.24/#objectmeta-v1-meta)_ | Refer to Kubernetes API documentation for fields of `metadata`. | | `spec` _[KeptnEvaluationDefinitionSpec](#keptnevaluationdefinitionspec)_ | Spec describes the desired state of the KeptnEvaluationDefinition. | -| `status` _[EmptyStatus](#emptystatus)_ | unused field | +| `status` _string_ | unused field | #### KeptnEvaluationDefinitionList @@ -475,7 +475,7 @@ _Appears in:_ | `kind` _string_ | `KeptnEvaluationProvider` | `metadata` _[ObjectMeta](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.24/#objectmeta-v1-meta)_ | Refer to Kubernetes API documentation for fields of `metadata`. | | `spec` _[KeptnEvaluationProviderSpec](#keptnevaluationproviderspec)_ | | -| `status` _[EmptyStatus](#emptystatus)_ | unused field | +| `status` _string_ | unused field | #### KeptnEvaluationProviderList diff --git a/docs/content/en/docs/crd-ref/metrics/v1alpha2/_index.md b/docs/content/en/docs/crd-ref/metrics/v1alpha2/_index.md index 8b4164e8b1..bd758cc8b4 100644 --- a/docs/content/en/docs/crd-ref/metrics/v1alpha2/_index.md +++ b/docs/content/en/docs/crd-ref/metrics/v1alpha2/_index.md @@ -20,8 +20,6 @@ Package v1alpha2 contains API Schema definitions for the metrics v1alpha2 API gr - - #### KeptnMetric @@ -103,7 +101,7 @@ _Appears in:_ | `kind` _string_ | `KeptnMetricsProvider` | `metadata` _[ObjectMeta](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.24/#objectmeta-v1-meta)_ | Refer to Kubernetes API documentation for fields of `metadata`. | | `spec` _[KeptnMetricsProviderSpec](#keptnmetricsproviderspec)_ | | -| `status` _[EmptyStatus](#emptystatus)_ | unused field | +| `status` _string_ | unused field | #### KeptnMetricsProviderList diff --git a/docs/content/en/docs/crd-ref/metrics/v1alpha3/_index.md b/docs/content/en/docs/crd-ref/metrics/v1alpha3/_index.md index 1764dd11ea..5d49a26c84 100644 --- a/docs/content/en/docs/crd-ref/metrics/v1alpha3/_index.md +++ b/docs/content/en/docs/crd-ref/metrics/v1alpha3/_index.md @@ -20,8 +20,6 @@ Package v1alpha3 contains API Schema definitions for the metrics v1alpha3 API gr - - #### KeptnMetric @@ -105,7 +103,7 @@ _Appears in:_ | `kind` _string_ | `KeptnMetricsProvider` | `metadata` _[ObjectMeta](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.24/#objectmeta-v1-meta)_ | Refer to Kubernetes API documentation for fields of `metadata`. | | `spec` _[KeptnMetricsProviderSpec](#keptnmetricsproviderspec)_ | | -| `status` _[EmptyStatus](#emptystatus)_ | unused field | +| `status` _string_ | unused field | #### KeptnMetricsProviderList diff --git a/docs/content/en/docs/crd-ref/options/v1alpha1/_index.md b/docs/content/en/docs/crd-ref/options/v1alpha1/_index.md index c48666c1ea..d3d3bf9661 100644 --- a/docs/content/en/docs/crd-ref/options/v1alpha1/_index.md +++ b/docs/content/en/docs/crd-ref/options/v1alpha1/_index.md @@ -18,8 +18,6 @@ Package v1alpha1 contains API Schema definitions for the options v1alpha1 API gr - - #### KeptnConfig @@ -35,7 +33,7 @@ _Appears in:_ | `kind` _string_ | `KeptnConfig` | `metadata` _[ObjectMeta](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.24/#objectmeta-v1-meta)_ | Refer to Kubernetes API documentation for fields of `metadata`. | | `spec` _[KeptnConfigSpec](#keptnconfigspec)_ | | -| `status` _[EmptyStatus](#emptystatus)_ | unused field | +| `status` _string_ | unused field | #### KeptnConfigList @@ -65,7 +63,7 @@ _Appears in:_ | Field | Description | | --- | --- | -| `OTelCollectorUrl` _string_ | OTelCollectorUrl can be used to set the Open Telemetry collector that the operator should use | +| `OTelCollectorUrl` _string_ | OTelCollectorUrl can be used to set the Open Telemetry collector that the lifecycle operator should use | | `keptnAppCreationRequestTimeoutSeconds` _integer_ | KeptnAppCreationRequestTimeoutSeconds is used to set the interval in which automatic app discovery searches for workload to put into the same auto-generated KeptnApp | diff --git a/examples/support/observability/README.md b/examples/support/observability/README.md index 14c4ca88eb..7dc9a1646d 100644 --- a/examples/support/observability/README.md +++ b/examples/support/observability/README.md @@ -1,7 +1,7 @@ # Sending Traces and Metrics to the OpenTelemetry Collector In this example, we will show you an example configuration -for enabling the operator to send OpenTelemetry traces and metrics to the +for enabling the lifecycle-operator to send OpenTelemetry traces and metrics to the [OpenTelemetry Collector](https://github.com/open-telemetry/opentelemetry-collector). The Collector will then be used to forward the gathered data to [Jaeger](https://www.jaegertracing.io) diff --git a/helm/chart/README.md b/helm/chart/README.md index b55dca395a..46d5998c67 100644 --- a/helm/chart/README.md +++ b/helm/chart/README.md @@ -35,7 +35,7 @@ checks | `certificateOperator.tolerations` | customize tolerations for cert manager | `[]` | | `certificateOperator.topologySpreadConstraints` | add topology constraints for cert manager | `[]` | | `lifecycleManagerConfig.controllerManagerConfigYaml.health.healthProbeBindAddress` | setup on what address to start the default health handler | `:8081` | -| `lifecycleManagerConfig.controllerManagerConfigYaml.leaderElection.leaderElect` | enable leader election for multiple replicas of the operator | `true` | +| `lifecycleManagerConfig.controllerManagerConfigYaml.leaderElection.leaderElect` | enable leader election for multiple replicas of the lifecycle operator | `true` | | `lifecycleManagerConfig.controllerManagerConfigYaml.leaderElection.resourceName` | define LeaderElectionID | `6b866dd9.keptn.sh` | | `lifecycleManagerConfig.controllerManagerConfigYaml.metrics.bindAddress` | MetricsBindAddress is the TCP address that the controller should bind to for serving prometheus metrics. It can be set to "0" to disable the metrics serving. | `127.0.0.1:8080` | | `lifecycleManagerConfig.controllerManagerConfigYaml.webhook.port` | setup port for the lifecycle operator admission webhook | `9443` | diff --git a/helm/chart/doc.yaml b/helm/chart/doc.yaml index 0b5f7e67f7..92d756e5a7 100644 --- a/helm/chart/doc.yaml +++ b/helm/chart/doc.yaml @@ -50,7 +50,7 @@ ## @param certificateOperator.topologySpreadConstraints add topology constraints for cert manager ## @param lifecycleManagerConfig.controllerManagerConfigYaml.health.healthProbeBindAddress setup on what address to start the default health handler -## @param lifecycleManagerConfig.controllerManagerConfigYaml.leaderElection.leaderElect enable leader election for multiple replicas of the operator +## @param lifecycleManagerConfig.controllerManagerConfigYaml.leaderElection.leaderElect enable leader election for multiple replicas of the lifecycle operator ## @param lifecycleManagerConfig.controllerManagerConfigYaml.leaderElection.resourceName define LeaderElectionID ## @param lifecycleManagerConfig.controllerManagerConfigYaml.metrics.bindAddress MetricsBindAddress is the TCP address that the controller should bind to for serving prometheus metrics. It can be set to "0" to disable the metrics serving. ## @param lifecycleManagerConfig.controllerManagerConfigYaml.webhook.port setup port for the lifecycle operator admission webhook diff --git a/helm/overlay/kustomization.yaml b/helm/overlay/kustomization.yaml index 6869e10aac..229394fa72 100644 --- a/helm/overlay/kustomization.yaml +++ b/helm/overlay/kustomization.yaml @@ -2,7 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization # import the default deployment as the base resources: - - ../../operator/config/default + - ../../lifecycle-operator/config/default - ../../klt-cert-manager/config/default - ../../metrics-operator/config/default - ../../scheduler/manifests/install diff --git a/kuttl-test-local.yaml b/kuttl-test-local.yaml index a4301f8bed..7644d88df6 100644 --- a/kuttl-test-local.yaml +++ b/kuttl-test-local.yaml @@ -1,6 +1,6 @@ apiVersion: kuttl.dev/v1 kind: TestSuite -crdDir: ./operator/config/crd/bases +crdDir: ./lifecycle-operator/config/crd/bases testDirs: - ./test/integration/ timeout: 300 diff --git a/kuttl-test.yaml b/kuttl-test.yaml index 2149e1d4fc..f0d6cfa7c0 100644 --- a/kuttl-test.yaml +++ b/kuttl-test.yaml @@ -1,6 +1,6 @@ apiVersion: kuttl.dev/v1 kind: TestSuite -crdDir: ./operator/config/crd/bases +crdDir: ./lifecycle-operator/config/crd/bases testDirs: - ./test/integration/ timeout: 400 diff --git a/operator/.dockerignore b/lifecycle-operator/.dockerignore similarity index 100% rename from operator/.dockerignore rename to lifecycle-operator/.dockerignore diff --git a/operator/.gitignore b/lifecycle-operator/.gitignore similarity index 100% rename from operator/.gitignore rename to lifecycle-operator/.gitignore diff --git a/operator/Dockerfile b/lifecycle-operator/Dockerfile similarity index 100% rename from operator/Dockerfile rename to lifecycle-operator/Dockerfile diff --git a/operator/Makefile b/lifecycle-operator/Makefile similarity index 95% rename from operator/Makefile rename to lifecycle-operator/Makefile index 56c079c354..7ecb1a33aa 100644 --- a/operator/Makefile +++ b/lifecycle-operator/Makefile @@ -98,14 +98,14 @@ test: manifests fmt vet generate envtest ## Run tests. .PHONY: component-test component-test: manifests generate envtest ## Run tests. - KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test ./test/component/app/... -v -timeout 30m -coverprofile cover-app.out -coverpkg "github.com/keptn/lifecycle-toolkit/operator/controllers/lifecycle/keptnapp/..." - KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test ./test/component/appversion/... -v -timeout 30m -coverprofile cover-appversion.out -coverpkg "github.com/keptn/lifecycle-toolkit/operator/controllers/lifecycle/keptnappversion/..." - KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test ./test/component/evaluation/... -v -timeout 30m -coverprofile cover-evaluation.out -coverpkg "github.com/keptn/lifecycle-toolkit/operator/controllers/lifecycle/keptnevaluation/..." + KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test ./test/component/app/... -v -timeout 30m -coverprofile cover-app.out -coverpkg "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/lifecycle/keptnapp/..." + KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test ./test/component/appversion/... -v -timeout 30m -coverprofile cover-appversion.out -coverpkg "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/lifecycle/keptnappversion/..." + KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test ./test/component/evaluation/... -v -timeout 30m -coverprofile cover-evaluation.out -coverpkg "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/lifecycle/keptnevaluation/..." KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test ./test/component/load/... -v -timeout 30m - KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test ./test/component/task/... -v -timeout 30m -coverprofile cover-task.out -coverpkg "github.com/keptn/lifecycle-toolkit/operator/controllers/lifecycle/keptntask/..." - KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test ./test/component/taskdefinition/... -v -timeout 30m -coverprofile cover-taskdefinition.out -coverpkg "github.com/keptn/lifecycle-toolkit/operator/controllers/lifecycle/keptntaskdefinition/..." - KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test ./test/component/workload/... -v -timeout 30m -coverprofile cover-workload.out -coverpkg "github.com/keptn/lifecycle-toolkit/operator/controllers/lifecycle/keptnworkload/..." - KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test ./test/component/workloadinstance/... -v -timeout 30m -coverprofile cover-workloadinstance.out -coverpkg "github.com/keptn/lifecycle-toolkit/operator/controllers/lifecycle/keptnworkloadinstance/..." + KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test ./test/component/task/... -v -timeout 30m -coverprofile cover-task.out -coverpkg "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/lifecycle/keptntask/..." + KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test ./test/component/taskdefinition/... -v -timeout 30m -coverprofile cover-taskdefinition.out -coverpkg "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/lifecycle/keptntaskdefinition/..." + KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test ./test/component/workload/... -v -timeout 30m -coverprofile cover-workload.out -coverpkg "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/lifecycle/keptnworkload/..." + KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test ./test/component/workloadinstance/... -v -timeout 30m -coverprofile cover-workloadinstance.out -coverpkg "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/lifecycle/keptnworkloadinstance/..." sed -i '/mode: set/d' "cover-app.out" sed -i '/mode: set/d' "cover-appversion.out" sed -i '/mode: set/d' "cover-evaluation.out" diff --git a/operator/PROJECT b/lifecycle-operator/PROJECT similarity index 63% rename from operator/PROJECT rename to lifecycle-operator/PROJECT index 8c88afe3d8..4eff914800 100644 --- a/operator/PROJECT +++ b/lifecycle-operator/PROJECT @@ -3,7 +3,7 @@ layout: - go.kubebuilder.io/v3 multigroup: true projectName: keptn-lifecycle-toolkit -repo: github.com/keptn/lifecycle-toolkit/operator +repo: github.com/keptn/lifecycle-toolkit/lifecycle-operator resources: - api: crdVersion: v1 @@ -12,7 +12,7 @@ resources: domain: keptn.sh group: lifecycle kind: KeptnTaskDefinition - path: github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1 + path: github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -21,7 +21,7 @@ resources: domain: keptn.sh group: lifecycle kind: KeptnTask - path: github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1 + path: github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -30,7 +30,7 @@ resources: domain: keptn.sh group: lifecycle kind: KeptnApp - path: github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1 + path: github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -39,7 +39,7 @@ resources: domain: keptn.sh group: lifecycle kind: KeptnWorkload - path: github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1 + path: github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -48,7 +48,7 @@ resources: domain: keptn.sh group: lifecycle kind: KeptnWorkloadInstance - path: github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1 + path: github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -57,7 +57,7 @@ resources: domain: keptn.sh group: lifecycle kind: KeptnAppVersion - path: github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1 + path: github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -66,7 +66,7 @@ resources: domain: keptn.sh group: lifecycle kind: KeptnEvaluationDefinition - path: github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1 + path: github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -74,7 +74,7 @@ resources: domain: keptn.sh group: lifecycle kind: KeptnEvaluationProvider - path: github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1 + path: github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -83,7 +83,7 @@ resources: domain: keptn.sh group: lifecycle kind: KeptnEvaluation - path: github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1 + path: github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -92,7 +92,7 @@ resources: domain: keptn.sh group: lifecycle kind: KeptnTaskDefinition - path: github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2 + path: github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha2 version: v1alpha2 - api: crdVersion: v1 @@ -101,7 +101,7 @@ resources: domain: keptn.sh group: lifecycle kind: KeptnTask - path: github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2 + path: github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha2 version: v1alpha2 - api: crdVersion: v1 @@ -110,7 +110,7 @@ resources: domain: keptn.sh group: lifecycle kind: KeptnApp - path: github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2 + path: github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha2 version: v1alpha2 webhooks: conversion: true @@ -122,7 +122,7 @@ resources: domain: keptn.sh group: lifecycle kind: KeptnWorkload - path: github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2 + path: github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha2 version: v1alpha2 - api: crdVersion: v1 @@ -131,7 +131,7 @@ resources: domain: keptn.sh group: lifecycle kind: KeptnWorkloadInstance - path: github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2 + path: github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha2 version: v1alpha2 webhooks: conversion: true @@ -143,7 +143,7 @@ resources: domain: keptn.sh group: lifecycle kind: KeptnAppVersion - path: github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2 + path: github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha2 version: v1alpha2 webhooks: conversion: true @@ -155,7 +155,7 @@ resources: domain: keptn.sh group: lifecycle kind: KeptnEvaluationDefinition - path: github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2 + path: github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha2 version: v1alpha2 - api: crdVersion: v1 @@ -163,7 +163,7 @@ resources: domain: keptn.sh group: lifecycle kind: KeptnEvaluationProvider - path: github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2 + path: github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha2 version: v1alpha2 webhooks: conversion: true @@ -175,7 +175,7 @@ resources: domain: keptn.sh group: lifecycle kind: KeptnEvaluation - path: github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2 + path: github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha2 version: v1alpha2 - api: crdVersion: v1 @@ -184,7 +184,7 @@ resources: domain: keptn.sh group: options kind: KeptnConfig - path: github.com/keptn/lifecycle-toolkit/operator/apis/options/v1alpha1 + path: github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/options/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -192,7 +192,7 @@ resources: domain: keptn.sh group: lifecycle kind: KeptnApp - path: github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3 + path: github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3 version: v1alpha3 - api: crdVersion: v1 @@ -200,7 +200,7 @@ resources: domain: keptn.sh group: lifecycle kind: KeptnAppVersion - path: github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3 + path: github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3 version: v1alpha3 - api: crdVersion: v1 @@ -208,7 +208,7 @@ resources: domain: keptn.sh group: lifecycle kind: KeptnEvaluation - path: github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3 + path: github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3 version: v1alpha3 - api: crdVersion: v1 @@ -216,7 +216,7 @@ resources: domain: keptn.sh group: lifecycle kind: KeptnEvaluationDefinition - path: github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3 + path: github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3 version: v1alpha3 - api: crdVersion: v1 @@ -224,7 +224,7 @@ resources: domain: keptn.sh group: lifecycle kind: KeptnTask - path: github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3 + path: github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3 version: v1alpha3 - api: crdVersion: v1 @@ -232,7 +232,7 @@ resources: domain: keptn.sh group: lifecycle kind: KeptnTaskDefinition - path: github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3 + path: github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3 version: v1alpha3 webhooks: validation: true @@ -243,7 +243,7 @@ resources: domain: keptn.sh group: lifecycle kind: KeptnWorkload - path: github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3 + path: github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3 version: v1alpha3 - api: crdVersion: v1 @@ -251,7 +251,7 @@ resources: domain: keptn.sh group: lifecycle kind: KeptnWorkloadInstance - path: github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3 + path: github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3 version: v1alpha3 - api: crdVersion: v1 @@ -259,7 +259,7 @@ resources: domain: keptn.sh group: lifecycle kind: KeptnEvaluationProvider - path: github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3 + path: github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3 version: v1alpha3 - api: crdVersion: v1 @@ -268,6 +268,6 @@ resources: domain: keptn.sh group: lifecycle kind: KeptnAppCreationRequest - path: github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3 + path: github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3 version: v1alpha3 version: "3" diff --git a/operator/README.md b/lifecycle-operator/README.md similarity index 100% rename from operator/README.md rename to lifecycle-operator/README.md diff --git a/operator/apis/lifecycle/v1alpha1/common/common.go b/lifecycle-operator/apis/lifecycle/v1alpha1/common/common.go similarity index 99% rename from operator/apis/lifecycle/v1alpha1/common/common.go rename to lifecycle-operator/apis/lifecycle/v1alpha1/common/common.go index 512d454568..b714e7b71a 100644 --- a/operator/apis/lifecycle/v1alpha1/common/common.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha1/common/common.go @@ -37,8 +37,6 @@ var ErrCannotCastKeptnAppVersion = errors.New("cannot cast KeptnAppVersion to v1 var ErrCannotCastKeptnApp = errors.New("cannot cast KeptnApp to v1alpha3") var ErrCannotCastKeptnWorkloadInstance = errors.New("cannot cast KeptnWorkloadInstance to v1alpha3") -type EmptyStatus struct{} - type KeptnState string const ( diff --git a/operator/apis/lifecycle/v1alpha1/common/common_test.go b/lifecycle-operator/apis/lifecycle/v1alpha1/common/common_test.go similarity index 100% rename from operator/apis/lifecycle/v1alpha1/common/common_test.go rename to lifecycle-operator/apis/lifecycle/v1alpha1/common/common_test.go diff --git a/operator/apis/lifecycle/v1alpha1/common/phases.go b/lifecycle-operator/apis/lifecycle/v1alpha1/common/phases.go similarity index 100% rename from operator/apis/lifecycle/v1alpha1/common/phases.go rename to lifecycle-operator/apis/lifecycle/v1alpha1/common/phases.go diff --git a/operator/apis/lifecycle/v1alpha1/common/phases_test.go b/lifecycle-operator/apis/lifecycle/v1alpha1/common/phases_test.go similarity index 100% rename from operator/apis/lifecycle/v1alpha1/common/phases_test.go rename to lifecycle-operator/apis/lifecycle/v1alpha1/common/phases_test.go diff --git a/operator/apis/lifecycle/v1alpha1/groupversion_info.go b/lifecycle-operator/apis/lifecycle/v1alpha1/groupversion_info.go similarity index 100% rename from operator/apis/lifecycle/v1alpha1/groupversion_info.go rename to lifecycle-operator/apis/lifecycle/v1alpha1/groupversion_info.go diff --git a/operator/apis/lifecycle/v1alpha1/keptnapp_conversion.go b/lifecycle-operator/apis/lifecycle/v1alpha1/keptnapp_conversion.go similarity index 92% rename from operator/apis/lifecycle/v1alpha1/keptnapp_conversion.go rename to lifecycle-operator/apis/lifecycle/v1alpha1/keptnapp_conversion.go index 56867e7f48..80b545455d 100644 --- a/operator/apis/lifecycle/v1alpha1/keptnapp_conversion.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha1/keptnapp_conversion.go @@ -3,8 +3,8 @@ package v1alpha1 import ( "fmt" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1/common" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha1/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" "sigs.k8s.io/controller-runtime/pkg/conversion" ) diff --git a/operator/apis/lifecycle/v1alpha1/keptnapp_conversion_test.go b/lifecycle-operator/apis/lifecycle/v1alpha1/keptnapp_conversion_test.go similarity index 97% rename from operator/apis/lifecycle/v1alpha1/keptnapp_conversion_test.go rename to lifecycle-operator/apis/lifecycle/v1alpha1/keptnapp_conversion_test.go index a840a099c2..8ef7c9150d 100644 --- a/operator/apis/lifecycle/v1alpha1/keptnapp_conversion_test.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha1/keptnapp_conversion_test.go @@ -3,8 +3,8 @@ package v1alpha1 import ( "testing" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1/common" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha1/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" "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/apis/lifecycle/v1alpha1/keptnapp_test.go b/lifecycle-operator/apis/lifecycle/v1alpha1/keptnapp_test.go similarity index 91% rename from operator/apis/lifecycle/v1alpha1/keptnapp_test.go rename to lifecycle-operator/apis/lifecycle/v1alpha1/keptnapp_test.go index c5c7328078..9ce1fdcd23 100644 --- a/operator/apis/lifecycle/v1alpha1/keptnapp_test.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha1/keptnapp_test.go @@ -3,7 +3,7 @@ package v1alpha1 import ( "testing" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-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/apis/lifecycle/v1alpha1/keptnapp_types.go b/lifecycle-operator/apis/lifecycle/v1alpha1/keptnapp_types.go similarity index 97% rename from operator/apis/lifecycle/v1alpha1/keptnapp_types.go rename to lifecycle-operator/apis/lifecycle/v1alpha1/keptnapp_types.go index 864cc72ca8..ce60dee83e 100644 --- a/operator/apis/lifecycle/v1alpha1/keptnapp_types.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha1/keptnapp_types.go @@ -19,7 +19,7 @@ package v1alpha1 import ( "strings" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-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/operator/apis/lifecycle/v1alpha1/keptnappversion_conversion.go b/lifecycle-operator/apis/lifecycle/v1alpha1/keptnappversion_conversion.go similarity index 96% rename from operator/apis/lifecycle/v1alpha1/keptnappversion_conversion.go rename to lifecycle-operator/apis/lifecycle/v1alpha1/keptnappversion_conversion.go index 1be83f2629..54760f487f 100644 --- a/operator/apis/lifecycle/v1alpha1/keptnappversion_conversion.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha1/keptnappversion_conversion.go @@ -3,9 +3,9 @@ package v1alpha1 import ( "fmt" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1/common" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - v1alpha3common "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha1/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + v1alpha3common "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" "go.opentelemetry.io/otel/propagation" "sigs.k8s.io/controller-runtime/pkg/conversion" ) diff --git a/operator/apis/lifecycle/v1alpha1/keptnappversion_conversion_test.go b/lifecycle-operator/apis/lifecycle/v1alpha1/keptnappversion_conversion_test.go similarity index 98% rename from operator/apis/lifecycle/v1alpha1/keptnappversion_conversion_test.go rename to lifecycle-operator/apis/lifecycle/v1alpha1/keptnappversion_conversion_test.go index d90486e7fa..4ca42bbf8a 100644 --- a/operator/apis/lifecycle/v1alpha1/keptnappversion_conversion_test.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha1/keptnappversion_conversion_test.go @@ -4,9 +4,9 @@ package v1alpha1 import ( "testing" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1/common" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - v1alpha3common "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha1/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + v1alpha3common "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" "github.com/stretchr/testify/require" "go.opentelemetry.io/otel/propagation" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/operator/apis/lifecycle/v1alpha1/keptnappversion_test.go b/lifecycle-operator/apis/lifecycle/v1alpha1/keptnappversion_test.go similarity index 99% rename from operator/apis/lifecycle/v1alpha1/keptnappversion_test.go rename to lifecycle-operator/apis/lifecycle/v1alpha1/keptnappversion_test.go index ce2d762e45..95a6c0b4b4 100644 --- a/operator/apis/lifecycle/v1alpha1/keptnappversion_test.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha1/keptnappversion_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha1/common" "github.com/stretchr/testify/require" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/propagation" diff --git a/operator/apis/lifecycle/v1alpha1/keptnappversion_types.go b/lifecycle-operator/apis/lifecycle/v1alpha1/keptnappversion_types.go similarity index 99% rename from operator/apis/lifecycle/v1alpha1/keptnappversion_types.go rename to lifecycle-operator/apis/lifecycle/v1alpha1/keptnappversion_types.go index 3b4e2002d4..55b62220ab 100644 --- a/operator/apis/lifecycle/v1alpha1/keptnappversion_types.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha1/keptnappversion_types.go @@ -20,7 +20,7 @@ import ( "fmt" "time" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha1/common" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/propagation" "go.opentelemetry.io/otel/trace" diff --git a/operator/apis/lifecycle/v1alpha1/keptnevaluation_test.go b/lifecycle-operator/apis/lifecycle/v1alpha1/keptnevaluation_test.go similarity index 96% rename from operator/apis/lifecycle/v1alpha1/keptnevaluation_test.go rename to lifecycle-operator/apis/lifecycle/v1alpha1/keptnevaluation_test.go index 203bab42e8..6fa539a847 100644 --- a/operator/apis/lifecycle/v1alpha1/keptnevaluation_test.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha1/keptnevaluation_test.go @@ -3,7 +3,7 @@ package v1alpha1 import ( "testing" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-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/apis/lifecycle/v1alpha1/keptnevaluation_types.go b/lifecycle-operator/apis/lifecycle/v1alpha1/keptnevaluation_types.go similarity index 98% rename from operator/apis/lifecycle/v1alpha1/keptnevaluation_types.go rename to lifecycle-operator/apis/lifecycle/v1alpha1/keptnevaluation_types.go index 112aff08ee..6c69f82af4 100644 --- a/operator/apis/lifecycle/v1alpha1/keptnevaluation_types.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha1/keptnevaluation_types.go @@ -19,7 +19,7 @@ package v1alpha1 import ( "time" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha1/common" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/propagation" "go.opentelemetry.io/otel/trace" diff --git a/operator/apis/lifecycle/v1alpha1/keptnevaluationdefinition_types.go b/lifecycle-operator/apis/lifecycle/v1alpha1/keptnevaluationdefinition_types.go similarity index 93% rename from operator/apis/lifecycle/v1alpha1/keptnevaluationdefinition_types.go rename to lifecycle-operator/apis/lifecycle/v1alpha1/keptnevaluationdefinition_types.go index 66eb210ff5..fb8075e010 100644 --- a/operator/apis/lifecycle/v1alpha1/keptnevaluationdefinition_types.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha1/keptnevaluationdefinition_types.go @@ -17,7 +17,6 @@ limitations under the License. package v1alpha1 import ( - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1/common" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) @@ -47,7 +46,7 @@ type KeptnEvaluationDefinition struct { Spec KeptnEvaluationDefinitionSpec `json:"spec,omitempty"` // unused field - Status common.EmptyStatus `json:"status,omitempty"` + Status string `json:"status,omitempty"` } // +kubebuilder:object:root=true diff --git a/operator/apis/lifecycle/v1alpha1/keptnevaluationprovider_conversion.go b/lifecycle-operator/apis/lifecycle/v1alpha1/keptnevaluationprovider_conversion.go similarity index 89% rename from operator/apis/lifecycle/v1alpha1/keptnevaluationprovider_conversion.go rename to lifecycle-operator/apis/lifecycle/v1alpha1/keptnevaluationprovider_conversion.go index c86b0f1800..0707ef0def 100644 --- a/operator/apis/lifecycle/v1alpha1/keptnevaluationprovider_conversion.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha1/keptnevaluationprovider_conversion.go @@ -3,8 +3,8 @@ package v1alpha1 import ( "fmt" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1/common" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha1/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" corev1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/conversion" ) diff --git a/operator/apis/lifecycle/v1alpha1/keptnevaluationprovider_conversion_test.go b/lifecycle-operator/apis/lifecycle/v1alpha1/keptnevaluationprovider_conversion_test.go similarity index 96% rename from operator/apis/lifecycle/v1alpha1/keptnevaluationprovider_conversion_test.go rename to lifecycle-operator/apis/lifecycle/v1alpha1/keptnevaluationprovider_conversion_test.go index c25d268ad8..f0831624d6 100644 --- a/operator/apis/lifecycle/v1alpha1/keptnevaluationprovider_conversion_test.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha1/keptnevaluationprovider_conversion_test.go @@ -3,8 +3,8 @@ package v1alpha1 import ( "testing" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1/common" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha1/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/operator/apis/lifecycle/v1alpha1/keptnevaluationprovider_types.go b/lifecycle-operator/apis/lifecycle/v1alpha1/keptnevaluationprovider_types.go similarity index 93% rename from operator/apis/lifecycle/v1alpha1/keptnevaluationprovider_types.go rename to lifecycle-operator/apis/lifecycle/v1alpha1/keptnevaluationprovider_types.go index 50beb32a57..12bb4b6c35 100644 --- a/operator/apis/lifecycle/v1alpha1/keptnevaluationprovider_types.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha1/keptnevaluationprovider_types.go @@ -17,7 +17,6 @@ limitations under the License. package v1alpha1 import ( - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1/common" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) @@ -41,7 +40,7 @@ type KeptnEvaluationProvider struct { Spec KeptnEvaluationProviderSpec `json:"spec,omitempty"` // unused field - Status common.EmptyStatus `json:"status,omitempty"` + Status string `json:"status,omitempty"` } // +kubebuilder:object:root=true diff --git a/operator/apis/lifecycle/v1alpha1/keptntask_test.go b/lifecycle-operator/apis/lifecycle/v1alpha1/keptntask_test.go similarity index 97% rename from operator/apis/lifecycle/v1alpha1/keptntask_test.go rename to lifecycle-operator/apis/lifecycle/v1alpha1/keptntask_test.go index c8136ef1c1..9cdae0f619 100644 --- a/operator/apis/lifecycle/v1alpha1/keptntask_test.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha1/keptntask_test.go @@ -3,7 +3,7 @@ package v1alpha1 import ( "testing" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-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/apis/lifecycle/v1alpha1/keptntask_types.go b/lifecycle-operator/apis/lifecycle/v1alpha1/keptntask_types.go similarity index 98% rename from operator/apis/lifecycle/v1alpha1/keptntask_types.go rename to lifecycle-operator/apis/lifecycle/v1alpha1/keptntask_types.go index 06b6f2467b..3921ceb97c 100644 --- a/operator/apis/lifecycle/v1alpha1/keptntask_types.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha1/keptntask_types.go @@ -19,7 +19,7 @@ package v1alpha1 import ( "time" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha1/common" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/propagation" "go.opentelemetry.io/otel/trace" diff --git a/operator/apis/lifecycle/v1alpha1/keptntaskdefinition_types.go b/lifecycle-operator/apis/lifecycle/v1alpha1/keptntaskdefinition_types.go similarity index 100% rename from operator/apis/lifecycle/v1alpha1/keptntaskdefinition_types.go rename to lifecycle-operator/apis/lifecycle/v1alpha1/keptntaskdefinition_types.go diff --git a/operator/apis/lifecycle/v1alpha1/keptnworkload_test.go b/lifecycle-operator/apis/lifecycle/v1alpha1/keptnworkload_test.go similarity index 93% rename from operator/apis/lifecycle/v1alpha1/keptnworkload_test.go rename to lifecycle-operator/apis/lifecycle/v1alpha1/keptnworkload_test.go index 11454e0889..aeb8cd0025 100644 --- a/operator/apis/lifecycle/v1alpha1/keptnworkload_test.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha1/keptnworkload_test.go @@ -3,7 +3,7 @@ package v1alpha1 import ( "testing" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-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/apis/lifecycle/v1alpha1/keptnworkload_types.go b/lifecycle-operator/apis/lifecycle/v1alpha1/keptnworkload_types.go similarity index 97% rename from operator/apis/lifecycle/v1alpha1/keptnworkload_types.go rename to lifecycle-operator/apis/lifecycle/v1alpha1/keptnworkload_types.go index e7ba9afc47..c4d3a6b21b 100644 --- a/operator/apis/lifecycle/v1alpha1/keptnworkload_types.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha1/keptnworkload_types.go @@ -19,7 +19,7 @@ package v1alpha1 import ( "strings" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-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/operator/apis/lifecycle/v1alpha1/keptnworkloadinstance_conversion.go b/lifecycle-operator/apis/lifecycle/v1alpha1/keptnworkloadinstance_conversion.go similarity index 96% rename from operator/apis/lifecycle/v1alpha1/keptnworkloadinstance_conversion.go rename to lifecycle-operator/apis/lifecycle/v1alpha1/keptnworkloadinstance_conversion.go index 1d696575ba..83e0b11c6d 100644 --- a/operator/apis/lifecycle/v1alpha1/keptnworkloadinstance_conversion.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha1/keptnworkloadinstance_conversion.go @@ -3,9 +3,9 @@ package v1alpha1 import ( "fmt" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1/common" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - v1alpha3common "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha1/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + v1alpha3common "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" "go.opentelemetry.io/otel/propagation" "sigs.k8s.io/controller-runtime/pkg/conversion" ) diff --git a/operator/apis/lifecycle/v1alpha1/keptnworkloadinstance_conversion_test.go b/lifecycle-operator/apis/lifecycle/v1alpha1/keptnworkloadinstance_conversion_test.go similarity index 98% rename from operator/apis/lifecycle/v1alpha1/keptnworkloadinstance_conversion_test.go rename to lifecycle-operator/apis/lifecycle/v1alpha1/keptnworkloadinstance_conversion_test.go index 59e0031489..02dddf6723 100644 --- a/operator/apis/lifecycle/v1alpha1/keptnworkloadinstance_conversion_test.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha1/keptnworkloadinstance_conversion_test.go @@ -4,9 +4,9 @@ package v1alpha1 import ( "testing" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1/common" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - v1alpha3common "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha1/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + v1alpha3common "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" "github.com/stretchr/testify/require" "go.opentelemetry.io/otel/propagation" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/operator/apis/lifecycle/v1alpha1/keptnworkloadinstance_test.go b/lifecycle-operator/apis/lifecycle/v1alpha1/keptnworkloadinstance_test.go similarity index 99% rename from operator/apis/lifecycle/v1alpha1/keptnworkloadinstance_test.go rename to lifecycle-operator/apis/lifecycle/v1alpha1/keptnworkloadinstance_test.go index 9dbc8d1736..3eadaabb92 100644 --- a/operator/apis/lifecycle/v1alpha1/keptnworkloadinstance_test.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha1/keptnworkloadinstance_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha1/common" "github.com/stretchr/testify/require" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/propagation" diff --git a/operator/apis/lifecycle/v1alpha1/keptnworkloadinstance_types.go b/lifecycle-operator/apis/lifecycle/v1alpha1/keptnworkloadinstance_types.go similarity index 99% rename from operator/apis/lifecycle/v1alpha1/keptnworkloadinstance_types.go rename to lifecycle-operator/apis/lifecycle/v1alpha1/keptnworkloadinstance_types.go index 2eb75bff77..86e99ae67f 100644 --- a/operator/apis/lifecycle/v1alpha1/keptnworkloadinstance_types.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha1/keptnworkloadinstance_types.go @@ -20,7 +20,7 @@ import ( "fmt" "time" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha1/common" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/propagation" "go.opentelemetry.io/otel/trace" diff --git a/operator/apis/lifecycle/v1alpha1/semconv/semconv.go b/lifecycle-operator/apis/lifecycle/v1alpha1/semconv/semconv.go similarity index 81% rename from operator/apis/lifecycle/v1alpha1/semconv/semconv.go rename to lifecycle-operator/apis/lifecycle/v1alpha1/semconv/semconv.go index 95475b9344..90f68f6122 100644 --- a/operator/apis/lifecycle/v1alpha1/semconv/semconv.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha1/semconv/semconv.go @@ -1,7 +1,7 @@ package semconv import ( - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha1/common" "go.opentelemetry.io/otel/trace" ) diff --git a/operator/apis/lifecycle/v1alpha1/zz_generated.deepcopy.go b/lifecycle-operator/apis/lifecycle/v1alpha1/zz_generated.deepcopy.go similarity index 99% rename from operator/apis/lifecycle/v1alpha1/zz_generated.deepcopy.go rename to lifecycle-operator/apis/lifecycle/v1alpha1/zz_generated.deepcopy.go index 96d009d609..35d1501f72 100644 --- a/operator/apis/lifecycle/v1alpha1/zz_generated.deepcopy.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha1/zz_generated.deepcopy.go @@ -22,7 +22,7 @@ limitations under the License. package v1alpha1 import ( - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha1/common" "go.opentelemetry.io/otel/propagation" runtime "k8s.io/apimachinery/pkg/runtime" ) @@ -466,7 +466,6 @@ func (in *KeptnEvaluationDefinition) DeepCopyInto(out *KeptnEvaluationDefinition out.TypeMeta = in.TypeMeta in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) in.Spec.DeepCopyInto(&out.Spec) - out.Status = in.Status } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KeptnEvaluationDefinition. @@ -577,7 +576,6 @@ func (in *KeptnEvaluationProvider) DeepCopyInto(out *KeptnEvaluationProvider) { out.TypeMeta = in.TypeMeta in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) out.Spec = in.Spec - out.Status = in.Status } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KeptnEvaluationProvider. diff --git a/operator/apis/lifecycle/v1alpha2/common/common.go b/lifecycle-operator/apis/lifecycle/v1alpha2/common/common.go similarity index 99% rename from operator/apis/lifecycle/v1alpha2/common/common.go rename to lifecycle-operator/apis/lifecycle/v1alpha2/common/common.go index 18e0d5d39e..4f758bbb6a 100644 --- a/operator/apis/lifecycle/v1alpha2/common/common.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha2/common/common.go @@ -36,8 +36,6 @@ var ErrCannotCastKeptnApp = errors.New("cannot cast KeptnApp to v1alpha3") var ErrCannotCastKeptnWorkloadInstance = errors.New("cannot cast KeptnWorkloadInstance to v1alpha3") var ErrCannotCastKeptnEvaluationProvider = errors.New("cannot cast KeptnEvaluationDefinition to v1alpha3") -type EmptyStatus struct{} - type KeptnState string const ( diff --git a/operator/apis/lifecycle/v1alpha2/common/common_test.go b/lifecycle-operator/apis/lifecycle/v1alpha2/common/common_test.go similarity index 100% rename from operator/apis/lifecycle/v1alpha2/common/common_test.go rename to lifecycle-operator/apis/lifecycle/v1alpha2/common/common_test.go diff --git a/operator/apis/lifecycle/v1alpha2/common/phases.go b/lifecycle-operator/apis/lifecycle/v1alpha2/common/phases.go similarity index 100% rename from operator/apis/lifecycle/v1alpha2/common/phases.go rename to lifecycle-operator/apis/lifecycle/v1alpha2/common/phases.go diff --git a/operator/apis/lifecycle/v1alpha2/common/phases_test.go b/lifecycle-operator/apis/lifecycle/v1alpha2/common/phases_test.go similarity index 100% rename from operator/apis/lifecycle/v1alpha2/common/phases_test.go rename to lifecycle-operator/apis/lifecycle/v1alpha2/common/phases_test.go diff --git a/operator/apis/lifecycle/v1alpha2/groupversion_info.go b/lifecycle-operator/apis/lifecycle/v1alpha2/groupversion_info.go similarity index 100% rename from operator/apis/lifecycle/v1alpha2/groupversion_info.go rename to lifecycle-operator/apis/lifecycle/v1alpha2/groupversion_info.go diff --git a/operator/apis/lifecycle/v1alpha2/keptnapp_conversion.go b/lifecycle-operator/apis/lifecycle/v1alpha2/keptnapp_conversion.go similarity index 92% rename from operator/apis/lifecycle/v1alpha2/keptnapp_conversion.go rename to lifecycle-operator/apis/lifecycle/v1alpha2/keptnapp_conversion.go index 05cfb64e8a..412ea14071 100644 --- a/operator/apis/lifecycle/v1alpha2/keptnapp_conversion.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha2/keptnapp_conversion.go @@ -3,8 +3,8 @@ package v1alpha2 import ( "fmt" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2/common" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha2/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" "sigs.k8s.io/controller-runtime/pkg/conversion" ) diff --git a/operator/apis/lifecycle/v1alpha2/keptnapp_conversion_test.go b/lifecycle-operator/apis/lifecycle/v1alpha2/keptnapp_conversion_test.go similarity index 97% rename from operator/apis/lifecycle/v1alpha2/keptnapp_conversion_test.go rename to lifecycle-operator/apis/lifecycle/v1alpha2/keptnapp_conversion_test.go index 12ef6a1d7a..b9dc50cdeb 100644 --- a/operator/apis/lifecycle/v1alpha2/keptnapp_conversion_test.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha2/keptnapp_conversion_test.go @@ -3,8 +3,8 @@ package v1alpha2 import ( "testing" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2/common" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha2/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" "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/apis/lifecycle/v1alpha2/keptnapp_test.go b/lifecycle-operator/apis/lifecycle/v1alpha2/keptnapp_test.go similarity index 92% rename from operator/apis/lifecycle/v1alpha2/keptnapp_test.go rename to lifecycle-operator/apis/lifecycle/v1alpha2/keptnapp_test.go index 1f9453a6d3..5c12c649c2 100644 --- a/operator/apis/lifecycle/v1alpha2/keptnapp_test.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha2/keptnapp_test.go @@ -3,7 +3,7 @@ package v1alpha2 import ( "testing" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-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/apis/lifecycle/v1alpha2/keptnapp_types.go b/lifecycle-operator/apis/lifecycle/v1alpha2/keptnapp_types.go similarity index 97% rename from operator/apis/lifecycle/v1alpha2/keptnapp_types.go rename to lifecycle-operator/apis/lifecycle/v1alpha2/keptnapp_types.go index ccbe19a97e..40e2f97b11 100644 --- a/operator/apis/lifecycle/v1alpha2/keptnapp_types.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha2/keptnapp_types.go @@ -21,7 +21,7 @@ import ( "strconv" "strings" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-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/apis/lifecycle/v1alpha2/keptnappversion_conversion.go b/lifecycle-operator/apis/lifecycle/v1alpha2/keptnappversion_conversion.go similarity index 96% rename from operator/apis/lifecycle/v1alpha2/keptnappversion_conversion.go rename to lifecycle-operator/apis/lifecycle/v1alpha2/keptnappversion_conversion.go index adb96c3be2..847108a0c4 100644 --- a/operator/apis/lifecycle/v1alpha2/keptnappversion_conversion.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha2/keptnappversion_conversion.go @@ -3,9 +3,9 @@ package v1alpha2 import ( "fmt" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2/common" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - v1alpha3common "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha2/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + v1alpha3common "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" "go.opentelemetry.io/otel/propagation" "sigs.k8s.io/controller-runtime/pkg/conversion" ) diff --git a/operator/apis/lifecycle/v1alpha2/keptnappversion_conversion_test.go b/lifecycle-operator/apis/lifecycle/v1alpha2/keptnappversion_conversion_test.go similarity index 98% rename from operator/apis/lifecycle/v1alpha2/keptnappversion_conversion_test.go rename to lifecycle-operator/apis/lifecycle/v1alpha2/keptnappversion_conversion_test.go index 2f967511da..dfcbe40e76 100644 --- a/operator/apis/lifecycle/v1alpha2/keptnappversion_conversion_test.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha2/keptnappversion_conversion_test.go @@ -4,9 +4,9 @@ package v1alpha2 import ( "testing" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2/common" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - v1alpha3common "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha2/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + v1alpha3common "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" "github.com/stretchr/testify/require" "go.opentelemetry.io/otel/propagation" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/operator/apis/lifecycle/v1alpha2/keptnappversion_test.go b/lifecycle-operator/apis/lifecycle/v1alpha2/keptnappversion_test.go similarity index 99% rename from operator/apis/lifecycle/v1alpha2/keptnappversion_test.go rename to lifecycle-operator/apis/lifecycle/v1alpha2/keptnappversion_test.go index 084504c2f0..2595aa52b5 100644 --- a/operator/apis/lifecycle/v1alpha2/keptnappversion_test.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha2/keptnappversion_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha2/common" "github.com/stretchr/testify/require" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/propagation" diff --git a/operator/apis/lifecycle/v1alpha2/keptnappversion_types.go b/lifecycle-operator/apis/lifecycle/v1alpha2/keptnappversion_types.go similarity index 99% rename from operator/apis/lifecycle/v1alpha2/keptnappversion_types.go rename to lifecycle-operator/apis/lifecycle/v1alpha2/keptnappversion_types.go index eda1d8259a..e6af0d146f 100644 --- a/operator/apis/lifecycle/v1alpha2/keptnappversion_types.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha2/keptnappversion_types.go @@ -20,7 +20,7 @@ import ( "fmt" "time" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha2/common" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/propagation" "go.opentelemetry.io/otel/trace" diff --git a/operator/apis/lifecycle/v1alpha2/keptnevaluation_test.go b/lifecycle-operator/apis/lifecycle/v1alpha2/keptnevaluation_test.go similarity index 97% rename from operator/apis/lifecycle/v1alpha2/keptnevaluation_test.go rename to lifecycle-operator/apis/lifecycle/v1alpha2/keptnevaluation_test.go index a980c63e73..f43628ace6 100644 --- a/operator/apis/lifecycle/v1alpha2/keptnevaluation_test.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha2/keptnevaluation_test.go @@ -3,7 +3,7 @@ package v1alpha2 import ( "testing" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-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/apis/lifecycle/v1alpha2/keptnevaluation_types.go b/lifecycle-operator/apis/lifecycle/v1alpha2/keptnevaluation_types.go similarity index 98% rename from operator/apis/lifecycle/v1alpha2/keptnevaluation_types.go rename to lifecycle-operator/apis/lifecycle/v1alpha2/keptnevaluation_types.go index aebe235a5f..88d2de0bb7 100644 --- a/operator/apis/lifecycle/v1alpha2/keptnevaluation_types.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha2/keptnevaluation_types.go @@ -19,7 +19,7 @@ package v1alpha2 import ( "time" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha2/common" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/propagation" "go.opentelemetry.io/otel/trace" diff --git a/operator/apis/lifecycle/v1alpha2/keptnevaluationdefinition_types.go b/lifecycle-operator/apis/lifecycle/v1alpha2/keptnevaluationdefinition_types.go similarity index 93% rename from operator/apis/lifecycle/v1alpha2/keptnevaluationdefinition_types.go rename to lifecycle-operator/apis/lifecycle/v1alpha2/keptnevaluationdefinition_types.go index 3b5e57a888..b5d835f02b 100644 --- a/operator/apis/lifecycle/v1alpha2/keptnevaluationdefinition_types.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha2/keptnevaluationdefinition_types.go @@ -17,7 +17,6 @@ limitations under the License. package v1alpha2 import ( - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2/common" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) @@ -47,7 +46,7 @@ type KeptnEvaluationDefinition struct { Spec KeptnEvaluationDefinitionSpec `json:"spec,omitempty"` // unused field - Status common.EmptyStatus `json:"status,omitempty"` + Status string `json:"status,omitempty"` } // +kubebuilder:object:root=true diff --git a/operator/apis/lifecycle/v1alpha2/keptnevaluationprovider_conversion.go b/lifecycle-operator/apis/lifecycle/v1alpha2/keptnevaluationprovider_conversion.go similarity index 90% rename from operator/apis/lifecycle/v1alpha2/keptnevaluationprovider_conversion.go rename to lifecycle-operator/apis/lifecycle/v1alpha2/keptnevaluationprovider_conversion.go index 6c31a5428b..5d62b63c25 100644 --- a/operator/apis/lifecycle/v1alpha2/keptnevaluationprovider_conversion.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha2/keptnevaluationprovider_conversion.go @@ -3,8 +3,8 @@ package v1alpha2 import ( "fmt" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2/common" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha2/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" corev1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/conversion" ) diff --git a/operator/apis/lifecycle/v1alpha2/keptnevaluationprovider_conversion_test.go b/lifecycle-operator/apis/lifecycle/v1alpha2/keptnevaluationprovider_conversion_test.go similarity index 96% rename from operator/apis/lifecycle/v1alpha2/keptnevaluationprovider_conversion_test.go rename to lifecycle-operator/apis/lifecycle/v1alpha2/keptnevaluationprovider_conversion_test.go index ed80f00483..6a2f3ecdea 100644 --- a/operator/apis/lifecycle/v1alpha2/keptnevaluationprovider_conversion_test.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha2/keptnevaluationprovider_conversion_test.go @@ -3,8 +3,8 @@ package v1alpha2 import ( "testing" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2/common" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha2/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/operator/apis/lifecycle/v1alpha2/keptnevaluationprovider_test.go b/lifecycle-operator/apis/lifecycle/v1alpha2/keptnevaluationprovider_test.go similarity index 100% rename from operator/apis/lifecycle/v1alpha2/keptnevaluationprovider_test.go rename to lifecycle-operator/apis/lifecycle/v1alpha2/keptnevaluationprovider_test.go diff --git a/operator/apis/lifecycle/v1alpha2/keptnevaluationprovider_types.go b/lifecycle-operator/apis/lifecycle/v1alpha2/keptnevaluationprovider_types.go similarity index 94% rename from operator/apis/lifecycle/v1alpha2/keptnevaluationprovider_types.go rename to lifecycle-operator/apis/lifecycle/v1alpha2/keptnevaluationprovider_types.go index c3b601946d..1ecf947042 100644 --- a/operator/apis/lifecycle/v1alpha2/keptnevaluationprovider_types.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha2/keptnevaluationprovider_types.go @@ -19,7 +19,6 @@ package v1alpha2 import ( "strings" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2/common" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) @@ -44,7 +43,7 @@ type KeptnEvaluationProvider struct { Spec KeptnEvaluationProviderSpec `json:"spec,omitempty"` // unused field - Status common.EmptyStatus `json:"status,omitempty"` + Status string `json:"status,omitempty"` } // +kubebuilder:object:root=true diff --git a/operator/apis/lifecycle/v1alpha2/keptntask_test.go b/lifecycle-operator/apis/lifecycle/v1alpha2/keptntask_test.go similarity index 97% rename from operator/apis/lifecycle/v1alpha2/keptntask_test.go rename to lifecycle-operator/apis/lifecycle/v1alpha2/keptntask_test.go index f3c1e5bae5..de4eb26b94 100644 --- a/operator/apis/lifecycle/v1alpha2/keptntask_test.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha2/keptntask_test.go @@ -3,7 +3,7 @@ package v1alpha2 import ( "testing" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-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/apis/lifecycle/v1alpha2/keptntask_types.go b/lifecycle-operator/apis/lifecycle/v1alpha2/keptntask_types.go similarity index 98% rename from operator/apis/lifecycle/v1alpha2/keptntask_types.go rename to lifecycle-operator/apis/lifecycle/v1alpha2/keptntask_types.go index 5c14d4a0ad..9160d6d0f6 100644 --- a/operator/apis/lifecycle/v1alpha2/keptntask_types.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha2/keptntask_types.go @@ -19,7 +19,7 @@ package v1alpha2 import ( "time" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha2/common" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/propagation" "go.opentelemetry.io/otel/trace" diff --git a/operator/apis/lifecycle/v1alpha2/keptntaskdefinition_types.go b/lifecycle-operator/apis/lifecycle/v1alpha2/keptntaskdefinition_types.go similarity index 100% rename from operator/apis/lifecycle/v1alpha2/keptntaskdefinition_types.go rename to lifecycle-operator/apis/lifecycle/v1alpha2/keptntaskdefinition_types.go diff --git a/operator/apis/lifecycle/v1alpha2/keptnworkload_test.go b/lifecycle-operator/apis/lifecycle/v1alpha2/keptnworkload_test.go similarity index 93% rename from operator/apis/lifecycle/v1alpha2/keptnworkload_test.go rename to lifecycle-operator/apis/lifecycle/v1alpha2/keptnworkload_test.go index 7af31a4fb3..b57d5b079d 100644 --- a/operator/apis/lifecycle/v1alpha2/keptnworkload_test.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha2/keptnworkload_test.go @@ -3,7 +3,7 @@ package v1alpha2 import ( "testing" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-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/apis/lifecycle/v1alpha2/keptnworkload_types.go b/lifecycle-operator/apis/lifecycle/v1alpha2/keptnworkload_types.go similarity index 97% rename from operator/apis/lifecycle/v1alpha2/keptnworkload_types.go rename to lifecycle-operator/apis/lifecycle/v1alpha2/keptnworkload_types.go index 0961f062d0..798856d0ac 100644 --- a/operator/apis/lifecycle/v1alpha2/keptnworkload_types.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha2/keptnworkload_types.go @@ -19,7 +19,7 @@ package v1alpha2 import ( "strings" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-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/apis/lifecycle/v1alpha2/keptnworkloadinstance_conversion.go b/lifecycle-operator/apis/lifecycle/v1alpha2/keptnworkloadinstance_conversion.go similarity index 96% rename from operator/apis/lifecycle/v1alpha2/keptnworkloadinstance_conversion.go rename to lifecycle-operator/apis/lifecycle/v1alpha2/keptnworkloadinstance_conversion.go index 20f39c3955..f6812c0995 100644 --- a/operator/apis/lifecycle/v1alpha2/keptnworkloadinstance_conversion.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha2/keptnworkloadinstance_conversion.go @@ -3,9 +3,9 @@ package v1alpha2 import ( "fmt" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2/common" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - v1alpha3common "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha2/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + v1alpha3common "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" "go.opentelemetry.io/otel/propagation" "sigs.k8s.io/controller-runtime/pkg/conversion" ) diff --git a/operator/apis/lifecycle/v1alpha2/keptnworkloadinstance_conversion_test.go b/lifecycle-operator/apis/lifecycle/v1alpha2/keptnworkloadinstance_conversion_test.go similarity index 98% rename from operator/apis/lifecycle/v1alpha2/keptnworkloadinstance_conversion_test.go rename to lifecycle-operator/apis/lifecycle/v1alpha2/keptnworkloadinstance_conversion_test.go index 64aa7a1fe2..10d46f2e24 100644 --- a/operator/apis/lifecycle/v1alpha2/keptnworkloadinstance_conversion_test.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha2/keptnworkloadinstance_conversion_test.go @@ -4,9 +4,9 @@ package v1alpha2 import ( "testing" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2/common" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - v1alpha3common "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha2/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + v1alpha3common "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" "github.com/stretchr/testify/require" "go.opentelemetry.io/otel/propagation" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/operator/apis/lifecycle/v1alpha2/keptnworkloadinstance_test.go b/lifecycle-operator/apis/lifecycle/v1alpha2/keptnworkloadinstance_test.go similarity index 99% rename from operator/apis/lifecycle/v1alpha2/keptnworkloadinstance_test.go rename to lifecycle-operator/apis/lifecycle/v1alpha2/keptnworkloadinstance_test.go index 55d889407f..6f433e9b55 100644 --- a/operator/apis/lifecycle/v1alpha2/keptnworkloadinstance_test.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha2/keptnworkloadinstance_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha2/common" "github.com/stretchr/testify/require" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/propagation" diff --git a/operator/apis/lifecycle/v1alpha2/keptnworkloadinstance_types.go b/lifecycle-operator/apis/lifecycle/v1alpha2/keptnworkloadinstance_types.go similarity index 99% rename from operator/apis/lifecycle/v1alpha2/keptnworkloadinstance_types.go rename to lifecycle-operator/apis/lifecycle/v1alpha2/keptnworkloadinstance_types.go index 1a7d8927f2..6757f88052 100644 --- a/operator/apis/lifecycle/v1alpha2/keptnworkloadinstance_types.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha2/keptnworkloadinstance_types.go @@ -20,7 +20,7 @@ import ( "fmt" "time" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha2/common" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/propagation" "go.opentelemetry.io/otel/trace" diff --git a/operator/apis/lifecycle/v1alpha2/semconv/semconv.go b/lifecycle-operator/apis/lifecycle/v1alpha2/semconv/semconv.go similarity index 81% rename from operator/apis/lifecycle/v1alpha2/semconv/semconv.go rename to lifecycle-operator/apis/lifecycle/v1alpha2/semconv/semconv.go index b91f6ad495..474607e02e 100644 --- a/operator/apis/lifecycle/v1alpha2/semconv/semconv.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha2/semconv/semconv.go @@ -1,7 +1,7 @@ package semconv import ( - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha2/common" "go.opentelemetry.io/otel/trace" ) diff --git a/operator/apis/lifecycle/v1alpha2/zz_generated.deepcopy.go b/lifecycle-operator/apis/lifecycle/v1alpha2/zz_generated.deepcopy.go similarity index 99% rename from operator/apis/lifecycle/v1alpha2/zz_generated.deepcopy.go rename to lifecycle-operator/apis/lifecycle/v1alpha2/zz_generated.deepcopy.go index eb48ec8bb5..3cb212387f 100644 --- a/operator/apis/lifecycle/v1alpha2/zz_generated.deepcopy.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha2/zz_generated.deepcopy.go @@ -22,7 +22,7 @@ limitations under the License. package v1alpha2 import ( - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha2/common" "go.opentelemetry.io/otel/propagation" runtime "k8s.io/apimachinery/pkg/runtime" ) @@ -466,7 +466,6 @@ func (in *KeptnEvaluationDefinition) DeepCopyInto(out *KeptnEvaluationDefinition out.TypeMeta = in.TypeMeta in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) in.Spec.DeepCopyInto(&out.Spec) - out.Status = in.Status } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KeptnEvaluationDefinition. @@ -577,7 +576,6 @@ func (in *KeptnEvaluationProvider) DeepCopyInto(out *KeptnEvaluationProvider) { out.TypeMeta = in.TypeMeta in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) in.Spec.DeepCopyInto(&out.Spec) - out.Status = in.Status } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KeptnEvaluationProvider. diff --git a/operator/apis/lifecycle/v1alpha3/common/common.go b/lifecycle-operator/apis/lifecycle/v1alpha3/common/common.go similarity index 98% rename from operator/apis/lifecycle/v1alpha3/common/common.go rename to lifecycle-operator/apis/lifecycle/v1alpha3/common/common.go index ee6152931a..52cf3d88cf 100644 --- a/operator/apis/lifecycle/v1alpha3/common/common.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha3/common/common.go @@ -6,7 +6,7 @@ import ( "math/rand" "strconv" - operatorcommon "github.com/keptn/lifecycle-toolkit/operator/common" + operatorcommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/common" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/metric" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -34,8 +34,6 @@ const AppTypeAnnotation = "keptn.sh/app-type" const MinKLTNameLen = 80 const MaxK8sObjectLength = 253 -type EmptyStatus struct{} - type AppType string const ( diff --git a/operator/apis/lifecycle/v1alpha3/common/common_test.go b/lifecycle-operator/apis/lifecycle/v1alpha3/common/common_test.go similarity index 100% rename from operator/apis/lifecycle/v1alpha3/common/common_test.go rename to lifecycle-operator/apis/lifecycle/v1alpha3/common/common_test.go diff --git a/operator/apis/lifecycle/v1alpha3/common/phases.go b/lifecycle-operator/apis/lifecycle/v1alpha3/common/phases.go similarity index 100% rename from operator/apis/lifecycle/v1alpha3/common/phases.go rename to lifecycle-operator/apis/lifecycle/v1alpha3/common/phases.go diff --git a/operator/apis/lifecycle/v1alpha3/common/phases_test.go b/lifecycle-operator/apis/lifecycle/v1alpha3/common/phases_test.go similarity index 100% rename from operator/apis/lifecycle/v1alpha3/common/phases_test.go rename to lifecycle-operator/apis/lifecycle/v1alpha3/common/phases_test.go diff --git a/operator/apis/lifecycle/v1alpha3/groupversion_info.go b/lifecycle-operator/apis/lifecycle/v1alpha3/groupversion_info.go similarity index 100% rename from operator/apis/lifecycle/v1alpha3/groupversion_info.go rename to lifecycle-operator/apis/lifecycle/v1alpha3/groupversion_info.go diff --git a/operator/apis/lifecycle/v1alpha3/keptnapp_conversion.go b/lifecycle-operator/apis/lifecycle/v1alpha3/keptnapp_conversion.go similarity index 100% rename from operator/apis/lifecycle/v1alpha3/keptnapp_conversion.go rename to lifecycle-operator/apis/lifecycle/v1alpha3/keptnapp_conversion.go diff --git a/operator/apis/lifecycle/v1alpha3/keptnapp_test.go b/lifecycle-operator/apis/lifecycle/v1alpha3/keptnapp_test.go similarity index 93% rename from operator/apis/lifecycle/v1alpha3/keptnapp_test.go rename to lifecycle-operator/apis/lifecycle/v1alpha3/keptnapp_test.go index cc7402f0bf..0868ec3dad 100644 --- a/operator/apis/lifecycle/v1alpha3/keptnapp_test.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha3/keptnapp_test.go @@ -3,7 +3,7 @@ package v1alpha3 import ( "testing" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" "github.com/stretchr/testify/require" "go.opentelemetry.io/otel/attribute" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/operator/apis/lifecycle/v1alpha3/keptnapp_types.go b/lifecycle-operator/apis/lifecycle/v1alpha3/keptnapp_types.go similarity index 94% rename from operator/apis/lifecycle/v1alpha3/keptnapp_types.go rename to lifecycle-operator/apis/lifecycle/v1alpha3/keptnapp_types.go index ede59936bc..7904465006 100644 --- a/operator/apis/lifecycle/v1alpha3/keptnapp_types.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha3/keptnapp_types.go @@ -17,8 +17,8 @@ limitations under the License. package v1alpha3 import ( - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" - operatorcommon "github.com/keptn/lifecycle-toolkit/operator/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" + operatorcommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/common" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -73,9 +73,9 @@ type KeptnWorkloadRef struct { Version string `json:"version"` } -//+kubebuilder:object:root=true -//+kubebuilder:storageversion -//+kubebuilder:subresource:status +// +kubebuilder:object:root=true +// +kubebuilder:storageversion +// +kubebuilder:subresource:status // KeptnApp is the Schema for the keptnapps API type KeptnApp struct { @@ -88,7 +88,7 @@ type KeptnApp struct { Status KeptnAppStatus `json:"status,omitempty"` } -//+kubebuilder:object:root=true +// +kubebuilder:object:root=true // KeptnAppList contains a list of KeptnApp type KeptnAppList struct { diff --git a/operator/apis/lifecycle/v1alpha3/keptnapp_webhook.go b/lifecycle-operator/apis/lifecycle/v1alpha3/keptnapp_webhook.go similarity index 100% rename from operator/apis/lifecycle/v1alpha3/keptnapp_webhook.go rename to lifecycle-operator/apis/lifecycle/v1alpha3/keptnapp_webhook.go diff --git a/operator/apis/lifecycle/v1alpha3/keptnappcreationrequest_types.go b/lifecycle-operator/apis/lifecycle/v1alpha3/keptnappcreationrequest_types.go similarity index 91% rename from operator/apis/lifecycle/v1alpha3/keptnappcreationrequest_types.go rename to lifecycle-operator/apis/lifecycle/v1alpha3/keptnappcreationrequest_types.go index 5aa780bfdd..78253a9b25 100644 --- a/operator/apis/lifecycle/v1alpha3/keptnappcreationrequest_types.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha3/keptnappcreationrequest_types.go @@ -17,7 +17,7 @@ limitations under the License. package v1alpha3 import ( - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -32,8 +32,8 @@ type KeptnAppCreationRequestSpec struct { AppName string `json:"appName"` } -//+kubebuilder:object:root=true -//+kubebuilder:subresource:status +// +kubebuilder:object:root=true +// +kubebuilder:subresource:status // KeptnAppCreationRequest is the Schema for the keptnappcreationrequests API type KeptnAppCreationRequest struct { @@ -43,10 +43,10 @@ type KeptnAppCreationRequest struct { // Spec describes the desired state of the KeptnAppCreationRequest. Spec KeptnAppCreationRequestSpec `json:"spec,omitempty"` // Status describes the current state of the KeptnAppCreationRequest. - Status common.EmptyStatus `json:"status,omitempty"` + Status string `json:"status,omitempty"` } -//+kubebuilder:object:root=true +// +kubebuilder:object:root=true // KeptnAppCreationRequestList contains a list of KeptnAppCreationRequest type KeptnAppCreationRequestList struct { diff --git a/operator/apis/lifecycle/v1alpha3/keptnappcreationrequest_types_test.go b/lifecycle-operator/apis/lifecycle/v1alpha3/keptnappcreationrequest_types_test.go similarity index 94% rename from operator/apis/lifecycle/v1alpha3/keptnappcreationrequest_types_test.go rename to lifecycle-operator/apis/lifecycle/v1alpha3/keptnappcreationrequest_types_test.go index 1dd90610a6..b4243c762e 100644 --- a/operator/apis/lifecycle/v1alpha3/keptnappcreationrequest_types_test.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha3/keptnappcreationrequest_types_test.go @@ -3,7 +3,7 @@ package v1alpha3 import ( "testing" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" "github.com/stretchr/testify/require" "go.opentelemetry.io/otel/attribute" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/operator/apis/lifecycle/v1alpha3/keptnappversion_conversion.go b/lifecycle-operator/apis/lifecycle/v1alpha3/keptnappversion_conversion.go similarity index 100% rename from operator/apis/lifecycle/v1alpha3/keptnappversion_conversion.go rename to lifecycle-operator/apis/lifecycle/v1alpha3/keptnappversion_conversion.go diff --git a/operator/apis/lifecycle/v1alpha3/keptnappversion_test.go b/lifecycle-operator/apis/lifecycle/v1alpha3/keptnappversion_test.go similarity index 99% rename from operator/apis/lifecycle/v1alpha3/keptnappversion_test.go rename to lifecycle-operator/apis/lifecycle/v1alpha3/keptnappversion_test.go index e718dd9a16..c7a5e40bb3 100644 --- a/operator/apis/lifecycle/v1alpha3/keptnappversion_test.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha3/keptnappversion_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" "github.com/stretchr/testify/require" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/propagation" diff --git a/operator/apis/lifecycle/v1alpha3/keptnappversion_types.go b/lifecycle-operator/apis/lifecycle/v1alpha3/keptnappversion_types.go similarity index 97% rename from operator/apis/lifecycle/v1alpha3/keptnappversion_types.go rename to lifecycle-operator/apis/lifecycle/v1alpha3/keptnappversion_types.go index 0d2f353689..1b5c6ffcf1 100644 --- a/operator/apis/lifecycle/v1alpha3/keptnappversion_types.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha3/keptnappversion_types.go @@ -20,7 +20,7 @@ import ( "fmt" "time" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/propagation" "go.opentelemetry.io/otel/trace" @@ -91,11 +91,11 @@ type WorkloadStatus struct { Status common.KeptnState `json:"status,omitempty"` } -//+kubebuilder:object:root=true -//+kubebuilder:storageversion -//+kubebuilder:resource:path=keptnappversions,shortName=kav -//+kubebuilder:subresource:status -//+kubebuilder:printcolumn:name="AppName",type=string,JSONPath=`.spec.appName` +// +kubebuilder:object:root=true +// +kubebuilder:storageversion +// +kubebuilder:resource:path=keptnappversions,shortName=kav +// +kubebuilder:subresource:status +// +kubebuilder:printcolumn:name="AppName",type=string,JSONPath=`.spec.appName` // +kubebuilder:printcolumn:name="Version",type=string,JSONPath=`.spec.version` // +kubebuilder:printcolumn:name="Phase",type=string,JSONPath=`.status.currentPhase` // +kubebuilder:printcolumn:name="PreDeploymentStatus",priority=1,type=string,JSONPath=`.status.preDeploymentStatus` @@ -115,7 +115,7 @@ type KeptnAppVersion struct { Status KeptnAppVersionStatus `json:"status,omitempty"` } -//+kubebuilder:object:root=true +// +kubebuilder:object:root=true // KeptnAppVersionList contains a list of KeptnAppVersion type KeptnAppVersionList struct { diff --git a/operator/apis/lifecycle/v1alpha3/keptnappversion_webhook.go b/lifecycle-operator/apis/lifecycle/v1alpha3/keptnappversion_webhook.go similarity index 100% rename from operator/apis/lifecycle/v1alpha3/keptnappversion_webhook.go rename to lifecycle-operator/apis/lifecycle/v1alpha3/keptnappversion_webhook.go diff --git a/operator/apis/lifecycle/v1alpha3/keptnevaluation_test.go b/lifecycle-operator/apis/lifecycle/v1alpha3/keptnevaluation_test.go similarity index 97% rename from operator/apis/lifecycle/v1alpha3/keptnevaluation_test.go rename to lifecycle-operator/apis/lifecycle/v1alpha3/keptnevaluation_test.go index 307838c0de..8ea9a916f8 100644 --- a/operator/apis/lifecycle/v1alpha3/keptnevaluation_test.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha3/keptnevaluation_test.go @@ -3,7 +3,7 @@ package v1alpha3 import ( "testing" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" "github.com/stretchr/testify/require" "go.opentelemetry.io/otel/attribute" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/operator/apis/lifecycle/v1alpha3/keptnevaluation_types.go b/lifecycle-operator/apis/lifecycle/v1alpha3/keptnevaluation_types.go similarity index 89% rename from operator/apis/lifecycle/v1alpha3/keptnevaluation_types.go rename to lifecycle-operator/apis/lifecycle/v1alpha3/keptnevaluation_types.go index 4f3c55bd62..132461510e 100644 --- a/operator/apis/lifecycle/v1alpha3/keptnevaluation_types.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha3/keptnevaluation_types.go @@ -19,7 +19,7 @@ package v1alpha3 import ( "time" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/propagation" "go.opentelemetry.io/otel/trace" @@ -92,17 +92,17 @@ type EvaluationStatusItem struct { Message string `json:"message,omitempty"` } -//+kubebuilder:object:root=true -//+kubebuilder:subresource:status -//+kubebuilder:storageversion -//+kubebuilder:resource:path=keptnevaluations,shortName=ke -//+kubebuilder:printcolumn:name="AppName",type=string,JSONPath=`.spec.appName` -//+kubebuilder:printcolumn:name="AppVersion",type=string,JSONPath=`.spec.appVersion` -//+kubebuilder:printcolumn:name="WorkloadName",type=string,JSONPath=`.spec.workload` -//+kubebuilder:printcolumn:name="WorkloadVersion",type=string,JSONPath=`.spec.workloadVersion` -//+kubebuilder:printcolumn:name="RetryCount",type=string,JSONPath=`.status.retryCount` -//+kubebuilder:printcolumn:name="EvaluationStatus",type=string,JSONPath=`.status.evaluationStatus` -//+kubebuilder:printcolumn:name="OverallStatus",type=string,JSONPath=`.status.overallStatus` +// +kubebuilder:object:root=true +// +kubebuilder:subresource:status +// +kubebuilder:storageversion +// +kubebuilder:resource:path=keptnevaluations,shortName=ke +// +kubebuilder:printcolumn:name="AppName",type=string,JSONPath=`.spec.appName` +// +kubebuilder:printcolumn:name="AppVersion",type=string,JSONPath=`.spec.appVersion` +// +kubebuilder:printcolumn:name="WorkloadName",type=string,JSONPath=`.spec.workload` +// +kubebuilder:printcolumn:name="WorkloadVersion",type=string,JSONPath=`.spec.workloadVersion` +// +kubebuilder:printcolumn:name="RetryCount",type=string,JSONPath=`.status.retryCount` +// +kubebuilder:printcolumn:name="EvaluationStatus",type=string,JSONPath=`.status.evaluationStatus` +// +kubebuilder:printcolumn:name="OverallStatus",type=string,JSONPath=`.status.overallStatus` // KeptnEvaluation is the Schema for the keptnevaluations API type KeptnEvaluation struct { @@ -115,7 +115,7 @@ type KeptnEvaluation struct { Status KeptnEvaluationStatus `json:"status,omitempty"` } -//+kubebuilder:object:root=true +// +kubebuilder:object:root=true // KeptnEvaluationList contains a list of KeptnEvaluation type KeptnEvaluationList struct { diff --git a/operator/apis/lifecycle/v1alpha3/keptnevaluationdefinition_types.go b/lifecycle-operator/apis/lifecycle/v1alpha3/keptnevaluationdefinition_types.go similarity index 88% rename from operator/apis/lifecycle/v1alpha3/keptnevaluationdefinition_types.go rename to lifecycle-operator/apis/lifecycle/v1alpha3/keptnevaluationdefinition_types.go index 0f8505546f..94f7b3bed0 100644 --- a/operator/apis/lifecycle/v1alpha3/keptnevaluationdefinition_types.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha3/keptnevaluationdefinition_types.go @@ -17,7 +17,6 @@ limitations under the License. package v1alpha3 import ( - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) @@ -46,10 +45,10 @@ type KeptnMetricReference struct { Namespace string `json:"namespace,omitempty"` } -//+kubebuilder:object:root=true -//+kubebuilder:subresource:status -//+kubebuilder:storageversion -//+kubebuilder:resource:path=keptnevaluationdefinitions,shortName=ked +// +kubebuilder:object:root=true +// +kubebuilder:subresource:status +// +kubebuilder:storageversion +// +kubebuilder:resource:path=keptnevaluationdefinitions,shortName=ked // KeptnEvaluationDefinition is the Schema for the keptnevaluationdefinitions API type KeptnEvaluationDefinition struct { @@ -59,10 +58,10 @@ type KeptnEvaluationDefinition struct { // Spec describes the desired state of the KeptnEvaluationDefinition. Spec KeptnEvaluationDefinitionSpec `json:"spec,omitempty"` // unused field - Status common.EmptyStatus `json:"status,omitempty"` + Status string `json:"status,omitempty"` } -//+kubebuilder:object:root=true +// +kubebuilder:object:root=true // KeptnEvaluationDefinitionList contains a list of KeptnEvaluationDefinition type KeptnEvaluationDefinitionList struct { diff --git a/operator/apis/lifecycle/v1alpha3/keptnevaluationprovider_conversion.go b/lifecycle-operator/apis/lifecycle/v1alpha3/keptnevaluationprovider_conversion.go similarity index 100% rename from operator/apis/lifecycle/v1alpha3/keptnevaluationprovider_conversion.go rename to lifecycle-operator/apis/lifecycle/v1alpha3/keptnevaluationprovider_conversion.go diff --git a/operator/apis/lifecycle/v1alpha3/keptnevaluationprovider_types.go b/lifecycle-operator/apis/lifecycle/v1alpha3/keptnevaluationprovider_types.go similarity index 86% rename from operator/apis/lifecycle/v1alpha3/keptnevaluationprovider_types.go rename to lifecycle-operator/apis/lifecycle/v1alpha3/keptnevaluationprovider_types.go index ddebd2ab72..43edc7fc1b 100644 --- a/operator/apis/lifecycle/v1alpha3/keptnevaluationprovider_types.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha3/keptnevaluationprovider_types.go @@ -17,7 +17,6 @@ limitations under the License. package v1alpha3 import ( - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) @@ -31,9 +30,9 @@ type KeptnEvaluationProviderSpec struct { SecretKeyRef corev1.SecretKeySelector `json:"secretKeyRef,omitempty"` } -//+kubebuilder:object:root=true -//+kubebuilder:storageversion -//+kubebuilder:subresource:status +// +kubebuilder:object:root=true +// +kubebuilder:storageversion +// +kubebuilder:subresource:status // KeptnEvaluationProvider is the Schema for the keptnevaluationproviders API type KeptnEvaluationProvider struct { @@ -42,10 +41,10 @@ type KeptnEvaluationProvider struct { Spec KeptnEvaluationProviderSpec `json:"spec,omitempty"` // unused field - Status common.EmptyStatus `json:"status,omitempty"` + Status string `json:"status,omitempty"` } -//+kubebuilder:object:root=true +// +kubebuilder:object:root=true // KeptnEvaluationProviderList contains a list of KeptnEvaluationProvider type KeptnEvaluationProviderList struct { diff --git a/operator/apis/lifecycle/v1alpha3/keptnevaluationprovider_webhook.go b/lifecycle-operator/apis/lifecycle/v1alpha3/keptnevaluationprovider_webhook.go similarity index 100% rename from operator/apis/lifecycle/v1alpha3/keptnevaluationprovider_webhook.go rename to lifecycle-operator/apis/lifecycle/v1alpha3/keptnevaluationprovider_webhook.go diff --git a/operator/apis/lifecycle/v1alpha3/keptntask_test.go b/lifecycle-operator/apis/lifecycle/v1alpha3/keptntask_test.go similarity index 97% rename from operator/apis/lifecycle/v1alpha3/keptntask_test.go rename to lifecycle-operator/apis/lifecycle/v1alpha3/keptntask_test.go index ff3865c8a3..55c4bf1c91 100644 --- a/operator/apis/lifecycle/v1alpha3/keptntask_test.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha3/keptntask_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" "github.com/stretchr/testify/require" "go.opentelemetry.io/otel/attribute" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/operator/apis/lifecycle/v1alpha3/keptntask_types.go b/lifecycle-operator/apis/lifecycle/v1alpha3/keptntask_types.go similarity index 98% rename from operator/apis/lifecycle/v1alpha3/keptntask_types.go rename to lifecycle-operator/apis/lifecycle/v1alpha3/keptntask_types.go index 182cd4512b..d1929d892d 100644 --- a/operator/apis/lifecycle/v1alpha3/keptntask_types.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha3/keptntask_types.go @@ -19,7 +19,7 @@ package v1alpha3 import ( "time" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/propagation" "go.opentelemetry.io/otel/trace" @@ -138,7 +138,7 @@ type KeptnTask struct { Status KeptnTaskStatus `json:"status,omitempty"` } -//+kubebuilder:object:root=true +// +kubebuilder:object:root=true // KeptnTaskList contains a list of KeptnTask type KeptnTaskList struct { diff --git a/operator/apis/lifecycle/v1alpha3/keptntaskdefinition_types.go b/lifecycle-operator/apis/lifecycle/v1alpha3/keptntaskdefinition_types.go similarity index 100% rename from operator/apis/lifecycle/v1alpha3/keptntaskdefinition_types.go rename to lifecycle-operator/apis/lifecycle/v1alpha3/keptntaskdefinition_types.go diff --git a/operator/apis/lifecycle/v1alpha3/keptntaskdefinition_webhook.go b/lifecycle-operator/apis/lifecycle/v1alpha3/keptntaskdefinition_webhook.go similarity index 100% rename from operator/apis/lifecycle/v1alpha3/keptntaskdefinition_webhook.go rename to lifecycle-operator/apis/lifecycle/v1alpha3/keptntaskdefinition_webhook.go diff --git a/operator/apis/lifecycle/v1alpha3/keptntaskdefinition_webhook_test.go b/lifecycle-operator/apis/lifecycle/v1alpha3/keptntaskdefinition_webhook_test.go similarity index 100% rename from operator/apis/lifecycle/v1alpha3/keptntaskdefinition_webhook_test.go rename to lifecycle-operator/apis/lifecycle/v1alpha3/keptntaskdefinition_webhook_test.go diff --git a/operator/apis/lifecycle/v1alpha3/keptnworkload_test.go b/lifecycle-operator/apis/lifecycle/v1alpha3/keptnworkload_test.go similarity index 93% rename from operator/apis/lifecycle/v1alpha3/keptnworkload_test.go rename to lifecycle-operator/apis/lifecycle/v1alpha3/keptnworkload_test.go index 72f09672b0..d9084d297a 100644 --- a/operator/apis/lifecycle/v1alpha3/keptnworkload_test.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha3/keptnworkload_test.go @@ -3,7 +3,7 @@ package v1alpha3 import ( "testing" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" "github.com/stretchr/testify/require" "go.opentelemetry.io/otel/attribute" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/operator/apis/lifecycle/v1alpha3/keptnworkload_types.go b/lifecycle-operator/apis/lifecycle/v1alpha3/keptnworkload_types.go similarity index 94% rename from operator/apis/lifecycle/v1alpha3/keptnworkload_types.go rename to lifecycle-operator/apis/lifecycle/v1alpha3/keptnworkload_types.go index f550f7179f..1bc1d4ddd4 100644 --- a/operator/apis/lifecycle/v1alpha3/keptnworkload_types.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha3/keptnworkload_types.go @@ -20,8 +20,8 @@ import ( "fmt" "strings" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" - operatorcommon "github.com/keptn/lifecycle-toolkit/operator/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" + operatorcommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/common" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -66,9 +66,9 @@ type KeptnWorkloadStatus struct { CurrentVersion string `json:"currentVersion,omitempty"` } -//+kubebuilder:object:root=true -//+kubebuilder:subresource:status -//+kubebuilder:storageversion +// +kubebuilder:object:root=true +// +kubebuilder:subresource:status +// +kubebuilder:storageversion // +kubebuilder:printcolumn:name="AppName",type=string,JSONPath=`.spec.app` // +kubebuilder:printcolumn:name="Version",type=string,JSONPath=`.spec.version` @@ -83,7 +83,7 @@ type KeptnWorkload struct { Status KeptnWorkloadStatus `json:"status,omitempty"` } -//+kubebuilder:object:root=true +// +kubebuilder:object:root=true // KeptnWorkloadList contains a list of KeptnWorkload type KeptnWorkloadList struct { diff --git a/operator/apis/lifecycle/v1alpha3/keptnworkload_types_test.go b/lifecycle-operator/apis/lifecycle/v1alpha3/keptnworkload_types_test.go similarity index 100% rename from operator/apis/lifecycle/v1alpha3/keptnworkload_types_test.go rename to lifecycle-operator/apis/lifecycle/v1alpha3/keptnworkload_types_test.go diff --git a/operator/apis/lifecycle/v1alpha3/keptnworkloadinstance_conversion.go b/lifecycle-operator/apis/lifecycle/v1alpha3/keptnworkloadinstance_conversion.go similarity index 100% rename from operator/apis/lifecycle/v1alpha3/keptnworkloadinstance_conversion.go rename to lifecycle-operator/apis/lifecycle/v1alpha3/keptnworkloadinstance_conversion.go diff --git a/operator/apis/lifecycle/v1alpha3/keptnworkloadinstance_test.go b/lifecycle-operator/apis/lifecycle/v1alpha3/keptnworkloadinstance_test.go similarity index 99% rename from operator/apis/lifecycle/v1alpha3/keptnworkloadinstance_test.go rename to lifecycle-operator/apis/lifecycle/v1alpha3/keptnworkloadinstance_test.go index 551519c230..0227a51048 100644 --- a/operator/apis/lifecycle/v1alpha3/keptnworkloadinstance_test.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha3/keptnworkloadinstance_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" "github.com/stretchr/testify/require" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/propagation" diff --git a/operator/apis/lifecycle/v1alpha3/keptnworkloadinstance_types.go b/lifecycle-operator/apis/lifecycle/v1alpha3/keptnworkloadinstance_types.go similarity index 98% rename from operator/apis/lifecycle/v1alpha3/keptnworkloadinstance_types.go rename to lifecycle-operator/apis/lifecycle/v1alpha3/keptnworkloadinstance_types.go index 0440489ac3..28a1803959 100644 --- a/operator/apis/lifecycle/v1alpha3/keptnworkloadinstance_types.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha3/keptnworkloadinstance_types.go @@ -20,7 +20,7 @@ import ( "fmt" "time" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/propagation" "go.opentelemetry.io/otel/trace" @@ -98,10 +98,10 @@ type ItemStatus struct { EndTime metav1.Time `json:"endTime,omitempty"` } -//+kubebuilder:object:root=true -//+kubebuilder:resource:path=keptnworkloadinstances,shortName=kwi -//+kubebuilder:subresource:status -//+kubebuilder:storageversion +// +kubebuilder:object:root=true +// +kubebuilder:resource:path=keptnworkloadinstances,shortName=kwi +// +kubebuilder:subresource:status +// +kubebuilder:storageversion // +kubebuilder:printcolumn:name="AppName",type=string,JSONPath=`.spec.app` // +kubebuilder:printcolumn:name="WorkloadName",type=string,JSONPath=`.spec.workloadName` // +kubebuilder:printcolumn:name="WorkloadVersion",type=string,JSONPath=`.spec.version` @@ -123,7 +123,7 @@ type KeptnWorkloadInstance struct { Status KeptnWorkloadInstanceStatus `json:"status,omitempty"` } -//+kubebuilder:object:root=true +// +kubebuilder:object:root=true // KeptnWorkloadInstanceList contains a list of KeptnWorkloadInstance type KeptnWorkloadInstanceList struct { diff --git a/operator/apis/lifecycle/v1alpha3/keptnworkloadinstance_webhook.go b/lifecycle-operator/apis/lifecycle/v1alpha3/keptnworkloadinstance_webhook.go similarity index 100% rename from operator/apis/lifecycle/v1alpha3/keptnworkloadinstance_webhook.go rename to lifecycle-operator/apis/lifecycle/v1alpha3/keptnworkloadinstance_webhook.go diff --git a/operator/apis/lifecycle/v1alpha3/semconv/semconv.go b/lifecycle-operator/apis/lifecycle/v1alpha3/semconv/semconv.go similarity index 81% rename from operator/apis/lifecycle/v1alpha3/semconv/semconv.go rename to lifecycle-operator/apis/lifecycle/v1alpha3/semconv/semconv.go index 214fd4cae7..547b3bf217 100644 --- a/operator/apis/lifecycle/v1alpha3/semconv/semconv.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha3/semconv/semconv.go @@ -1,7 +1,7 @@ package semconv import ( - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" "go.opentelemetry.io/otel/trace" ) diff --git a/operator/apis/lifecycle/v1alpha3/zz_generated.deepcopy.go b/lifecycle-operator/apis/lifecycle/v1alpha3/zz_generated.deepcopy.go similarity index 99% rename from operator/apis/lifecycle/v1alpha3/zz_generated.deepcopy.go rename to lifecycle-operator/apis/lifecycle/v1alpha3/zz_generated.deepcopy.go index d6d24341a5..7dd637e57a 100644 --- a/operator/apis/lifecycle/v1alpha3/zz_generated.deepcopy.go +++ b/lifecycle-operator/apis/lifecycle/v1alpha3/zz_generated.deepcopy.go @@ -22,7 +22,7 @@ limitations under the License. package v1alpha3 import ( - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" "go.opentelemetry.io/otel/propagation" "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" @@ -188,7 +188,6 @@ func (in *KeptnAppCreationRequest) DeepCopyInto(out *KeptnAppCreationRequest) { out.TypeMeta = in.TypeMeta in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) out.Spec = in.Spec - out.Status = in.Status } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KeptnAppCreationRequest. @@ -525,7 +524,6 @@ func (in *KeptnEvaluationDefinition) DeepCopyInto(out *KeptnEvaluationDefinition out.TypeMeta = in.TypeMeta in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) in.Spec.DeepCopyInto(&out.Spec) - out.Status = in.Status } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KeptnEvaluationDefinition. @@ -636,7 +634,6 @@ func (in *KeptnEvaluationProvider) DeepCopyInto(out *KeptnEvaluationProvider) { out.TypeMeta = in.TypeMeta in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) in.Spec.DeepCopyInto(&out.Spec) - out.Status = in.Status } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KeptnEvaluationProvider. diff --git a/operator/apis/options/v1alpha1/groupversion_info.go b/lifecycle-operator/apis/options/v1alpha1/groupversion_info.go similarity index 100% rename from operator/apis/options/v1alpha1/groupversion_info.go rename to lifecycle-operator/apis/options/v1alpha1/groupversion_info.go diff --git a/operator/apis/options/v1alpha1/keptnconfig_types.go b/lifecycle-operator/apis/options/v1alpha1/keptnconfig_types.go similarity index 95% rename from operator/apis/options/v1alpha1/keptnconfig_types.go rename to lifecycle-operator/apis/options/v1alpha1/keptnconfig_types.go index 5e73cbd6fb..50d72d5eae 100644 --- a/operator/apis/options/v1alpha1/keptnconfig_types.go +++ b/lifecycle-operator/apis/options/v1alpha1/keptnconfig_types.go @@ -28,7 +28,7 @@ type KeptnConfigSpec struct { // INSERT ADDITIONAL SPEC FIELDS - desired state of cluster // Important: Run "make" to regenerate code after modifying this file - // OTelCollectorUrl can be used to set the Open Telemetry collector that the operator should use + // OTelCollectorUrl can be used to set the Open Telemetry collector that the lifecycle operator should use // +optional OTelCollectorUrl string `json:"OTelCollectorUrl,omitempty"` // KeptnAppCreationRequestTimeoutSeconds is used to set the interval in which automatic app discovery @@ -38,8 +38,6 @@ type KeptnConfigSpec struct { KeptnAppCreationRequestTimeoutSeconds uint `json:"keptnAppCreationRequestTimeoutSeconds,omitempty"` } -type EmptyStatus struct{} - // +kubebuilder:object:root=true // +kubebuilder:subresource:status @@ -50,7 +48,7 @@ type KeptnConfig struct { Spec KeptnConfigSpec `json:"spec,omitempty"` // unused field - Status EmptyStatus `json:"status,omitempty"` + Status string `json:"status,omitempty"` } // +kubebuilder:object:root=true diff --git a/operator/apis/options/v1alpha1/zz_generated.deepcopy.go b/lifecycle-operator/apis/options/v1alpha1/zz_generated.deepcopy.go similarity index 86% rename from operator/apis/options/v1alpha1/zz_generated.deepcopy.go rename to lifecycle-operator/apis/options/v1alpha1/zz_generated.deepcopy.go index 82e0a71d7b..29dcf00dcd 100644 --- a/operator/apis/options/v1alpha1/zz_generated.deepcopy.go +++ b/lifecycle-operator/apis/options/v1alpha1/zz_generated.deepcopy.go @@ -25,28 +25,12 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" ) -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *EmptyStatus) DeepCopyInto(out *EmptyStatus) { - *out = *in -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EmptyStatus. -func (in *EmptyStatus) DeepCopy() *EmptyStatus { - if in == nil { - return nil - } - out := new(EmptyStatus) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *KeptnConfig) DeepCopyInto(out *KeptnConfig) { *out = *in out.TypeMeta = in.TypeMeta in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) out.Spec = in.Spec - out.Status = in.Status } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KeptnConfig. diff --git a/operator/cmd/config/config.go b/lifecycle-operator/cmd/config/config.go similarity index 100% rename from operator/cmd/config/config.go rename to lifecycle-operator/cmd/config/config.go diff --git a/operator/cmd/config/config_test.go b/lifecycle-operator/cmd/config/config_test.go similarity index 100% rename from operator/cmd/config/config_test.go rename to lifecycle-operator/cmd/config/config_test.go diff --git a/operator/cmd/fake/manager_mock.go b/lifecycle-operator/cmd/fake/manager_mock.go similarity index 100% rename from operator/cmd/fake/manager_mock.go rename to lifecycle-operator/cmd/fake/manager_mock.go diff --git a/operator/cmd/fake/provider_mock.go b/lifecycle-operator/cmd/fake/provider_mock.go similarity index 100% rename from operator/cmd/fake/provider_mock.go rename to lifecycle-operator/cmd/fake/provider_mock.go diff --git a/operator/cmd/fake/webhookmanager_mock.go b/lifecycle-operator/cmd/fake/webhookmanager_mock.go similarity index 100% rename from operator/cmd/fake/webhookmanager_mock.go rename to lifecycle-operator/cmd/fake/webhookmanager_mock.go diff --git a/operator/cmd/manager/manager.go b/lifecycle-operator/cmd/manager/manager.go similarity index 100% rename from operator/cmd/manager/manager.go rename to lifecycle-operator/cmd/manager/manager.go diff --git a/operator/common/common.go b/lifecycle-operator/common/common.go similarity index 100% rename from operator/common/common.go rename to lifecycle-operator/common/common.go diff --git a/operator/common/common_test.go b/lifecycle-operator/common/common_test.go similarity index 100% rename from operator/common/common_test.go rename to lifecycle-operator/common/common_test.go diff --git a/operator/config/crd/bases/lifecycle.keptn.sh_keptnappcreationrequests.yaml b/lifecycle-operator/config/crd/bases/lifecycle.keptn.sh_keptnappcreationrequests.yaml similarity index 98% rename from operator/config/crd/bases/lifecycle.keptn.sh_keptnappcreationrequests.yaml rename to lifecycle-operator/config/crd/bases/lifecycle.keptn.sh_keptnappcreationrequests.yaml index 2a782d856c..a6e123f194 100644 --- a/operator/config/crd/bases/lifecycle.keptn.sh_keptnappcreationrequests.yaml +++ b/lifecycle-operator/config/crd/bases/lifecycle.keptn.sh_keptnappcreationrequests.yaml @@ -44,7 +44,7 @@ spec: type: object status: description: Status describes the current state of the KeptnAppCreationRequest. - type: object + type: string type: object served: true storage: true diff --git a/operator/config/crd/bases/lifecycle.keptn.sh_keptnapps.yaml b/lifecycle-operator/config/crd/bases/lifecycle.keptn.sh_keptnapps.yaml similarity index 100% rename from operator/config/crd/bases/lifecycle.keptn.sh_keptnapps.yaml rename to lifecycle-operator/config/crd/bases/lifecycle.keptn.sh_keptnapps.yaml diff --git a/operator/config/crd/bases/lifecycle.keptn.sh_keptnappversions.yaml b/lifecycle-operator/config/crd/bases/lifecycle.keptn.sh_keptnappversions.yaml similarity index 100% rename from operator/config/crd/bases/lifecycle.keptn.sh_keptnappversions.yaml rename to lifecycle-operator/config/crd/bases/lifecycle.keptn.sh_keptnappversions.yaml diff --git a/operator/config/crd/bases/lifecycle.keptn.sh_keptnevaluationdefinitions.yaml b/lifecycle-operator/config/crd/bases/lifecycle.keptn.sh_keptnevaluationdefinitions.yaml similarity index 98% rename from operator/config/crd/bases/lifecycle.keptn.sh_keptnevaluationdefinitions.yaml rename to lifecycle-operator/config/crd/bases/lifecycle.keptn.sh_keptnevaluationdefinitions.yaml index 73aad8a709..06980838fb 100644 --- a/operator/config/crd/bases/lifecycle.keptn.sh_keptnevaluationdefinitions.yaml +++ b/lifecycle-operator/config/crd/bases/lifecycle.keptn.sh_keptnevaluationdefinitions.yaml @@ -61,7 +61,7 @@ spec: type: object status: description: unused field - type: object + type: string type: object served: true storage: false @@ -112,7 +112,7 @@ spec: type: object status: description: unused field - type: object + type: string type: object served: true storage: false @@ -174,7 +174,7 @@ spec: type: object status: description: unused field - type: object + type: string type: object served: true storage: true diff --git a/operator/config/crd/bases/lifecycle.keptn.sh_keptnevaluationproviders.yaml b/lifecycle-operator/config/crd/bases/lifecycle.keptn.sh_keptnevaluationproviders.yaml similarity index 98% rename from operator/config/crd/bases/lifecycle.keptn.sh_keptnevaluationproviders.yaml rename to lifecycle-operator/config/crd/bases/lifecycle.keptn.sh_keptnevaluationproviders.yaml index 8360618cbf..0a416126b6 100644 --- a/operator/config/crd/bases/lifecycle.keptn.sh_keptnevaluationproviders.yaml +++ b/lifecycle-operator/config/crd/bases/lifecycle.keptn.sh_keptnevaluationproviders.yaml @@ -47,7 +47,7 @@ spec: type: object status: description: unused field - type: object + type: string type: object served: true storage: false @@ -100,7 +100,7 @@ spec: type: object status: description: unused field - type: object + type: string type: object served: true storage: false @@ -153,7 +153,7 @@ spec: type: object status: description: unused field - type: object + type: string type: object served: true storage: true diff --git a/operator/config/crd/bases/lifecycle.keptn.sh_keptnevaluations.yaml b/lifecycle-operator/config/crd/bases/lifecycle.keptn.sh_keptnevaluations.yaml similarity index 100% rename from operator/config/crd/bases/lifecycle.keptn.sh_keptnevaluations.yaml rename to lifecycle-operator/config/crd/bases/lifecycle.keptn.sh_keptnevaluations.yaml diff --git a/operator/config/crd/bases/lifecycle.keptn.sh_keptntaskdefinitions.yaml b/lifecycle-operator/config/crd/bases/lifecycle.keptn.sh_keptntaskdefinitions.yaml similarity index 100% rename from operator/config/crd/bases/lifecycle.keptn.sh_keptntaskdefinitions.yaml rename to lifecycle-operator/config/crd/bases/lifecycle.keptn.sh_keptntaskdefinitions.yaml diff --git a/operator/config/crd/bases/lifecycle.keptn.sh_keptntasks.yaml b/lifecycle-operator/config/crd/bases/lifecycle.keptn.sh_keptntasks.yaml similarity index 100% rename from operator/config/crd/bases/lifecycle.keptn.sh_keptntasks.yaml rename to lifecycle-operator/config/crd/bases/lifecycle.keptn.sh_keptntasks.yaml diff --git a/operator/config/crd/bases/lifecycle.keptn.sh_keptnworkloadinstances.yaml b/lifecycle-operator/config/crd/bases/lifecycle.keptn.sh_keptnworkloadinstances.yaml similarity index 100% rename from operator/config/crd/bases/lifecycle.keptn.sh_keptnworkloadinstances.yaml rename to lifecycle-operator/config/crd/bases/lifecycle.keptn.sh_keptnworkloadinstances.yaml diff --git a/operator/config/crd/bases/lifecycle.keptn.sh_keptnworkloads.yaml b/lifecycle-operator/config/crd/bases/lifecycle.keptn.sh_keptnworkloads.yaml similarity index 100% rename from operator/config/crd/bases/lifecycle.keptn.sh_keptnworkloads.yaml rename to lifecycle-operator/config/crd/bases/lifecycle.keptn.sh_keptnworkloads.yaml diff --git a/operator/config/crd/bases/options.keptn.sh_keptnconfigs.yaml b/lifecycle-operator/config/crd/bases/options.keptn.sh_keptnconfigs.yaml similarity index 95% rename from operator/config/crd/bases/options.keptn.sh_keptnconfigs.yaml rename to lifecycle-operator/config/crd/bases/options.keptn.sh_keptnconfigs.yaml index 240f70715c..c1a66a3c79 100644 --- a/operator/config/crd/bases/options.keptn.sh_keptnconfigs.yaml +++ b/lifecycle-operator/config/crd/bases/options.keptn.sh_keptnconfigs.yaml @@ -36,7 +36,7 @@ spec: properties: OTelCollectorUrl: description: OTelCollectorUrl can be used to set the Open Telemetry - collector that the operator should use + collector that the lifecycle operator should use type: string keptnAppCreationRequestTimeoutSeconds: default: 30 @@ -47,7 +47,7 @@ spec: type: object status: description: unused field - type: object + type: string type: object served: true storage: true diff --git a/operator/config/crd/kustomization.yaml b/lifecycle-operator/config/crd/kustomization.yaml similarity index 100% rename from operator/config/crd/kustomization.yaml rename to lifecycle-operator/config/crd/kustomization.yaml diff --git a/operator/config/crd/kustomizeconfig.yaml b/lifecycle-operator/config/crd/kustomizeconfig.yaml similarity index 100% rename from operator/config/crd/kustomizeconfig.yaml rename to lifecycle-operator/config/crd/kustomizeconfig.yaml diff --git a/operator/config/crd/patches/.gitignore b/lifecycle-operator/config/crd/patches/.gitignore similarity index 100% rename from operator/config/crd/patches/.gitignore rename to lifecycle-operator/config/crd/patches/.gitignore diff --git a/operator/config/crd/patches/webhook_in_lifecycle_keptnappcreationrequests.yaml b/lifecycle-operator/config/crd/patches/webhook_in_lifecycle_keptnappcreationrequests.yaml similarity index 100% rename from operator/config/crd/patches/webhook_in_lifecycle_keptnappcreationrequests.yaml rename to lifecycle-operator/config/crd/patches/webhook_in_lifecycle_keptnappcreationrequests.yaml diff --git a/operator/config/crd/patches/webhook_in_lifecycle_keptnapps.yaml b/lifecycle-operator/config/crd/patches/webhook_in_lifecycle_keptnapps.yaml similarity index 100% rename from operator/config/crd/patches/webhook_in_lifecycle_keptnapps.yaml rename to lifecycle-operator/config/crd/patches/webhook_in_lifecycle_keptnapps.yaml diff --git a/operator/config/crd/patches/webhook_in_lifecycle_keptnappversions.yaml b/lifecycle-operator/config/crd/patches/webhook_in_lifecycle_keptnappversions.yaml similarity index 100% rename from operator/config/crd/patches/webhook_in_lifecycle_keptnappversions.yaml rename to lifecycle-operator/config/crd/patches/webhook_in_lifecycle_keptnappversions.yaml diff --git a/operator/config/crd/patches/webhook_in_lifecycle_keptnevaluationdefinitions.yaml b/lifecycle-operator/config/crd/patches/webhook_in_lifecycle_keptnevaluationdefinitions.yaml similarity index 100% rename from operator/config/crd/patches/webhook_in_lifecycle_keptnevaluationdefinitions.yaml rename to lifecycle-operator/config/crd/patches/webhook_in_lifecycle_keptnevaluationdefinitions.yaml diff --git a/operator/config/crd/patches/webhook_in_lifecycle_keptnevaluationproviders.yaml b/lifecycle-operator/config/crd/patches/webhook_in_lifecycle_keptnevaluationproviders.yaml similarity index 100% rename from operator/config/crd/patches/webhook_in_lifecycle_keptnevaluationproviders.yaml rename to lifecycle-operator/config/crd/patches/webhook_in_lifecycle_keptnevaluationproviders.yaml diff --git a/operator/config/crd/patches/webhook_in_lifecycle_keptnevaluations.yaml b/lifecycle-operator/config/crd/patches/webhook_in_lifecycle_keptnevaluations.yaml similarity index 100% rename from operator/config/crd/patches/webhook_in_lifecycle_keptnevaluations.yaml rename to lifecycle-operator/config/crd/patches/webhook_in_lifecycle_keptnevaluations.yaml diff --git a/operator/config/crd/patches/webhook_in_lifecycle_keptntaskdefinitions.yaml b/lifecycle-operator/config/crd/patches/webhook_in_lifecycle_keptntaskdefinitions.yaml similarity index 100% rename from operator/config/crd/patches/webhook_in_lifecycle_keptntaskdefinitions.yaml rename to lifecycle-operator/config/crd/patches/webhook_in_lifecycle_keptntaskdefinitions.yaml diff --git a/operator/config/crd/patches/webhook_in_lifecycle_keptntasks.yaml b/lifecycle-operator/config/crd/patches/webhook_in_lifecycle_keptntasks.yaml similarity index 100% rename from operator/config/crd/patches/webhook_in_lifecycle_keptntasks.yaml rename to lifecycle-operator/config/crd/patches/webhook_in_lifecycle_keptntasks.yaml diff --git a/operator/config/crd/patches/webhook_in_lifecycle_keptnworkloadinstances.yaml b/lifecycle-operator/config/crd/patches/webhook_in_lifecycle_keptnworkloadinstances.yaml similarity index 100% rename from operator/config/crd/patches/webhook_in_lifecycle_keptnworkloadinstances.yaml rename to lifecycle-operator/config/crd/patches/webhook_in_lifecycle_keptnworkloadinstances.yaml diff --git a/operator/config/crd/patches/webhook_in_lifecycle_keptnworkloads.yaml b/lifecycle-operator/config/crd/patches/webhook_in_lifecycle_keptnworkloads.yaml similarity index 100% rename from operator/config/crd/patches/webhook_in_lifecycle_keptnworkloads.yaml rename to lifecycle-operator/config/crd/patches/webhook_in_lifecycle_keptnworkloads.yaml diff --git a/operator/config/crd/patches/webhook_in_options_keptnconfigs.yaml b/lifecycle-operator/config/crd/patches/webhook_in_options_keptnconfigs.yaml similarity index 100% rename from operator/config/crd/patches/webhook_in_options_keptnconfigs.yaml rename to lifecycle-operator/config/crd/patches/webhook_in_options_keptnconfigs.yaml diff --git a/operator/config/default/.gitignore b/lifecycle-operator/config/default/.gitignore similarity index 100% rename from operator/config/default/.gitignore rename to lifecycle-operator/config/default/.gitignore diff --git a/operator/config/default/kustomization.yaml b/lifecycle-operator/config/default/kustomization.yaml similarity index 100% rename from operator/config/default/kustomization.yaml rename to lifecycle-operator/config/default/kustomization.yaml diff --git a/operator/config/default/manager_webhook_patch.yaml b/lifecycle-operator/config/default/manager_webhook_patch.yaml similarity index 100% rename from operator/config/default/manager_webhook_patch.yaml rename to lifecycle-operator/config/default/manager_webhook_patch.yaml diff --git a/operator/config/default/webhooknamespaces_patch.yaml b/lifecycle-operator/config/default/webhooknamespaces_patch.yaml similarity index 85% rename from operator/config/default/webhooknamespaces_patch.yaml rename to lifecycle-operator/config/default/webhooknamespaces_patch.yaml index 6066f1f342..6b5655410a 100644 --- a/operator/config/default/webhooknamespaces_patch.yaml +++ b/lifecycle-operator/config/default/webhooknamespaces_patch.yaml @@ -5,7 +5,7 @@ metadata: name: lifecycle-mutating-webhook-configuration labels: app.kubernetes.io/part-of: keptn-lifecycle-toolkit -# Add an exclusion rule for the Mutating Webhook since the operator pod will not be able to start since it's waiting for +# Add an exclusion rule for the Mutating Webhook since the lifecycle-operator pod will not be able to start since it's waiting for # itself otherwise control-plane: controller-manager webhooks: - name: mpod.keptn.sh diff --git a/operator/config/manager/controller_manager_config.yaml b/lifecycle-operator/config/manager/controller_manager_config.yaml similarity index 100% rename from operator/config/manager/controller_manager_config.yaml rename to lifecycle-operator/config/manager/controller_manager_config.yaml diff --git a/operator/config/manager/kustomization.yaml b/lifecycle-operator/config/manager/kustomization.yaml similarity index 100% rename from operator/config/manager/kustomization.yaml rename to lifecycle-operator/config/manager/kustomization.yaml diff --git a/operator/config/manager/manager.yaml b/lifecycle-operator/config/manager/manager.yaml similarity index 100% rename from operator/config/manager/manager.yaml rename to lifecycle-operator/config/manager/manager.yaml diff --git a/operator/config/manager/service.yaml b/lifecycle-operator/config/manager/service.yaml similarity index 100% rename from operator/config/manager/service.yaml rename to lifecycle-operator/config/manager/service.yaml diff --git a/operator/config/rbac/extra_role_binding.yaml b/lifecycle-operator/config/rbac/extra_role_binding.yaml similarity index 100% rename from operator/config/rbac/extra_role_binding.yaml rename to lifecycle-operator/config/rbac/extra_role_binding.yaml diff --git a/operator/config/rbac/extra_roles.yaml b/lifecycle-operator/config/rbac/extra_roles.yaml similarity index 100% rename from operator/config/rbac/extra_roles.yaml rename to lifecycle-operator/config/rbac/extra_roles.yaml diff --git a/operator/config/rbac/keptnapp_editor_role.yaml b/lifecycle-operator/config/rbac/keptnapp_editor_role.yaml similarity index 100% rename from operator/config/rbac/keptnapp_editor_role.yaml rename to lifecycle-operator/config/rbac/keptnapp_editor_role.yaml diff --git a/operator/config/rbac/keptnapp_viewer_role.yaml b/lifecycle-operator/config/rbac/keptnapp_viewer_role.yaml similarity index 100% rename from operator/config/rbac/keptnapp_viewer_role.yaml rename to lifecycle-operator/config/rbac/keptnapp_viewer_role.yaml diff --git a/operator/config/rbac/keptnappversion_editor_role.yaml b/lifecycle-operator/config/rbac/keptnappversion_editor_role.yaml similarity index 100% rename from operator/config/rbac/keptnappversion_editor_role.yaml rename to lifecycle-operator/config/rbac/keptnappversion_editor_role.yaml diff --git a/operator/config/rbac/keptnappversion_viewer_role.yaml b/lifecycle-operator/config/rbac/keptnappversion_viewer_role.yaml similarity index 100% rename from operator/config/rbac/keptnappversion_viewer_role.yaml rename to lifecycle-operator/config/rbac/keptnappversion_viewer_role.yaml diff --git a/operator/config/rbac/keptnevaluation_editor_role.yaml b/lifecycle-operator/config/rbac/keptnevaluation_editor_role.yaml similarity index 100% rename from operator/config/rbac/keptnevaluation_editor_role.yaml rename to lifecycle-operator/config/rbac/keptnevaluation_editor_role.yaml diff --git a/operator/config/rbac/keptnevaluation_viewer_role.yaml b/lifecycle-operator/config/rbac/keptnevaluation_viewer_role.yaml similarity index 100% rename from operator/config/rbac/keptnevaluation_viewer_role.yaml rename to lifecycle-operator/config/rbac/keptnevaluation_viewer_role.yaml diff --git a/operator/config/rbac/keptnevaluationdefinition_editor_role.yaml b/lifecycle-operator/config/rbac/keptnevaluationdefinition_editor_role.yaml similarity index 100% rename from operator/config/rbac/keptnevaluationdefinition_editor_role.yaml rename to lifecycle-operator/config/rbac/keptnevaluationdefinition_editor_role.yaml diff --git a/operator/config/rbac/keptnevaluationdefinition_viewer_role.yaml b/lifecycle-operator/config/rbac/keptnevaluationdefinition_viewer_role.yaml similarity index 100% rename from operator/config/rbac/keptnevaluationdefinition_viewer_role.yaml rename to lifecycle-operator/config/rbac/keptnevaluationdefinition_viewer_role.yaml diff --git a/operator/config/rbac/keptntask_editor_role.yaml b/lifecycle-operator/config/rbac/keptntask_editor_role.yaml similarity index 100% rename from operator/config/rbac/keptntask_editor_role.yaml rename to lifecycle-operator/config/rbac/keptntask_editor_role.yaml diff --git a/operator/config/rbac/keptntask_viewer_role.yaml b/lifecycle-operator/config/rbac/keptntask_viewer_role.yaml similarity index 100% rename from operator/config/rbac/keptntask_viewer_role.yaml rename to lifecycle-operator/config/rbac/keptntask_viewer_role.yaml diff --git a/operator/config/rbac/keptntaskdefinition_editor_role.yaml b/lifecycle-operator/config/rbac/keptntaskdefinition_editor_role.yaml similarity index 100% rename from operator/config/rbac/keptntaskdefinition_editor_role.yaml rename to lifecycle-operator/config/rbac/keptntaskdefinition_editor_role.yaml diff --git a/operator/config/rbac/keptntaskdefinition_viewer_role.yaml b/lifecycle-operator/config/rbac/keptntaskdefinition_viewer_role.yaml similarity index 100% rename from operator/config/rbac/keptntaskdefinition_viewer_role.yaml rename to lifecycle-operator/config/rbac/keptntaskdefinition_viewer_role.yaml diff --git a/operator/config/rbac/keptnworkload_editor_role.yaml b/lifecycle-operator/config/rbac/keptnworkload_editor_role.yaml similarity index 100% rename from operator/config/rbac/keptnworkload_editor_role.yaml rename to lifecycle-operator/config/rbac/keptnworkload_editor_role.yaml diff --git a/operator/config/rbac/keptnworkload_viewer_role.yaml b/lifecycle-operator/config/rbac/keptnworkload_viewer_role.yaml similarity index 100% rename from operator/config/rbac/keptnworkload_viewer_role.yaml rename to lifecycle-operator/config/rbac/keptnworkload_viewer_role.yaml diff --git a/operator/config/rbac/keptnworkloadinstance_editor_role.yaml b/lifecycle-operator/config/rbac/keptnworkloadinstance_editor_role.yaml similarity index 100% rename from operator/config/rbac/keptnworkloadinstance_editor_role.yaml rename to lifecycle-operator/config/rbac/keptnworkloadinstance_editor_role.yaml diff --git a/operator/config/rbac/keptnworkloadinstance_viewer_role.yaml b/lifecycle-operator/config/rbac/keptnworkloadinstance_viewer_role.yaml similarity index 100% rename from operator/config/rbac/keptnworkloadinstance_viewer_role.yaml rename to lifecycle-operator/config/rbac/keptnworkloadinstance_viewer_role.yaml diff --git a/operator/config/rbac/kustomization.yaml b/lifecycle-operator/config/rbac/kustomization.yaml similarity index 100% rename from operator/config/rbac/kustomization.yaml rename to lifecycle-operator/config/rbac/kustomization.yaml diff --git a/operator/config/rbac/leader_election_role.yaml b/lifecycle-operator/config/rbac/leader_election_role.yaml similarity index 100% rename from operator/config/rbac/leader_election_role.yaml rename to lifecycle-operator/config/rbac/leader_election_role.yaml diff --git a/operator/config/rbac/leader_election_role_binding.yaml b/lifecycle-operator/config/rbac/leader_election_role_binding.yaml similarity index 100% rename from operator/config/rbac/leader_election_role_binding.yaml rename to lifecycle-operator/config/rbac/leader_election_role_binding.yaml diff --git a/operator/config/rbac/lifecycle_keptnapp_editor_role.yaml b/lifecycle-operator/config/rbac/lifecycle_keptnapp_editor_role.yaml similarity index 100% rename from operator/config/rbac/lifecycle_keptnapp_editor_role.yaml rename to lifecycle-operator/config/rbac/lifecycle_keptnapp_editor_role.yaml diff --git a/operator/config/rbac/lifecycle_keptnapp_viewer_role.yaml b/lifecycle-operator/config/rbac/lifecycle_keptnapp_viewer_role.yaml similarity index 100% rename from operator/config/rbac/lifecycle_keptnapp_viewer_role.yaml rename to lifecycle-operator/config/rbac/lifecycle_keptnapp_viewer_role.yaml diff --git a/operator/config/rbac/lifecycle_keptnappcreationrequest_editor_role.yaml b/lifecycle-operator/config/rbac/lifecycle_keptnappcreationrequest_editor_role.yaml similarity index 100% rename from operator/config/rbac/lifecycle_keptnappcreationrequest_editor_role.yaml rename to lifecycle-operator/config/rbac/lifecycle_keptnappcreationrequest_editor_role.yaml diff --git a/operator/config/rbac/lifecycle_keptnappcreationrequest_viewer_role.yaml b/lifecycle-operator/config/rbac/lifecycle_keptnappcreationrequest_viewer_role.yaml similarity index 100% rename from operator/config/rbac/lifecycle_keptnappcreationrequest_viewer_role.yaml rename to lifecycle-operator/config/rbac/lifecycle_keptnappcreationrequest_viewer_role.yaml diff --git a/operator/config/rbac/lifecycle_keptnappversion_editor_role.yaml b/lifecycle-operator/config/rbac/lifecycle_keptnappversion_editor_role.yaml similarity index 100% rename from operator/config/rbac/lifecycle_keptnappversion_editor_role.yaml rename to lifecycle-operator/config/rbac/lifecycle_keptnappversion_editor_role.yaml diff --git a/operator/config/rbac/lifecycle_keptnappversion_viewer_role.yaml b/lifecycle-operator/config/rbac/lifecycle_keptnappversion_viewer_role.yaml similarity index 100% rename from operator/config/rbac/lifecycle_keptnappversion_viewer_role.yaml rename to lifecycle-operator/config/rbac/lifecycle_keptnappversion_viewer_role.yaml diff --git a/operator/config/rbac/lifecycle_keptnevaluation_editor_role.yaml b/lifecycle-operator/config/rbac/lifecycle_keptnevaluation_editor_role.yaml similarity index 100% rename from operator/config/rbac/lifecycle_keptnevaluation_editor_role.yaml rename to lifecycle-operator/config/rbac/lifecycle_keptnevaluation_editor_role.yaml diff --git a/operator/config/rbac/lifecycle_keptnevaluation_viewer_role.yaml b/lifecycle-operator/config/rbac/lifecycle_keptnevaluation_viewer_role.yaml similarity index 100% rename from operator/config/rbac/lifecycle_keptnevaluation_viewer_role.yaml rename to lifecycle-operator/config/rbac/lifecycle_keptnevaluation_viewer_role.yaml diff --git a/operator/config/rbac/lifecycle_keptnevaluationdefinition_editor_role.yaml b/lifecycle-operator/config/rbac/lifecycle_keptnevaluationdefinition_editor_role.yaml similarity index 100% rename from operator/config/rbac/lifecycle_keptnevaluationdefinition_editor_role.yaml rename to lifecycle-operator/config/rbac/lifecycle_keptnevaluationdefinition_editor_role.yaml diff --git a/operator/config/rbac/lifecycle_keptnevaluationdefinition_viewer_role.yaml b/lifecycle-operator/config/rbac/lifecycle_keptnevaluationdefinition_viewer_role.yaml similarity index 100% rename from operator/config/rbac/lifecycle_keptnevaluationdefinition_viewer_role.yaml rename to lifecycle-operator/config/rbac/lifecycle_keptnevaluationdefinition_viewer_role.yaml diff --git a/operator/config/rbac/lifecycle_keptnevaluationprovider_editor_role.yaml b/lifecycle-operator/config/rbac/lifecycle_keptnevaluationprovider_editor_role.yaml similarity index 100% rename from operator/config/rbac/lifecycle_keptnevaluationprovider_editor_role.yaml rename to lifecycle-operator/config/rbac/lifecycle_keptnevaluationprovider_editor_role.yaml diff --git a/operator/config/rbac/lifecycle_keptnevaluationprovider_viewer_role.yaml b/lifecycle-operator/config/rbac/lifecycle_keptnevaluationprovider_viewer_role.yaml similarity index 100% rename from operator/config/rbac/lifecycle_keptnevaluationprovider_viewer_role.yaml rename to lifecycle-operator/config/rbac/lifecycle_keptnevaluationprovider_viewer_role.yaml diff --git a/operator/config/rbac/lifecycle_keptntask_editor_role.yaml b/lifecycle-operator/config/rbac/lifecycle_keptntask_editor_role.yaml similarity index 100% rename from operator/config/rbac/lifecycle_keptntask_editor_role.yaml rename to lifecycle-operator/config/rbac/lifecycle_keptntask_editor_role.yaml diff --git a/operator/config/rbac/lifecycle_keptntask_viewer_role.yaml b/lifecycle-operator/config/rbac/lifecycle_keptntask_viewer_role.yaml similarity index 100% rename from operator/config/rbac/lifecycle_keptntask_viewer_role.yaml rename to lifecycle-operator/config/rbac/lifecycle_keptntask_viewer_role.yaml diff --git a/operator/config/rbac/lifecycle_keptntaskdefinition_editor_role.yaml b/lifecycle-operator/config/rbac/lifecycle_keptntaskdefinition_editor_role.yaml similarity index 100% rename from operator/config/rbac/lifecycle_keptntaskdefinition_editor_role.yaml rename to lifecycle-operator/config/rbac/lifecycle_keptntaskdefinition_editor_role.yaml diff --git a/operator/config/rbac/lifecycle_keptntaskdefinition_viewer_role.yaml b/lifecycle-operator/config/rbac/lifecycle_keptntaskdefinition_viewer_role.yaml similarity index 100% rename from operator/config/rbac/lifecycle_keptntaskdefinition_viewer_role.yaml rename to lifecycle-operator/config/rbac/lifecycle_keptntaskdefinition_viewer_role.yaml diff --git a/operator/config/rbac/lifecycle_keptnworkload_editor_role.yaml b/lifecycle-operator/config/rbac/lifecycle_keptnworkload_editor_role.yaml similarity index 100% rename from operator/config/rbac/lifecycle_keptnworkload_editor_role.yaml rename to lifecycle-operator/config/rbac/lifecycle_keptnworkload_editor_role.yaml diff --git a/operator/config/rbac/lifecycle_keptnworkload_viewer_role.yaml b/lifecycle-operator/config/rbac/lifecycle_keptnworkload_viewer_role.yaml similarity index 100% rename from operator/config/rbac/lifecycle_keptnworkload_viewer_role.yaml rename to lifecycle-operator/config/rbac/lifecycle_keptnworkload_viewer_role.yaml diff --git a/operator/config/rbac/lifecycle_keptnworkloadinstance_editor_role.yaml b/lifecycle-operator/config/rbac/lifecycle_keptnworkloadinstance_editor_role.yaml similarity index 100% rename from operator/config/rbac/lifecycle_keptnworkloadinstance_editor_role.yaml rename to lifecycle-operator/config/rbac/lifecycle_keptnworkloadinstance_editor_role.yaml diff --git a/operator/config/rbac/lifecycle_keptnworkloadinstance_viewer_role.yaml b/lifecycle-operator/config/rbac/lifecycle_keptnworkloadinstance_viewer_role.yaml similarity index 100% rename from operator/config/rbac/lifecycle_keptnworkloadinstance_viewer_role.yaml rename to lifecycle-operator/config/rbac/lifecycle_keptnworkloadinstance_viewer_role.yaml diff --git a/operator/config/rbac/options_keptnconfig_editor_role.yaml b/lifecycle-operator/config/rbac/options_keptnconfig_editor_role.yaml similarity index 100% rename from operator/config/rbac/options_keptnconfig_editor_role.yaml rename to lifecycle-operator/config/rbac/options_keptnconfig_editor_role.yaml diff --git a/operator/config/rbac/options_keptnconfig_viewer_role.yaml b/lifecycle-operator/config/rbac/options_keptnconfig_viewer_role.yaml similarity index 100% rename from operator/config/rbac/options_keptnconfig_viewer_role.yaml rename to lifecycle-operator/config/rbac/options_keptnconfig_viewer_role.yaml diff --git a/operator/config/rbac/role.yaml b/lifecycle-operator/config/rbac/role.yaml similarity index 100% rename from operator/config/rbac/role.yaml rename to lifecycle-operator/config/rbac/role.yaml diff --git a/operator/config/rbac/role_binding.yaml b/lifecycle-operator/config/rbac/role_binding.yaml similarity index 100% rename from operator/config/rbac/role_binding.yaml rename to lifecycle-operator/config/rbac/role_binding.yaml diff --git a/operator/config/rbac/service_account.yaml b/lifecycle-operator/config/rbac/service_account.yaml similarity index 100% rename from operator/config/rbac/service_account.yaml rename to lifecycle-operator/config/rbac/service_account.yaml diff --git a/operator/config/rendered/.gitkeep b/lifecycle-operator/config/rendered/.gitkeep similarity index 100% rename from operator/config/rendered/.gitkeep rename to lifecycle-operator/config/rendered/.gitkeep diff --git a/operator/config/samples/deployment.yaml b/lifecycle-operator/config/samples/deployment.yaml similarity index 100% rename from operator/config/samples/deployment.yaml rename to lifecycle-operator/config/samples/deployment.yaml diff --git a/operator/config/samples/function_execution/task_schedule.yaml b/lifecycle-operator/config/samples/function_execution/task_schedule.yaml similarity index 100% rename from operator/config/samples/function_execution/task_schedule.yaml rename to lifecycle-operator/config/samples/function_execution/task_schedule.yaml diff --git a/operator/config/samples/function_execution/task_slack.yaml b/lifecycle-operator/config/samples/function_execution/task_slack.yaml similarity index 100% rename from operator/config/samples/function_execution/task_slack.yaml rename to lifecycle-operator/config/samples/function_execution/task_slack.yaml diff --git a/operator/config/samples/function_execution/taskdefinition_function.yaml b/lifecycle-operator/config/samples/function_execution/taskdefinition_function.yaml similarity index 100% rename from operator/config/samples/function_execution/taskdefinition_function.yaml rename to lifecycle-operator/config/samples/function_execution/taskdefinition_function.yaml diff --git a/operator/config/samples/function_execution/taskdefinition_function_configmap.yaml b/lifecycle-operator/config/samples/function_execution/taskdefinition_function_configmap.yaml similarity index 100% rename from operator/config/samples/function_execution/taskdefinition_function_configmap.yaml rename to lifecycle-operator/config/samples/function_execution/taskdefinition_function_configmap.yaml diff --git a/operator/config/samples/function_execution/taskdefinition_function_inline.yaml b/lifecycle-operator/config/samples/function_execution/taskdefinition_function_inline.yaml similarity index 100% rename from operator/config/samples/function_execution/taskdefinition_function_inline.yaml rename to lifecycle-operator/config/samples/function_execution/taskdefinition_function_inline.yaml diff --git a/operator/config/samples/function_execution/taskdefinition_function_inline_slack.yaml b/lifecycle-operator/config/samples/function_execution/taskdefinition_function_inline_slack.yaml similarity index 100% rename from operator/config/samples/function_execution/taskdefinition_function_inline_slack.yaml rename to lifecycle-operator/config/samples/function_execution/taskdefinition_function_inline_slack.yaml diff --git a/operator/config/samples/function_execution/taskdefinition_function_upstream.yaml b/lifecycle-operator/config/samples/function_execution/taskdefinition_function_upstream.yaml similarity index 100% rename from operator/config/samples/function_execution/taskdefinition_function_upstream.yaml rename to lifecycle-operator/config/samples/function_execution/taskdefinition_function_upstream.yaml diff --git a/operator/config/samples/function_execution/taskdefinition_function_upstream_scheduler.yaml b/lifecycle-operator/config/samples/function_execution/taskdefinition_function_upstream_scheduler.yaml similarity index 100% rename from operator/config/samples/function_execution/taskdefinition_function_upstream_scheduler.yaml rename to lifecycle-operator/config/samples/function_execution/taskdefinition_function_upstream_scheduler.yaml diff --git a/operator/config/samples/function_execution/taskdefinition_function_upstream_slack.yaml b/lifecycle-operator/config/samples/function_execution/taskdefinition_function_upstream_slack.yaml similarity index 100% rename from operator/config/samples/function_execution/taskdefinition_function_upstream_slack.yaml rename to lifecycle-operator/config/samples/function_execution/taskdefinition_function_upstream_slack.yaml diff --git a/operator/config/samples/lifecycle_v1alpha1_keptnapp.yaml b/lifecycle-operator/config/samples/lifecycle_v1alpha1_keptnapp.yaml similarity index 100% rename from operator/config/samples/lifecycle_v1alpha1_keptnapp.yaml rename to lifecycle-operator/config/samples/lifecycle_v1alpha1_keptnapp.yaml diff --git a/operator/config/samples/lifecycle_v1alpha1_keptnappversion.yaml b/lifecycle-operator/config/samples/lifecycle_v1alpha1_keptnappversion.yaml similarity index 100% rename from operator/config/samples/lifecycle_v1alpha1_keptnappversion.yaml rename to lifecycle-operator/config/samples/lifecycle_v1alpha1_keptnappversion.yaml diff --git a/operator/config/samples/lifecycle_v1alpha1_keptnevaluation.yaml b/lifecycle-operator/config/samples/lifecycle_v1alpha1_keptnevaluation.yaml similarity index 100% rename from operator/config/samples/lifecycle_v1alpha1_keptnevaluation.yaml rename to lifecycle-operator/config/samples/lifecycle_v1alpha1_keptnevaluation.yaml diff --git a/operator/config/samples/lifecycle_v1alpha1_keptnevaluationdefinition.yaml b/lifecycle-operator/config/samples/lifecycle_v1alpha1_keptnevaluationdefinition.yaml similarity index 100% rename from operator/config/samples/lifecycle_v1alpha1_keptnevaluationdefinition.yaml rename to lifecycle-operator/config/samples/lifecycle_v1alpha1_keptnevaluationdefinition.yaml diff --git a/operator/config/samples/lifecycle_v1alpha1_keptnevaluationprovider.yaml b/lifecycle-operator/config/samples/lifecycle_v1alpha1_keptnevaluationprovider.yaml similarity index 100% rename from operator/config/samples/lifecycle_v1alpha1_keptnevaluationprovider.yaml rename to lifecycle-operator/config/samples/lifecycle_v1alpha1_keptnevaluationprovider.yaml diff --git a/operator/config/samples/lifecycle_v1alpha1_keptntask.yaml b/lifecycle-operator/config/samples/lifecycle_v1alpha1_keptntask.yaml similarity index 100% rename from operator/config/samples/lifecycle_v1alpha1_keptntask.yaml rename to lifecycle-operator/config/samples/lifecycle_v1alpha1_keptntask.yaml diff --git a/operator/config/samples/lifecycle_v1alpha1_keptntaskdefinition.yaml b/lifecycle-operator/config/samples/lifecycle_v1alpha1_keptntaskdefinition.yaml similarity index 100% rename from operator/config/samples/lifecycle_v1alpha1_keptntaskdefinition.yaml rename to lifecycle-operator/config/samples/lifecycle_v1alpha1_keptntaskdefinition.yaml diff --git a/operator/config/samples/lifecycle_v1alpha1_keptnworkload.yaml b/lifecycle-operator/config/samples/lifecycle_v1alpha1_keptnworkload.yaml similarity index 100% rename from operator/config/samples/lifecycle_v1alpha1_keptnworkload.yaml rename to lifecycle-operator/config/samples/lifecycle_v1alpha1_keptnworkload.yaml diff --git a/operator/config/samples/lifecycle_v1alpha1_keptnworkloadinstance.yaml b/lifecycle-operator/config/samples/lifecycle_v1alpha1_keptnworkloadinstance.yaml similarity index 100% rename from operator/config/samples/lifecycle_v1alpha1_keptnworkloadinstance.yaml rename to lifecycle-operator/config/samples/lifecycle_v1alpha1_keptnworkloadinstance.yaml diff --git a/operator/config/samples/lifecycle_v1alpha2_keptnapp.yaml b/lifecycle-operator/config/samples/lifecycle_v1alpha2_keptnapp.yaml similarity index 100% rename from operator/config/samples/lifecycle_v1alpha2_keptnapp.yaml rename to lifecycle-operator/config/samples/lifecycle_v1alpha2_keptnapp.yaml diff --git a/operator/config/samples/lifecycle_v1alpha2_keptnappversion.yaml b/lifecycle-operator/config/samples/lifecycle_v1alpha2_keptnappversion.yaml similarity index 100% rename from operator/config/samples/lifecycle_v1alpha2_keptnappversion.yaml rename to lifecycle-operator/config/samples/lifecycle_v1alpha2_keptnappversion.yaml diff --git a/operator/config/samples/lifecycle_v1alpha2_keptnevaluation.yaml b/lifecycle-operator/config/samples/lifecycle_v1alpha2_keptnevaluation.yaml similarity index 100% rename from operator/config/samples/lifecycle_v1alpha2_keptnevaluation.yaml rename to lifecycle-operator/config/samples/lifecycle_v1alpha2_keptnevaluation.yaml diff --git a/operator/config/samples/lifecycle_v1alpha2_keptnevaluationdefinition.yaml b/lifecycle-operator/config/samples/lifecycle_v1alpha2_keptnevaluationdefinition.yaml similarity index 100% rename from operator/config/samples/lifecycle_v1alpha2_keptnevaluationdefinition.yaml rename to lifecycle-operator/config/samples/lifecycle_v1alpha2_keptnevaluationdefinition.yaml diff --git a/operator/config/samples/lifecycle_v1alpha2_keptnevaluationprovider.yaml b/lifecycle-operator/config/samples/lifecycle_v1alpha2_keptnevaluationprovider.yaml similarity index 100% rename from operator/config/samples/lifecycle_v1alpha2_keptnevaluationprovider.yaml rename to lifecycle-operator/config/samples/lifecycle_v1alpha2_keptnevaluationprovider.yaml diff --git a/operator/config/samples/lifecycle_v1alpha2_keptntask.yaml b/lifecycle-operator/config/samples/lifecycle_v1alpha2_keptntask.yaml similarity index 100% rename from operator/config/samples/lifecycle_v1alpha2_keptntask.yaml rename to lifecycle-operator/config/samples/lifecycle_v1alpha2_keptntask.yaml diff --git a/operator/config/samples/lifecycle_v1alpha2_keptntaskdefinition.yaml b/lifecycle-operator/config/samples/lifecycle_v1alpha2_keptntaskdefinition.yaml similarity index 100% rename from operator/config/samples/lifecycle_v1alpha2_keptntaskdefinition.yaml rename to lifecycle-operator/config/samples/lifecycle_v1alpha2_keptntaskdefinition.yaml diff --git a/operator/config/samples/lifecycle_v1alpha2_keptnworkload.yaml b/lifecycle-operator/config/samples/lifecycle_v1alpha2_keptnworkload.yaml similarity index 100% rename from operator/config/samples/lifecycle_v1alpha2_keptnworkload.yaml rename to lifecycle-operator/config/samples/lifecycle_v1alpha2_keptnworkload.yaml diff --git a/operator/config/samples/lifecycle_v1alpha2_keptnworkloadinstance.yaml b/lifecycle-operator/config/samples/lifecycle_v1alpha2_keptnworkloadinstance.yaml similarity index 100% rename from operator/config/samples/lifecycle_v1alpha2_keptnworkloadinstance.yaml rename to lifecycle-operator/config/samples/lifecycle_v1alpha2_keptnworkloadinstance.yaml diff --git a/operator/config/samples/lifecycle_v1alpha3_keptnapp.yaml b/lifecycle-operator/config/samples/lifecycle_v1alpha3_keptnapp.yaml similarity index 100% rename from operator/config/samples/lifecycle_v1alpha3_keptnapp.yaml rename to lifecycle-operator/config/samples/lifecycle_v1alpha3_keptnapp.yaml diff --git a/operator/config/samples/lifecycle_v1alpha3_keptnappcreationrequest.yaml b/lifecycle-operator/config/samples/lifecycle_v1alpha3_keptnappcreationrequest.yaml similarity index 100% rename from operator/config/samples/lifecycle_v1alpha3_keptnappcreationrequest.yaml rename to lifecycle-operator/config/samples/lifecycle_v1alpha3_keptnappcreationrequest.yaml diff --git a/operator/config/samples/lifecycle_v1alpha3_keptnappversion.yaml b/lifecycle-operator/config/samples/lifecycle_v1alpha3_keptnappversion.yaml similarity index 100% rename from operator/config/samples/lifecycle_v1alpha3_keptnappversion.yaml rename to lifecycle-operator/config/samples/lifecycle_v1alpha3_keptnappversion.yaml diff --git a/operator/config/samples/lifecycle_v1alpha3_keptnevaluation.yaml b/lifecycle-operator/config/samples/lifecycle_v1alpha3_keptnevaluation.yaml similarity index 100% rename from operator/config/samples/lifecycle_v1alpha3_keptnevaluation.yaml rename to lifecycle-operator/config/samples/lifecycle_v1alpha3_keptnevaluation.yaml diff --git a/operator/config/samples/lifecycle_v1alpha3_keptnevaluationdefinition.yaml b/lifecycle-operator/config/samples/lifecycle_v1alpha3_keptnevaluationdefinition.yaml similarity index 100% rename from operator/config/samples/lifecycle_v1alpha3_keptnevaluationdefinition.yaml rename to lifecycle-operator/config/samples/lifecycle_v1alpha3_keptnevaluationdefinition.yaml diff --git a/operator/config/samples/lifecycle_v1alpha3_keptnevaluationprovider.yaml b/lifecycle-operator/config/samples/lifecycle_v1alpha3_keptnevaluationprovider.yaml similarity index 100% rename from operator/config/samples/lifecycle_v1alpha3_keptnevaluationprovider.yaml rename to lifecycle-operator/config/samples/lifecycle_v1alpha3_keptnevaluationprovider.yaml diff --git a/operator/config/samples/lifecycle_v1alpha3_keptntask.yaml b/lifecycle-operator/config/samples/lifecycle_v1alpha3_keptntask.yaml similarity index 100% rename from operator/config/samples/lifecycle_v1alpha3_keptntask.yaml rename to lifecycle-operator/config/samples/lifecycle_v1alpha3_keptntask.yaml diff --git a/operator/config/samples/lifecycle_v1alpha3_keptntaskdefinition_container.yaml b/lifecycle-operator/config/samples/lifecycle_v1alpha3_keptntaskdefinition_container.yaml similarity index 100% rename from operator/config/samples/lifecycle_v1alpha3_keptntaskdefinition_container.yaml rename to lifecycle-operator/config/samples/lifecycle_v1alpha3_keptntaskdefinition_container.yaml diff --git a/operator/config/samples/lifecycle_v1alpha3_keptntaskdefinition_js.yaml b/lifecycle-operator/config/samples/lifecycle_v1alpha3_keptntaskdefinition_js.yaml similarity index 100% rename from operator/config/samples/lifecycle_v1alpha3_keptntaskdefinition_js.yaml rename to lifecycle-operator/config/samples/lifecycle_v1alpha3_keptntaskdefinition_js.yaml diff --git a/operator/config/samples/lifecycle_v1alpha3_keptnworkload.yaml b/lifecycle-operator/config/samples/lifecycle_v1alpha3_keptnworkload.yaml similarity index 100% rename from operator/config/samples/lifecycle_v1alpha3_keptnworkload.yaml rename to lifecycle-operator/config/samples/lifecycle_v1alpha3_keptnworkload.yaml diff --git a/operator/config/samples/lifecycle_v1alpha3_keptnworkloadinstance.yaml b/lifecycle-operator/config/samples/lifecycle_v1alpha3_keptnworkloadinstance.yaml similarity index 100% rename from operator/config/samples/lifecycle_v1alpha3_keptnworkloadinstance.yaml rename to lifecycle-operator/config/samples/lifecycle_v1alpha3_keptnworkloadinstance.yaml diff --git a/operator/config/samples/options_v1alpha1_keptnconfig.yaml b/lifecycle-operator/config/samples/options_v1alpha1_keptnconfig.yaml similarity index 100% rename from operator/config/samples/options_v1alpha1_keptnconfig.yaml rename to lifecycle-operator/config/samples/options_v1alpha1_keptnconfig.yaml diff --git a/operator/config/samples/python_execution/taskdefinition_pyfunction_configmap.yaml b/lifecycle-operator/config/samples/python_execution/taskdefinition_pyfunction_configmap.yaml similarity index 100% rename from operator/config/samples/python_execution/taskdefinition_pyfunction_configmap.yaml rename to lifecycle-operator/config/samples/python_execution/taskdefinition_pyfunction_configmap.yaml diff --git a/operator/config/samples/python_execution/taskdefinition_pyfunction_inline.yaml b/lifecycle-operator/config/samples/python_execution/taskdefinition_pyfunction_inline.yaml similarity index 100% rename from operator/config/samples/python_execution/taskdefinition_pyfunction_inline.yaml rename to lifecycle-operator/config/samples/python_execution/taskdefinition_pyfunction_inline.yaml diff --git a/operator/config/samples/python_execution/taskdefinition_pyfunction_inline_printargs_py.yaml b/lifecycle-operator/config/samples/python_execution/taskdefinition_pyfunction_inline_printargs_py.yaml similarity index 100% rename from operator/config/samples/python_execution/taskdefinition_pyfunction_inline_printargs_py.yaml rename to lifecycle-operator/config/samples/python_execution/taskdefinition_pyfunction_inline_printargs_py.yaml diff --git a/operator/config/samples/python_execution/taskdefinition_pyfunction_recursive.yaml b/lifecycle-operator/config/samples/python_execution/taskdefinition_pyfunction_recursive.yaml similarity index 100% rename from operator/config/samples/python_execution/taskdefinition_pyfunction_recursive.yaml rename to lifecycle-operator/config/samples/python_execution/taskdefinition_pyfunction_recursive.yaml diff --git a/operator/config/samples/python_execution/taskdefinition_pyfunction_upstream_hellopy.yaml b/lifecycle-operator/config/samples/python_execution/taskdefinition_pyfunction_upstream_hellopy.yaml similarity index 100% rename from operator/config/samples/python_execution/taskdefinition_pyfunction_upstream_hellopy.yaml rename to lifecycle-operator/config/samples/python_execution/taskdefinition_pyfunction_upstream_hellopy.yaml diff --git a/operator/config/samples/python_execution/taskdefinition_pyfunction_use_envvars.yaml b/lifecycle-operator/config/samples/python_execution/taskdefinition_pyfunction_use_envvars.yaml similarity index 100% rename from operator/config/samples/python_execution/taskdefinition_pyfunction_use_envvars.yaml rename to lifecycle-operator/config/samples/python_execution/taskdefinition_pyfunction_use_envvars.yaml diff --git a/operator/config/webhook/kustomization.yaml b/lifecycle-operator/config/webhook/kustomization.yaml similarity index 100% rename from operator/config/webhook/kustomization.yaml rename to lifecycle-operator/config/webhook/kustomization.yaml diff --git a/operator/config/webhook/kustomizeconfig.yaml b/lifecycle-operator/config/webhook/kustomizeconfig.yaml similarity index 100% rename from operator/config/webhook/kustomizeconfig.yaml rename to lifecycle-operator/config/webhook/kustomizeconfig.yaml diff --git a/operator/config/webhook/manifests.yaml b/lifecycle-operator/config/webhook/manifests.yaml similarity index 100% rename from operator/config/webhook/manifests.yaml rename to lifecycle-operator/config/webhook/manifests.yaml diff --git a/operator/config/webhook/service.yaml b/lifecycle-operator/config/webhook/service.yaml similarity index 100% rename from operator/config/webhook/service.yaml rename to lifecycle-operator/config/webhook/service.yaml diff --git a/operator/controllers/common/config/config.go b/lifecycle-operator/controllers/common/config/config.go similarity index 100% rename from operator/controllers/common/config/config.go rename to lifecycle-operator/controllers/common/config/config.go diff --git a/operator/controllers/common/config/config_test.go b/lifecycle-operator/controllers/common/config/config_test.go similarity index 100% rename from operator/controllers/common/config/config_test.go rename to lifecycle-operator/controllers/common/config/config_test.go diff --git a/operator/controllers/common/config/fake/config_mock.go b/lifecycle-operator/controllers/common/config/fake/config_mock.go similarity index 100% rename from operator/controllers/common/config/fake/config_mock.go rename to lifecycle-operator/controllers/common/config/fake/config_mock.go diff --git a/operator/controllers/common/evaluationhandler.go b/lifecycle-operator/controllers/common/evaluationhandler.go similarity index 95% rename from operator/controllers/common/evaluationhandler.go rename to lifecycle-operator/controllers/common/evaluationhandler.go index 78148b01a7..8a889b133f 100644 --- a/operator/controllers/common/evaluationhandler.go +++ b/lifecycle-operator/controllers/common/evaluationhandler.go @@ -6,10 +6,10 @@ import ( "time" "github.com/go-logr/logr" - klcv1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - apicommon "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" - controllererrors "github.com/keptn/lifecycle-toolkit/operator/controllers/errors" - "github.com/keptn/lifecycle-toolkit/operator/controllers/lifecycle/interfaces" + klcv1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + apicommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" + controllererrors "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/errors" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/lifecycle/interfaces" "go.opentelemetry.io/otel/codes" "go.opentelemetry.io/otel/trace" "k8s.io/apimachinery/pkg/api/errors" diff --git a/operator/controllers/common/evaluationhandler_test.go b/lifecycle-operator/controllers/common/evaluationhandler_test.go similarity index 96% rename from operator/controllers/common/evaluationhandler_test.go rename to lifecycle-operator/controllers/common/evaluationhandler_test.go index 9f2394620a..74242b0af5 100644 --- a/operator/controllers/common/evaluationhandler_test.go +++ b/lifecycle-operator/controllers/common/evaluationhandler_test.go @@ -6,10 +6,10 @@ import ( "strings" "testing" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - apicommon "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" - kltfake "github.com/keptn/lifecycle-toolkit/operator/controllers/common/fake" - controllererrors "github.com/keptn/lifecycle-toolkit/operator/controllers/errors" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + apicommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" + kltfake "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common/fake" + controllererrors "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/errors" "github.com/stretchr/testify/require" "go.opentelemetry.io/otel/trace" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/operator/controllers/common/eventsender.go b/lifecycle-operator/controllers/common/eventsender.go similarity index 88% rename from operator/controllers/common/eventsender.go rename to lifecycle-operator/controllers/common/eventsender.go index efbcf3131f..cce0c7ae2c 100644 --- a/operator/controllers/common/eventsender.go +++ b/lifecycle-operator/controllers/common/eventsender.go @@ -3,7 +3,7 @@ package common import ( "fmt" - apicommon "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" + apicommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" "k8s.io/client-go/tools/record" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/operator/controllers/common/eventsender_test.go b/lifecycle-operator/controllers/common/eventsender_test.go similarity index 80% rename from operator/controllers/common/eventsender_test.go rename to lifecycle-operator/controllers/common/eventsender_test.go index 9f2138690d..715178b2df 100644 --- a/operator/controllers/common/eventsender_test.go +++ b/lifecycle-operator/controllers/common/eventsender_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" "github.com/stretchr/testify/require" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/tools/record" diff --git a/operator/controllers/common/fake/fakeclient.go b/lifecycle-operator/controllers/common/fake/fakeclient.go similarity index 83% rename from operator/controllers/common/fake/fakeclient.go rename to lifecycle-operator/controllers/common/fake/fakeclient.go index 7e911bcb8f..1b5e48eaf7 100644 --- a/operator/controllers/common/fake/fakeclient.go +++ b/lifecycle-operator/controllers/common/fake/fakeclient.go @@ -1,8 +1,8 @@ package fake import ( - lfcv1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - optionsv1alpha1 "github.com/keptn/lifecycle-toolkit/operator/apis/options/v1alpha1" + lfcv1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + optionsv1alpha1 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/options/v1alpha1" corev1 "k8s.io/api/core/v1" apiv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" utilruntime "k8s.io/apimachinery/pkg/util/runtime" diff --git a/operator/controllers/common/fake/spanhandler_mock.go b/lifecycle-operator/controllers/common/fake/spanhandler_mock.go similarity index 100% rename from operator/controllers/common/fake/spanhandler_mock.go rename to lifecycle-operator/controllers/common/fake/spanhandler_mock.go diff --git a/operator/controllers/common/fake/tracer_mock.go b/lifecycle-operator/controllers/common/fake/tracer_mock.go similarity index 100% rename from operator/controllers/common/fake/tracer_mock.go rename to lifecycle-operator/controllers/common/fake/tracer_mock.go diff --git a/operator/controllers/common/fake/tracerfactory_mock.go b/lifecycle-operator/controllers/common/fake/tracerfactory_mock.go similarity index 100% rename from operator/controllers/common/fake/tracerfactory_mock.go rename to lifecycle-operator/controllers/common/fake/tracerfactory_mock.go diff --git a/operator/controllers/common/helperfunctions.go b/lifecycle-operator/controllers/common/helperfunctions.go similarity index 93% rename from operator/controllers/common/helperfunctions.go rename to lifecycle-operator/controllers/common/helperfunctions.go index cc9002c24c..333f0be7d2 100644 --- a/operator/controllers/common/helperfunctions.go +++ b/lifecycle-operator/controllers/common/helperfunctions.go @@ -5,9 +5,9 @@ import ( "fmt" "github.com/go-logr/logr" - klcv1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - apicommon "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" - "github.com/keptn/lifecycle-toolkit/operator/controllers/lifecycle/interfaces" + klcv1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + apicommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/lifecycle/interfaces" k8serrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/operator/controllers/common/helperfunctions_test.go b/lifecycle-operator/controllers/common/helperfunctions_test.go similarity index 98% rename from operator/controllers/common/helperfunctions_test.go rename to lifecycle-operator/controllers/common/helperfunctions_test.go index 33126e8810..3393c9c49d 100644 --- a/operator/controllers/common/helperfunctions_test.go +++ b/lifecycle-operator/controllers/common/helperfunctions_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - klcv1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - apicommon "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" + klcv1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + apicommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" "github.com/stretchr/testify/require" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes/scheme" diff --git a/operator/controllers/common/metrics.go b/lifecycle-operator/controllers/common/metrics.go similarity index 95% rename from operator/controllers/common/metrics.go rename to lifecycle-operator/controllers/common/metrics.go index 298a4b8f78..7da45afd30 100644 --- a/operator/controllers/common/metrics.go +++ b/lifecycle-operator/controllers/common/metrics.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - controllererrors "github.com/keptn/lifecycle-toolkit/operator/controllers/errors" - "github.com/keptn/lifecycle-toolkit/operator/controllers/lifecycle/interfaces" + controllererrors "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/errors" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/lifecycle/interfaces" "go.opentelemetry.io/otel/metric" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/operator/controllers/common/metrics_test.go b/lifecycle-operator/controllers/common/metrics_test.go similarity index 97% rename from operator/controllers/common/metrics_test.go rename to lifecycle-operator/controllers/common/metrics_test.go index 4bfcfb46f1..45a77d703e 100644 --- a/operator/controllers/common/metrics_test.go +++ b/lifecycle-operator/controllers/common/metrics_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" - lifecyclev1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - controllererrors "github.com/keptn/lifecycle-toolkit/operator/controllers/errors" - "github.com/keptn/lifecycle-toolkit/operator/controllers/lifecycle/interfaces" + lifecyclev1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + controllererrors "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/errors" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/lifecycle/interfaces" "github.com/stretchr/testify/require" "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/metric/noop" diff --git a/operator/controllers/common/otel_utils.go b/lifecycle-operator/controllers/common/otel_utils.go similarity index 97% rename from operator/controllers/common/otel_utils.go rename to lifecycle-operator/controllers/common/otel_utils.go index ef255d830c..695dd39bfd 100644 --- a/operator/controllers/common/otel_utils.go +++ b/lifecycle-operator/controllers/common/otel_utils.go @@ -7,9 +7,9 @@ import ( "sync" "time" - lifecyclev1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" - "github.com/keptn/lifecycle-toolkit/operator/controllers/lifecycle/interfaces" + lifecyclev1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/lifecycle/interfaces" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc" "go.opentelemetry.io/otel/exporters/stdout/stdouttrace" diff --git a/operator/controllers/common/otel_utils_test.go b/lifecycle-operator/controllers/common/otel_utils_test.go similarity index 96% rename from operator/controllers/common/otel_utils_test.go rename to lifecycle-operator/controllers/common/otel_utils_test.go index d85cbd58dc..769f5fce85 100644 --- a/operator/controllers/common/otel_utils_test.go +++ b/lifecycle-operator/controllers/common/otel_utils_test.go @@ -4,8 +4,8 @@ import ( "net" "testing" - "github.com/keptn/lifecycle-toolkit/operator/controllers/lifecycle/interfaces" - "github.com/keptn/lifecycle-toolkit/operator/controllers/lifecycle/interfaces/fake" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/lifecycle/interfaces" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/lifecycle/interfaces/fake" "github.com/pkg/errors" "github.com/stretchr/testify/require" "go.opentelemetry.io/otel/metric" @@ -64,7 +64,7 @@ func TestGetOTelTracerProviderOptions(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - //TODO also test underline return + // TODO also test underline return got, _, err := GetOTelTracerProviderOptions(tt.args.oTelCollectorUrl) if (err != nil) != tt.wantErr { t.Errorf("GetOTelTracerProviderOptions() error = %v, wantErr %v", err, tt.wantErr) diff --git a/operator/controllers/common/phasehandler.go b/lifecycle-operator/controllers/common/phasehandler.go similarity index 93% rename from operator/controllers/common/phasehandler.go rename to lifecycle-operator/controllers/common/phasehandler.go index 4fe8b77158..80b9556351 100644 --- a/operator/controllers/common/phasehandler.go +++ b/lifecycle-operator/controllers/common/phasehandler.go @@ -5,9 +5,9 @@ import ( "time" "github.com/go-logr/logr" - apicommon "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" - controllererrors "github.com/keptn/lifecycle-toolkit/operator/controllers/errors" - "github.com/keptn/lifecycle-toolkit/operator/controllers/lifecycle/interfaces" + apicommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" + controllererrors "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/errors" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/lifecycle/interfaces" "go.opentelemetry.io/otel/codes" "go.opentelemetry.io/otel/trace" ctrl "sigs.k8s.io/controller-runtime" diff --git a/operator/controllers/common/phasehandler_test.go b/lifecycle-operator/controllers/common/phasehandler_test.go similarity index 97% rename from operator/controllers/common/phasehandler_test.go rename to lifecycle-operator/controllers/common/phasehandler_test.go index 3ab592b814..4b5db6ee1d 100644 --- a/operator/controllers/common/phasehandler_test.go +++ b/lifecycle-operator/controllers/common/phasehandler_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - apicommon "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + apicommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" "github.com/stretchr/testify/require" "go.opentelemetry.io/otel/trace" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/operator/controllers/common/providers/common.go b/lifecycle-operator/controllers/common/providers/common.go similarity index 100% rename from operator/controllers/common/providers/common.go rename to lifecycle-operator/controllers/common/providers/common.go diff --git a/operator/controllers/common/providers/keptnmetric/keptnmetric.go b/lifecycle-operator/controllers/common/providers/keptnmetric/keptnmetric.go similarity index 93% rename from operator/controllers/common/providers/keptnmetric/keptnmetric.go rename to lifecycle-operator/controllers/common/providers/keptnmetric/keptnmetric.go index 8212fb9af7..5baf001e0e 100644 --- a/operator/controllers/common/providers/keptnmetric/keptnmetric.go +++ b/lifecycle-operator/controllers/common/providers/keptnmetric/keptnmetric.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/go-logr/logr" - klcv1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - "github.com/keptn/lifecycle-toolkit/operator/controllers/common" + klcv1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/operator/controllers/common/providers/keptnmetric/keptnmetric_test.go b/lifecycle-operator/controllers/common/providers/keptnmetric/keptnmetric_test.go similarity index 94% rename from operator/controllers/common/providers/keptnmetric/keptnmetric_test.go rename to lifecycle-operator/controllers/common/providers/keptnmetric/keptnmetric_test.go index 51152b9487..2383097343 100644 --- a/operator/controllers/common/providers/keptnmetric/keptnmetric_test.go +++ b/lifecycle-operator/controllers/common/providers/keptnmetric/keptnmetric_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - klcv1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - "github.com/keptn/lifecycle-toolkit/operator/controllers/common" - metricsapi "github.com/keptn/lifecycle-toolkit/operator/test/api/metrics/v1alpha3" + klcv1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common" + metricsapi "github.com/keptn/lifecycle-toolkit/lifecycle-operator/test/api/metrics/v1alpha3" "github.com/stretchr/testify/require" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" @@ -95,7 +95,7 @@ func Test_keptnmetric(t *testing.T) { r, _, e := kmp.FetchData(context.TODO(), obj, "default") require.Equal(t, tt.out, r) - //require.Equal(t, tt.outraw, raw) + // require.Equal(t, tt.outraw, raw) if tt.wantError != (e != nil) { t.Errorf("want error: %t, got: %v", tt.wantError, e) } diff --git a/operator/controllers/common/spanhandler.go b/lifecycle-operator/controllers/common/spanhandler.go similarity index 95% rename from operator/controllers/common/spanhandler.go rename to lifecycle-operator/controllers/common/spanhandler.go index f45887ac37..7560b463db 100644 --- a/operator/controllers/common/spanhandler.go +++ b/lifecycle-operator/controllers/common/spanhandler.go @@ -4,7 +4,7 @@ import ( "context" "sync" - "github.com/keptn/lifecycle-toolkit/operator/controllers/lifecycle/interfaces" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/lifecycle/interfaces" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/propagation" "go.opentelemetry.io/otel/trace" diff --git a/operator/controllers/common/spanhandler_test.go b/lifecycle-operator/controllers/common/spanhandler_test.go similarity index 93% rename from operator/controllers/common/spanhandler_test.go rename to lifecycle-operator/controllers/common/spanhandler_test.go index aba47cec2f..1ba377c446 100644 --- a/operator/controllers/common/spanhandler_test.go +++ b/lifecycle-operator/controllers/common/spanhandler_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - apicommon "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + apicommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" "github.com/stretchr/testify/require" "go.opentelemetry.io/otel" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/operator/controllers/common/taskdefinitionhandler.go b/lifecycle-operator/controllers/common/taskdefinitionhandler.go similarity index 92% rename from operator/controllers/common/taskdefinitionhandler.go rename to lifecycle-operator/controllers/common/taskdefinitionhandler.go index 2ff69b63a6..d744aff584 100644 --- a/operator/controllers/common/taskdefinitionhandler.go +++ b/lifecycle-operator/controllers/common/taskdefinitionhandler.go @@ -4,8 +4,8 @@ import ( "os" "reflect" - klcv1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - apicommon "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" + klcv1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + apicommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" ) const ( diff --git a/operator/controllers/common/taskdefinitionhandler_test.go b/lifecycle-operator/controllers/common/taskdefinitionhandler_test.go similarity index 99% rename from operator/controllers/common/taskdefinitionhandler_test.go rename to lifecycle-operator/controllers/common/taskdefinitionhandler_test.go index f1cab3b329..9fe9eb9699 100644 --- a/operator/controllers/common/taskdefinitionhandler_test.go +++ b/lifecycle-operator/controllers/common/taskdefinitionhandler_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - klcv1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" + klcv1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" ) diff --git a/operator/controllers/common/taskhandler.go b/lifecycle-operator/controllers/common/taskhandler.go similarity index 94% rename from operator/controllers/common/taskhandler.go rename to lifecycle-operator/controllers/common/taskhandler.go index eaf790fe8a..8713b12da0 100644 --- a/operator/controllers/common/taskhandler.go +++ b/lifecycle-operator/controllers/common/taskhandler.go @@ -6,10 +6,10 @@ import ( "time" "github.com/go-logr/logr" - klcv1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - apicommon "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" - controllererrors "github.com/keptn/lifecycle-toolkit/operator/controllers/errors" - "github.com/keptn/lifecycle-toolkit/operator/controllers/lifecycle/interfaces" + klcv1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + apicommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" + controllererrors "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/errors" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/lifecycle/interfaces" "go.opentelemetry.io/otel/codes" "go.opentelemetry.io/otel/trace" "k8s.io/apimachinery/pkg/api/errors" diff --git a/operator/controllers/common/taskhandler_test.go b/lifecycle-operator/controllers/common/taskhandler_test.go similarity index 97% rename from operator/controllers/common/taskhandler_test.go rename to lifecycle-operator/controllers/common/taskhandler_test.go index 285865fdfc..37dad2bf52 100644 --- a/operator/controllers/common/taskhandler_test.go +++ b/lifecycle-operator/controllers/common/taskhandler_test.go @@ -5,10 +5,10 @@ import ( "strings" "testing" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - apicommon "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" - kltfake "github.com/keptn/lifecycle-toolkit/operator/controllers/common/fake" - controllererrors "github.com/keptn/lifecycle-toolkit/operator/controllers/errors" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + apicommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" + kltfake "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common/fake" + controllererrors "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/errors" "github.com/stretchr/testify/require" "go.opentelemetry.io/otel/trace" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/operator/controllers/common/test_utils.go b/lifecycle-operator/controllers/common/test_utils.go similarity index 93% rename from operator/controllers/common/test_utils.go rename to lifecycle-operator/controllers/common/test_utils.go index 6ec5dfd62c..3cd124b1ef 100644 --- a/operator/controllers/common/test_utils.go +++ b/lifecycle-operator/controllers/common/test_utils.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - lfcv1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - apicommon "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" + lfcv1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + apicommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" "go.opentelemetry.io/otel/metric" sdkmetric "go.opentelemetry.io/otel/sdk/metric" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/operator/controllers/common/tracer.go b/lifecycle-operator/controllers/common/tracer.go similarity index 100% rename from operator/controllers/common/tracer.go rename to lifecycle-operator/controllers/common/tracer.go diff --git a/operator/controllers/errors/errors.go b/lifecycle-operator/controllers/errors/errors.go similarity index 100% rename from operator/controllers/errors/errors.go rename to lifecycle-operator/controllers/errors/errors.go diff --git a/operator/controllers/lifecycle/interfaces/activemetricsobject.go b/lifecycle-operator/controllers/lifecycle/interfaces/activemetricsobject.go similarity index 92% rename from operator/controllers/lifecycle/interfaces/activemetricsobject.go rename to lifecycle-operator/controllers/lifecycle/interfaces/activemetricsobject.go index c75263ae49..d16eb33311 100644 --- a/operator/controllers/lifecycle/interfaces/activemetricsobject.go +++ b/lifecycle-operator/controllers/lifecycle/interfaces/activemetricsobject.go @@ -1,7 +1,7 @@ package interfaces import ( - "github.com/keptn/lifecycle-toolkit/operator/controllers/errors" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/errors" "go.opentelemetry.io/otel/attribute" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/operator/controllers/lifecycle/interfaces/activemetricsobject_test.go b/lifecycle-operator/controllers/lifecycle/interfaces/activemetricsobject_test.go similarity index 78% rename from operator/controllers/lifecycle/interfaces/activemetricsobject_test.go rename to lifecycle-operator/controllers/lifecycle/interfaces/activemetricsobject_test.go index d0bb0543a7..f14fb8ba50 100644 --- a/operator/controllers/lifecycle/interfaces/activemetricsobject_test.go +++ b/lifecycle-operator/controllers/lifecycle/interfaces/activemetricsobject_test.go @@ -3,9 +3,9 @@ package interfaces import ( "testing" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - apicommon "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" - "github.com/keptn/lifecycle-toolkit/operator/controllers/lifecycle/interfaces/fake" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + apicommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/lifecycle/interfaces/fake" "github.com/stretchr/testify/require" "go.opentelemetry.io/otel/attribute" ) diff --git a/operator/controllers/lifecycle/interfaces/controller.go b/lifecycle-operator/controllers/lifecycle/interfaces/controller.go similarity index 100% rename from operator/controllers/lifecycle/interfaces/controller.go rename to lifecycle-operator/controllers/lifecycle/interfaces/controller.go diff --git a/operator/controllers/lifecycle/interfaces/eventobject.go b/lifecycle-operator/controllers/lifecycle/interfaces/eventobject.go similarity index 90% rename from operator/controllers/lifecycle/interfaces/eventobject.go rename to lifecycle-operator/controllers/lifecycle/interfaces/eventobject.go index 43f5f8f8bc..b2732cae77 100644 --- a/operator/controllers/lifecycle/interfaces/eventobject.go +++ b/lifecycle-operator/controllers/lifecycle/interfaces/eventobject.go @@ -1,7 +1,7 @@ package interfaces import ( - "github.com/keptn/lifecycle-toolkit/operator/controllers/errors" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/errors" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/operator/controllers/lifecycle/interfaces/eventobject_test.go b/lifecycle-operator/controllers/lifecycle/interfaces/eventobject_test.go similarity index 72% rename from operator/controllers/lifecycle/interfaces/eventobject_test.go rename to lifecycle-operator/controllers/lifecycle/interfaces/eventobject_test.go index be6ee7c0e6..20ff4d82f0 100644 --- a/operator/controllers/lifecycle/interfaces/eventobject_test.go +++ b/lifecycle-operator/controllers/lifecycle/interfaces/eventobject_test.go @@ -3,9 +3,9 @@ package interfaces import ( "testing" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - apicommon "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" - "github.com/keptn/lifecycle-toolkit/operator/controllers/lifecycle/interfaces/fake" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + apicommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/lifecycle/interfaces/fake" "github.com/stretchr/testify/require" ) diff --git a/operator/controllers/lifecycle/interfaces/fake/activemetricsobject_mock.go b/lifecycle-operator/controllers/lifecycle/interfaces/fake/activemetricsobject_mock.go similarity index 100% rename from operator/controllers/lifecycle/interfaces/fake/activemetricsobject_mock.go rename to lifecycle-operator/controllers/lifecycle/interfaces/fake/activemetricsobject_mock.go diff --git a/operator/controllers/lifecycle/interfaces/fake/eventobject_mock.go b/lifecycle-operator/controllers/lifecycle/interfaces/fake/eventobject_mock.go similarity index 100% rename from operator/controllers/lifecycle/interfaces/fake/eventobject_mock.go rename to lifecycle-operator/controllers/lifecycle/interfaces/fake/eventobject_mock.go diff --git a/operator/controllers/lifecycle/interfaces/fake/listitem_mock.go b/lifecycle-operator/controllers/lifecycle/interfaces/fake/listitem_mock.go similarity index 100% rename from operator/controllers/lifecycle/interfaces/fake/listitem_mock.go rename to lifecycle-operator/controllers/lifecycle/interfaces/fake/listitem_mock.go diff --git a/operator/controllers/lifecycle/interfaces/fake/meter_mock.go b/lifecycle-operator/controllers/lifecycle/interfaces/fake/meter_mock.go similarity index 100% rename from operator/controllers/lifecycle/interfaces/fake/meter_mock.go rename to lifecycle-operator/controllers/lifecycle/interfaces/fake/meter_mock.go diff --git a/operator/controllers/lifecycle/interfaces/fake/metricsobject_mock.go b/lifecycle-operator/controllers/lifecycle/interfaces/fake/metricsobject_mock.go similarity index 100% rename from operator/controllers/lifecycle/interfaces/fake/metricsobject_mock.go rename to lifecycle-operator/controllers/lifecycle/interfaces/fake/metricsobject_mock.go diff --git a/operator/controllers/lifecycle/interfaces/fake/phaseitem_mock.go b/lifecycle-operator/controllers/lifecycle/interfaces/fake/phaseitem_mock.go similarity index 99% rename from operator/controllers/lifecycle/interfaces/fake/phaseitem_mock.go rename to lifecycle-operator/controllers/lifecycle/interfaces/fake/phaseitem_mock.go index 55cb514a1b..2393116cca 100644 --- a/operator/controllers/lifecycle/interfaces/fake/phaseitem_mock.go +++ b/lifecycle-operator/controllers/lifecycle/interfaces/fake/phaseitem_mock.go @@ -4,8 +4,8 @@ package fake import ( - klcv1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - apicommon "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" + klcv1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + apicommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" "sync" diff --git a/operator/controllers/lifecycle/interfaces/fake/spanitem_mock.go b/lifecycle-operator/controllers/lifecycle/interfaces/fake/spanitem_mock.go similarity index 100% rename from operator/controllers/lifecycle/interfaces/fake/spanitem_mock.go rename to lifecycle-operator/controllers/lifecycle/interfaces/fake/spanitem_mock.go diff --git a/operator/controllers/lifecycle/interfaces/listitem.go b/lifecycle-operator/controllers/lifecycle/interfaces/listitem.go similarity index 88% rename from operator/controllers/lifecycle/interfaces/listitem.go rename to lifecycle-operator/controllers/lifecycle/interfaces/listitem.go index ada924123f..45dc896402 100644 --- a/operator/controllers/lifecycle/interfaces/listitem.go +++ b/lifecycle-operator/controllers/lifecycle/interfaces/listitem.go @@ -1,7 +1,7 @@ package interfaces import ( - "github.com/keptn/lifecycle-toolkit/operator/controllers/errors" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/errors" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/operator/controllers/lifecycle/interfaces/listitem_test.go b/lifecycle-operator/controllers/lifecycle/interfaces/listitem_test.go similarity index 74% rename from operator/controllers/lifecycle/interfaces/listitem_test.go rename to lifecycle-operator/controllers/lifecycle/interfaces/listitem_test.go index e7a0eeb3e1..c4a775f4a8 100644 --- a/operator/controllers/lifecycle/interfaces/listitem_test.go +++ b/lifecycle-operator/controllers/lifecycle/interfaces/listitem_test.go @@ -3,9 +3,9 @@ package interfaces import ( "testing" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - apicommon "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" - "github.com/keptn/lifecycle-toolkit/operator/controllers/lifecycle/interfaces/fake" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + apicommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/lifecycle/interfaces/fake" "github.com/stretchr/testify/require" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/operator/controllers/lifecycle/interfaces/meter.go b/lifecycle-operator/controllers/lifecycle/interfaces/meter.go similarity index 100% rename from operator/controllers/lifecycle/interfaces/meter.go rename to lifecycle-operator/controllers/lifecycle/interfaces/meter.go diff --git a/operator/controllers/lifecycle/interfaces/metricsobject.go b/lifecycle-operator/controllers/lifecycle/interfaces/metricsobject.go similarity index 95% rename from operator/controllers/lifecycle/interfaces/metricsobject.go rename to lifecycle-operator/controllers/lifecycle/interfaces/metricsobject.go index 0c43e8c68c..b9c016d35b 100644 --- a/operator/controllers/lifecycle/interfaces/metricsobject.go +++ b/lifecycle-operator/controllers/lifecycle/interfaces/metricsobject.go @@ -3,7 +3,7 @@ package interfaces import ( "time" - "github.com/keptn/lifecycle-toolkit/operator/controllers/errors" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/errors" "go.opentelemetry.io/otel/attribute" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/operator/controllers/lifecycle/interfaces/metricsobject_test.go b/lifecycle-operator/controllers/lifecycle/interfaces/metricsobject_test.go similarity index 87% rename from operator/controllers/lifecycle/interfaces/metricsobject_test.go rename to lifecycle-operator/controllers/lifecycle/interfaces/metricsobject_test.go index 1f1133b420..91c2b3c59d 100644 --- a/operator/controllers/lifecycle/interfaces/metricsobject_test.go +++ b/lifecycle-operator/controllers/lifecycle/interfaces/metricsobject_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - apicommon "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" - "github.com/keptn/lifecycle-toolkit/operator/controllers/lifecycle/interfaces/fake" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + apicommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/lifecycle/interfaces/fake" "github.com/stretchr/testify/require" "go.opentelemetry.io/otel/attribute" ) diff --git a/operator/controllers/lifecycle/interfaces/phaseitem.go b/lifecycle-operator/controllers/lifecycle/interfaces/phaseitem.go similarity index 94% rename from operator/controllers/lifecycle/interfaces/phaseitem.go rename to lifecycle-operator/controllers/lifecycle/interfaces/phaseitem.go index cb6b8fe2b7..ce5d7b0647 100644 --- a/operator/controllers/lifecycle/interfaces/phaseitem.go +++ b/lifecycle-operator/controllers/lifecycle/interfaces/phaseitem.go @@ -3,9 +3,9 @@ package interfaces import ( "time" - klcv1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - apicommon "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" - "github.com/keptn/lifecycle-toolkit/operator/controllers/errors" + klcv1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + apicommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/errors" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/operator/controllers/lifecycle/interfaces/phaseitem_test.go b/lifecycle-operator/controllers/lifecycle/interfaces/phaseitem_test.go similarity index 95% rename from operator/controllers/lifecycle/interfaces/phaseitem_test.go rename to lifecycle-operator/controllers/lifecycle/interfaces/phaseitem_test.go index 87abc9c5de..082b705381 100644 --- a/operator/controllers/lifecycle/interfaces/phaseitem_test.go +++ b/lifecycle-operator/controllers/lifecycle/interfaces/phaseitem_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - apicommon "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" - "github.com/keptn/lifecycle-toolkit/operator/controllers/lifecycle/interfaces/fake" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + apicommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/lifecycle/interfaces/fake" "github.com/stretchr/testify/require" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" diff --git a/operator/controllers/lifecycle/interfaces/spanitem.go b/lifecycle-operator/controllers/lifecycle/interfaces/spanitem.go similarity index 93% rename from operator/controllers/lifecycle/interfaces/spanitem.go rename to lifecycle-operator/controllers/lifecycle/interfaces/spanitem.go index 48e77ca0fd..6f868a892b 100644 --- a/operator/controllers/lifecycle/interfaces/spanitem.go +++ b/lifecycle-operator/controllers/lifecycle/interfaces/spanitem.go @@ -1,7 +1,7 @@ package interfaces import ( - "github.com/keptn/lifecycle-toolkit/operator/controllers/errors" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/errors" "go.opentelemetry.io/otel/propagation" "go.opentelemetry.io/otel/trace" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/operator/controllers/lifecycle/interfaces/spanitem_test.go b/lifecycle-operator/controllers/lifecycle/interfaces/spanitem_test.go similarity index 84% rename from operator/controllers/lifecycle/interfaces/spanitem_test.go rename to lifecycle-operator/controllers/lifecycle/interfaces/spanitem_test.go index 6d85a24e58..910340d9f2 100644 --- a/operator/controllers/lifecycle/interfaces/spanitem_test.go +++ b/lifecycle-operator/controllers/lifecycle/interfaces/spanitem_test.go @@ -3,9 +3,9 @@ package interfaces import ( "testing" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - apicommon "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" - "github.com/keptn/lifecycle-toolkit/operator/controllers/lifecycle/interfaces/fake" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + apicommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/lifecycle/interfaces/fake" "github.com/stretchr/testify/require" "go.opentelemetry.io/otel/propagation" "go.opentelemetry.io/otel/trace" diff --git a/operator/controllers/lifecycle/keptnapp/controller.go b/lifecycle-operator/controllers/lifecycle/keptnapp/controller.go similarity index 93% rename from operator/controllers/lifecycle/keptnapp/controller.go rename to lifecycle-operator/controllers/lifecycle/keptnapp/controller.go index 1582dcaf15..ea52347ed0 100644 --- a/operator/controllers/lifecycle/keptnapp/controller.go +++ b/lifecycle-operator/controllers/lifecycle/keptnapp/controller.go @@ -21,11 +21,11 @@ import ( "fmt" "github.com/go-logr/logr" - klcv1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" - operatorcommon "github.com/keptn/lifecycle-toolkit/operator/common" - controllercommon "github.com/keptn/lifecycle-toolkit/operator/controllers/common" - controllererrors "github.com/keptn/lifecycle-toolkit/operator/controllers/errors" + klcv1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" + operatorcommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/common" + controllercommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common" + controllererrors "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/errors" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/codes" "go.opentelemetry.io/otel/propagation" @@ -41,7 +41,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" ) -const traceComponentName = "keptn/operator/app" +const traceComponentName = "keptn/lifecycle-operator/app" // KeptnAppReconciler reconciles a KeptnApp object type KeptnAppReconciler struct { diff --git a/operator/controllers/lifecycle/keptnapp/controller_test.go b/lifecycle-operator/controllers/lifecycle/keptnapp/controller_test.go similarity index 92% rename from operator/controllers/lifecycle/keptnapp/controller_test.go rename to lifecycle-operator/controllers/lifecycle/keptnapp/controller_test.go index 65cd0747ec..36bec91f73 100644 --- a/operator/controllers/lifecycle/keptnapp/controller_test.go +++ b/lifecycle-operator/controllers/lifecycle/keptnapp/controller_test.go @@ -6,10 +6,10 @@ import ( "reflect" "testing" - lfcv1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - apicommon "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" - controllercommon "github.com/keptn/lifecycle-toolkit/operator/controllers/common" - "github.com/keptn/lifecycle-toolkit/operator/controllers/common/fake" + lfcv1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + apicommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" + controllercommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common/fake" "github.com/magiconair/properties/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/otel/trace" @@ -113,7 +113,7 @@ func TestKeptnAppReconciler_reconcile(t *testing.T) { }, } - //setting up fakeclient CRD data + // setting up fakeclient CRD data err := controllercommon.AddApp(r.Client, "myapp") require.Nil(t, err) @@ -145,8 +145,8 @@ func TestKeptnAppReconciler_reconcile(t *testing.T) { assert.Equal(t, tracer.StartCalls()[0].SpanName, "reconcile_app") assert.Equal(t, tracer.StartCalls()[1].SpanName, "create_app_version") assert.Equal(t, tracer.StartCalls()[2].SpanName, "myapp-1.0.0-6b86b273") - //case 2 creates no span because notfound - //case 3 reconcile finished crd + // case 2 creates no span because notfound + // case 3 reconcile finished crd assert.Equal(t, tracer.StartCalls()[3].SpanName, "reconcile_app") } @@ -190,13 +190,13 @@ func TestKeptnAppReconciler_deprecateAppVersions(t *testing.T) { } func setupReconciler() (*KeptnAppReconciler, chan string, *fake.ITracerMock) { - //setup logger + // setup logger opts := zap.Options{ Development: true, } ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts))) - //fake a tracer + // fake a tracer tr := &fake.ITracerMock{StartFunc: func(ctx context.Context, spanName string, opts ...trace.SpanStartOption) (context.Context, trace.Span) { return ctx, trace.SpanFromContext(ctx) }} diff --git a/operator/controllers/lifecycle/keptnappcreationrequest/controller.go b/lifecycle-operator/controllers/lifecycle/keptnappcreationrequest/controller.go similarity index 94% rename from operator/controllers/lifecycle/keptnappcreationrequest/controller.go rename to lifecycle-operator/controllers/lifecycle/keptnappcreationrequest/controller.go index 37fd8ea744..5668fe24e1 100644 --- a/operator/controllers/lifecycle/keptnappcreationrequest/controller.go +++ b/lifecycle-operator/controllers/lifecycle/keptnappcreationrequest/controller.go @@ -26,9 +26,9 @@ import ( "github.com/benbjohnson/clock" "github.com/go-logr/logr" - lifecycle "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" - "github.com/keptn/lifecycle-toolkit/operator/controllers/common/config" + lifecycle "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common/config" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" @@ -59,9 +59,9 @@ func NewReconciler(client client.Client, scheme *runtime.Scheme, log logr.Logger } } -//+kubebuilder:rbac:groups=lifecycle.keptn.sh,resources=keptnappcreationrequests,verbs=get;list;watch;create;update;patch;delete -//+kubebuilder:rbac:groups=lifecycle.keptn.sh,resources=keptnappcreationrequests/status,verbs=get;update;patch -//+kubebuilder:rbac:groups=lifecycle.keptn.sh,resources=keptnappcreationrequests/finalizers,verbs=update +// +kubebuilder:rbac:groups=lifecycle.keptn.sh,resources=keptnappcreationrequests,verbs=get;list;watch;create;update;patch;delete +// +kubebuilder:rbac:groups=lifecycle.keptn.sh,resources=keptnappcreationrequests/status,verbs=get;update;patch +// +kubebuilder:rbac:groups=lifecycle.keptn.sh,resources=keptnappcreationrequests/finalizers,verbs=update // Reconcile is part of the main kubernetes reconciliation loop which aims to // move the current state of the cluster closer to the desired state. diff --git a/operator/controllers/lifecycle/keptnappcreationrequest/controller_test.go b/lifecycle-operator/controllers/lifecycle/keptnappcreationrequest/controller_test.go similarity index 99% rename from operator/controllers/lifecycle/keptnappcreationrequest/controller_test.go rename to lifecycle-operator/controllers/lifecycle/keptnappcreationrequest/controller_test.go index 967c5f2b78..8c85f953b1 100644 --- a/operator/controllers/lifecycle/keptnappcreationrequest/controller_test.go +++ b/lifecycle-operator/controllers/lifecycle/keptnappcreationrequest/controller_test.go @@ -8,8 +8,8 @@ import ( "github.com/benbjohnson/clock" "github.com/go-logr/logr" - klcv1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - "github.com/keptn/lifecycle-toolkit/operator/controllers/common/config/fake" + klcv1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common/config/fake" "github.com/stretchr/testify/require" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/operator/controllers/lifecycle/keptnappversion/controller.go b/lifecycle-operator/controllers/lifecycle/keptnappversion/controller.go similarity index 95% rename from operator/controllers/lifecycle/keptnappversion/controller.go rename to lifecycle-operator/controllers/lifecycle/keptnappversion/controller.go index aaf5387a84..7b081b128e 100644 --- a/operator/controllers/lifecycle/keptnappversion/controller.go +++ b/lifecycle-operator/controllers/lifecycle/keptnappversion/controller.go @@ -22,10 +22,10 @@ import ( "time" "github.com/go-logr/logr" - klcv1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - apicommon "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" - controllercommon "github.com/keptn/lifecycle-toolkit/operator/controllers/common" - controllererrors "github.com/keptn/lifecycle-toolkit/operator/controllers/errors" + klcv1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + apicommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" + controllercommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common" + controllererrors "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/errors" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/codes" "go.opentelemetry.io/otel/metric" @@ -40,7 +40,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" ) -const traceComponentName = "keptn/operator/appversion" +const traceComponentName = "keptn/lifecycle-operator/appversion" // KeptnAppVersionReconciler reconciles a KeptnAppVersion object type KeptnAppVersionReconciler struct { diff --git a/operator/controllers/lifecycle/keptnappversion/controller_test.go b/lifecycle-operator/controllers/lifecycle/keptnappversion/controller_test.go similarity index 94% rename from operator/controllers/lifecycle/keptnappversion/controller_test.go rename to lifecycle-operator/controllers/lifecycle/keptnappversion/controller_test.go index 2832100b0e..3abaa0d795 100644 --- a/operator/controllers/lifecycle/keptnappversion/controller_test.go +++ b/lifecycle-operator/controllers/lifecycle/keptnappversion/controller_test.go @@ -7,10 +7,10 @@ import ( "strings" "testing" - lfcv1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - apicommon "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" - controllercommon "github.com/keptn/lifecycle-toolkit/operator/controllers/common" - "github.com/keptn/lifecycle-toolkit/operator/controllers/common/fake" + lfcv1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + apicommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" + controllercommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common/fake" "github.com/stretchr/testify/require" "go.opentelemetry.io/otel/trace" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -36,7 +36,7 @@ func TestKeptnAppVersionReconciler_reconcile(t *testing.T) { name string req ctrl.Request wantErr error - events []string //check correct events are generated + events []string // check correct events are generated startTrace bool }{ { @@ -84,7 +84,7 @@ func TestKeptnAppVersionReconciler_reconcile(t *testing.T) { PostDeploymentEvaluationStatus: apicommon.StatePending, } - //setting up fakeclient CRD data + // setting up fakeclient CRD data err := controllercommon.AddAppVersion(r.Client, "default", "myappversion", "1.0.0", nil, pendingStatus) require.Nil(t, err) @@ -108,7 +108,7 @@ func TestKeptnAppVersionReconciler_reconcile(t *testing.T) { } if tt.startTrace { - //A different trace for each app-version + // A different trace for each app-version require.Equal(t, tracer.StartCalls()[traces].SpanName, "reconcile_app_version") require.Equal(t, tracer.StartCalls()[traces].Ctx.Value(CONTEXTID), tt.req.Name) traces++ @@ -248,13 +248,13 @@ func createFinishedAppVersionStatus() lfcv1alpha3.KeptnAppVersionStatus { } func setupReconcilerWithMeters() *KeptnAppVersionReconciler { - //setup logger + // setup logger opts := zap.Options{ Development: true, } ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts))) - //fake a tracer + // fake a tracer tr := &fake.ITracerMock{StartFunc: func(ctx context.Context, spanName string, opts ...trace.SpanStartOption) (context.Context, trace.Span) { return ctx, trace.SpanFromContext(ctx) }} @@ -272,13 +272,13 @@ func setupReconcilerWithMeters() *KeptnAppVersionReconciler { } func setupReconciler(objs ...client.Object) (*KeptnAppVersionReconciler, chan string, *fake.ITracerMock, *fake.ISpanHandlerMock) { - //setup logger + // setup logger opts := zap.Options{ Development: true, } ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts))) - //fake a tracer + // fake a tracer tr := &fake.ITracerMock{StartFunc: func(ctx context.Context, spanName string, opts ...trace.SpanStartOption) (context.Context, trace.Span) { return ctx, trace.SpanFromContext(ctx) }} @@ -287,7 +287,7 @@ func setupReconciler(objs ...client.Object) (*KeptnAppVersionReconciler, chan st return tr }} - //fake span handler + // fake span handler spanRecorder := &fake.ISpanHandlerMock{ GetSpanFunc: func(ctx context.Context, tracer trace.Tracer, reconcileObject client.Object, phase string) (context.Context, trace.Span, error) { diff --git a/operator/controllers/lifecycle/keptnappversion/reconcile_prepostdeployment.go b/lifecycle-operator/controllers/lifecycle/keptnappversion/reconcile_prepostdeployment.go similarity index 82% rename from operator/controllers/lifecycle/keptnappversion/reconcile_prepostdeployment.go rename to lifecycle-operator/controllers/lifecycle/keptnappversion/reconcile_prepostdeployment.go index 6367e857d7..88eb0383f3 100644 --- a/operator/controllers/lifecycle/keptnappversion/reconcile_prepostdeployment.go +++ b/lifecycle-operator/controllers/lifecycle/keptnappversion/reconcile_prepostdeployment.go @@ -5,9 +5,9 @@ import ( "context" "fmt" - klcv1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - apicommon "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" - controllercommon "github.com/keptn/lifecycle-toolkit/operator/controllers/common" + klcv1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + apicommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" + controllercommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common" ) func (r *KeptnAppVersionReconciler) reconcilePrePostDeployment(ctx context.Context, phaseCtx context.Context, appVersion *klcv1alpha3.KeptnAppVersion, checkType apicommon.CheckType) (apicommon.KeptnState, error) { diff --git a/operator/controllers/lifecycle/keptnappversion/reconcile_prepostevaluation.go b/lifecycle-operator/controllers/lifecycle/keptnappversion/reconcile_prepostevaluation.go similarity index 83% rename from operator/controllers/lifecycle/keptnappversion/reconcile_prepostevaluation.go rename to lifecycle-operator/controllers/lifecycle/keptnappversion/reconcile_prepostevaluation.go index d33d8f505f..1fe78bb6e5 100644 --- a/operator/controllers/lifecycle/keptnappversion/reconcile_prepostevaluation.go +++ b/lifecycle-operator/controllers/lifecycle/keptnappversion/reconcile_prepostevaluation.go @@ -5,9 +5,9 @@ import ( "context" "fmt" - klcv1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - apicommon "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" - controllercommon "github.com/keptn/lifecycle-toolkit/operator/controllers/common" + klcv1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + apicommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" + controllercommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common" ) func (r *KeptnAppVersionReconciler) reconcilePrePostEvaluation(ctx context.Context, phaseCtx context.Context, appVersion *klcv1alpha3.KeptnAppVersion, checkType apicommon.CheckType) (apicommon.KeptnState, error) { diff --git a/operator/controllers/lifecycle/keptnappversion/reconcile_workloadsstate.go b/lifecycle-operator/controllers/lifecycle/keptnappversion/reconcile_workloadsstate.go similarity index 92% rename from operator/controllers/lifecycle/keptnappversion/reconcile_workloadsstate.go rename to lifecycle-operator/controllers/lifecycle/keptnappversion/reconcile_workloadsstate.go index 4f1636eb2c..f206ed6a4d 100644 --- a/operator/controllers/lifecycle/keptnappversion/reconcile_workloadsstate.go +++ b/lifecycle-operator/controllers/lifecycle/keptnappversion/reconcile_workloadsstate.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - klcv1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - apicommon "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" - operatorcommon "github.com/keptn/lifecycle-toolkit/operator/common" + klcv1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + apicommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" + operatorcommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/common" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/operator/controllers/lifecycle/keptnappversion/reconcile_workloadstate_test.go b/lifecycle-operator/controllers/lifecycle/keptnappversion/reconcile_workloadstate_test.go similarity index 97% rename from operator/controllers/lifecycle/keptnappversion/reconcile_workloadstate_test.go rename to lifecycle-operator/controllers/lifecycle/keptnappversion/reconcile_workloadstate_test.go index 40edc38a48..c16ad48f86 100644 --- a/operator/controllers/lifecycle/keptnappversion/reconcile_workloadstate_test.go +++ b/lifecycle-operator/controllers/lifecycle/keptnappversion/reconcile_workloadstate_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - lfcv1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - apicommon "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" + lfcv1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + apicommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" "github.com/stretchr/testify/require" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/operator/controllers/lifecycle/keptnevaluation/common.go b/lifecycle-operator/controllers/lifecycle/keptnevaluation/common.go similarity index 89% rename from operator/controllers/lifecycle/keptnevaluation/common.go rename to lifecycle-operator/controllers/lifecycle/keptnevaluation/common.go index ec11fd5dc3..0b6750751b 100644 --- a/operator/controllers/lifecycle/keptnevaluation/common.go +++ b/lifecycle-operator/controllers/lifecycle/keptnevaluation/common.go @@ -5,7 +5,7 @@ import ( "math" "strconv" - klcv1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" + klcv1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" ) func checkValue(objective klcv1alpha3.Objective, item *klcv1alpha3.EvaluationStatusItem) (bool, error) { diff --git a/operator/controllers/lifecycle/keptnevaluation/common_test.go b/lifecycle-operator/controllers/lifecycle/keptnevaluation/common_test.go similarity index 98% rename from operator/controllers/lifecycle/keptnevaluation/common_test.go rename to lifecycle-operator/controllers/lifecycle/keptnevaluation/common_test.go index 8a543c0dfb..521dae6527 100644 --- a/operator/controllers/lifecycle/keptnevaluation/common_test.go +++ b/lifecycle-operator/controllers/lifecycle/keptnevaluation/common_test.go @@ -3,7 +3,7 @@ package keptnevaluation import ( "testing" - klcv1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" + klcv1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" "github.com/stretchr/testify/require" ) diff --git a/operator/controllers/lifecycle/keptnevaluation/controller.go b/lifecycle-operator/controllers/lifecycle/keptnevaluation/controller.go similarity index 95% rename from operator/controllers/lifecycle/keptnevaluation/controller.go rename to lifecycle-operator/controllers/lifecycle/keptnevaluation/controller.go index 1b6c5a8029..6f8874a43b 100644 --- a/operator/controllers/lifecycle/keptnevaluation/controller.go +++ b/lifecycle-operator/controllers/lifecycle/keptnevaluation/controller.go @@ -22,11 +22,11 @@ import ( "time" "github.com/go-logr/logr" - klcv1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - apicommon "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" - controllercommon "github.com/keptn/lifecycle-toolkit/operator/controllers/common" - "github.com/keptn/lifecycle-toolkit/operator/controllers/common/providers/keptnmetric" - controllererrors "github.com/keptn/lifecycle-toolkit/operator/controllers/errors" + klcv1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + apicommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" + controllercommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common/providers/keptnmetric" + controllererrors "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/errors" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/codes" "go.opentelemetry.io/otel/metric" @@ -40,7 +40,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/predicate" ) -const traceComponentName = "keptn/operator/evaluation" +const traceComponentName = "keptn/lifecycle-operator/evaluation" // KeptnEvaluationReconciler reconciles a KeptnEvaluation object type KeptnEvaluationReconciler struct { diff --git a/operator/controllers/lifecycle/keptnevaluation/controller_test.go b/lifecycle-operator/controllers/lifecycle/keptnevaluation/controller_test.go similarity index 94% rename from operator/controllers/lifecycle/keptnevaluation/controller_test.go rename to lifecycle-operator/controllers/lifecycle/keptnevaluation/controller_test.go index f61f7bcb40..c218d50f4f 100644 --- a/operator/controllers/lifecycle/keptnevaluation/controller_test.go +++ b/lifecycle-operator/controllers/lifecycle/keptnevaluation/controller_test.go @@ -6,11 +6,11 @@ import ( "testing" "github.com/go-logr/logr" - klcv1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" - controllercommon "github.com/keptn/lifecycle-toolkit/operator/controllers/common" - "github.com/keptn/lifecycle-toolkit/operator/controllers/common/fake" - metricsapi "github.com/keptn/lifecycle-toolkit/operator/test/api/metrics/v1alpha3" + klcv1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" + controllercommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common/fake" + metricsapi "github.com/keptn/lifecycle-toolkit/lifecycle-operator/test/api/metrics/v1alpha3" "github.com/stretchr/testify/require" "go.opentelemetry.io/otel/sdk/metric" "go.opentelemetry.io/otel/trace" diff --git a/operator/controllers/lifecycle/keptntask/container_builder.go b/lifecycle-operator/controllers/lifecycle/keptntask/container_builder.go similarity index 88% rename from operator/controllers/lifecycle/keptntask/container_builder.go rename to lifecycle-operator/controllers/lifecycle/keptntask/container_builder.go index d68f61b584..2ea0c7ad96 100644 --- a/operator/controllers/lifecycle/keptntask/container_builder.go +++ b/lifecycle-operator/controllers/lifecycle/keptntask/container_builder.go @@ -1,8 +1,8 @@ package keptntask import ( - klcv1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - "github.com/keptn/lifecycle-toolkit/operator/controllers/common" + klcv1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common" "golang.org/x/net/context" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" diff --git a/operator/controllers/lifecycle/keptntask/container_builder_test.go b/lifecycle-operator/controllers/lifecycle/keptntask/container_builder_test.go similarity index 98% rename from operator/controllers/lifecycle/keptntask/container_builder_test.go rename to lifecycle-operator/controllers/lifecycle/keptntask/container_builder_test.go index beb805b19d..7f535ba65c 100644 --- a/operator/controllers/lifecycle/keptntask/container_builder_test.go +++ b/lifecycle-operator/controllers/lifecycle/keptntask/container_builder_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" "github.com/stretchr/testify/require" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" diff --git a/operator/controllers/lifecycle/keptntask/controller.go b/lifecycle-operator/controllers/lifecycle/keptntask/controller.go similarity index 93% rename from operator/controllers/lifecycle/keptntask/controller.go rename to lifecycle-operator/controllers/lifecycle/keptntask/controller.go index d3c7ee3286..640c4f76d7 100644 --- a/operator/controllers/lifecycle/keptntask/controller.go +++ b/lifecycle-operator/controllers/lifecycle/keptntask/controller.go @@ -21,9 +21,9 @@ import ( "time" "github.com/go-logr/logr" - klcv1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - apicommon "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" - controllercommon "github.com/keptn/lifecycle-toolkit/operator/controllers/common" + klcv1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + apicommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" + controllercommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/codes" "go.opentelemetry.io/otel/metric" @@ -37,7 +37,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/predicate" ) -const traceComponentName = "keptn/operator/task" +const traceComponentName = "keptn/lifecycle-operator/task" // KeptnTaskReconciler reconciles a KeptnTask object type KeptnTaskReconciler struct { diff --git a/operator/controllers/lifecycle/keptntask/job_runner_builder.go b/lifecycle-operator/controllers/lifecycle/keptntask/job_runner_builder.go similarity index 86% rename from operator/controllers/lifecycle/keptntask/job_runner_builder.go rename to lifecycle-operator/controllers/lifecycle/keptntask/job_runner_builder.go index f784549153..fd741f91d7 100644 --- a/operator/controllers/lifecycle/keptntask/job_runner_builder.go +++ b/lifecycle-operator/controllers/lifecycle/keptntask/job_runner_builder.go @@ -2,8 +2,8 @@ package keptntask import ( "github.com/go-logr/logr" - klcv1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - controllercommon "github.com/keptn/lifecycle-toolkit/operator/controllers/common" + klcv1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + controllercommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common" "golang.org/x/net/context" corev1 "k8s.io/api/core/v1" ctrl "sigs.k8s.io/controller-runtime" diff --git a/operator/controllers/lifecycle/keptntask/job_runner_builder_test.go b/lifecycle-operator/controllers/lifecycle/keptntask/job_runner_builder_test.go similarity index 92% rename from operator/controllers/lifecycle/keptntask/job_runner_builder_test.go rename to lifecycle-operator/controllers/lifecycle/keptntask/job_runner_builder_test.go index 3bfd781a08..a5a0427309 100644 --- a/operator/controllers/lifecycle/keptntask/job_runner_builder_test.go +++ b/lifecycle-operator/controllers/lifecycle/keptntask/job_runner_builder_test.go @@ -3,7 +3,7 @@ package keptntask import ( "testing" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" "github.com/stretchr/testify/require" v1 "k8s.io/api/core/v1" ) diff --git a/operator/controllers/lifecycle/keptntask/job_utils.go b/lifecycle-operator/controllers/lifecycle/keptntask/job_utils.go similarity index 92% rename from operator/controllers/lifecycle/keptntask/job_utils.go rename to lifecycle-operator/controllers/lifecycle/keptntask/job_utils.go index a0f4068dbf..70c1d23e10 100644 --- a/operator/controllers/lifecycle/keptntask/job_utils.go +++ b/lifecycle-operator/controllers/lifecycle/keptntask/job_utils.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - klcv1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - apicommon "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" - controllercommon "github.com/keptn/lifecycle-toolkit/operator/controllers/common" - controllererrors "github.com/keptn/lifecycle-toolkit/operator/controllers/errors" + klcv1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + apicommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" + controllercommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common" + controllererrors "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/errors" batchv1 "k8s.io/api/batch/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/operator/controllers/lifecycle/keptntask/job_utils_test.go b/lifecycle-operator/controllers/lifecycle/keptntask/job_utils_test.go similarity index 95% rename from operator/controllers/lifecycle/keptntask/job_utils_test.go rename to lifecycle-operator/controllers/lifecycle/keptntask/job_utils_test.go index 92bdc14d69..6a0cf2eb1c 100644 --- a/operator/controllers/lifecycle/keptntask/job_utils_test.go +++ b/lifecycle-operator/controllers/lifecycle/keptntask/job_utils_test.go @@ -4,10 +4,10 @@ import ( "context" "testing" - klcv1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - apicommon "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" - "github.com/keptn/lifecycle-toolkit/operator/controllers/common" - controllercommon "github.com/keptn/lifecycle-toolkit/operator/controllers/common" + klcv1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + apicommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common" + controllercommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common" "github.com/stretchr/testify/require" batchv1 "k8s.io/api/batch/v1" v1 "k8s.io/api/core/v1" diff --git a/operator/controllers/lifecycle/keptntask/runtime_builder.go b/lifecycle-operator/controllers/lifecycle/keptntask/runtime_builder.go similarity index 95% rename from operator/controllers/lifecycle/keptntask/runtime_builder.go rename to lifecycle-operator/controllers/lifecycle/keptntask/runtime_builder.go index 633746c5a9..89505dea61 100644 --- a/operator/controllers/lifecycle/keptntask/runtime_builder.go +++ b/lifecycle-operator/controllers/lifecycle/keptntask/runtime_builder.go @@ -5,10 +5,10 @@ import ( "fmt" "dario.cat/mergo" - klcv1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - apicommon "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" - controllercommon "github.com/keptn/lifecycle-toolkit/operator/controllers/common" - controllererrors "github.com/keptn/lifecycle-toolkit/operator/controllers/errors" + klcv1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + apicommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" + controllercommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common" + controllererrors "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/errors" "golang.org/x/net/context" corev1 "k8s.io/api/core/v1" ) diff --git a/operator/controllers/lifecycle/keptntask/runtime_builder_test.go b/lifecycle-operator/controllers/lifecycle/keptntask/runtime_builder_test.go similarity index 92% rename from operator/controllers/lifecycle/keptntask/runtime_builder_test.go rename to lifecycle-operator/controllers/lifecycle/keptntask/runtime_builder_test.go index 9a864fca75..fe6729853f 100644 --- a/operator/controllers/lifecycle/keptntask/runtime_builder_test.go +++ b/lifecycle-operator/controllers/lifecycle/keptntask/runtime_builder_test.go @@ -4,11 +4,11 @@ import ( "testing" "github.com/go-logr/logr/testr" - klcv1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - apicommon "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" - "github.com/keptn/lifecycle-toolkit/operator/controllers/common" - controllercommon "github.com/keptn/lifecycle-toolkit/operator/controllers/common" - "github.com/keptn/lifecycle-toolkit/operator/controllers/common/fake" + klcv1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + apicommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common" + controllercommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common/fake" "github.com/stretchr/testify/require" "golang.org/x/net/context" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -249,12 +249,12 @@ func TestJSBuilder_getParams(t *testing.T) { }, params: &RuntimeExecutionParams{ ConfigMap: def.Status.Function.ConfigMap, - Parameters: map[string]string{ //maps should be merged + Parameters: map[string]string{ // maps should be merged "DATA2": "parent_data", "DATA1": "child_data", }, - SecureParameters: paramDef.Spec.Deno.SecureParameters.Secret, //uses child - URL: def.Spec.Function.HttpReference.Url, //uses parent + SecureParameters: paramDef.Spec.Deno.SecureParameters.Secret, // uses child + URL: def.Spec.Function.HttpReference.Url, // uses parent Context: klcv1alpha3.TaskContext{ WorkloadName: "my-workload", AppName: "my-app", @@ -281,7 +281,7 @@ func TestJSBuilder_getParams(t *testing.T) { }, params: &RuntimeExecutionParams{ ConfigMap: parentPy.Status.Function.ConfigMap, - URL: parentPy.Spec.Python.HttpReference.Url, //we support a single URL so the original should be taken not the parent one + URL: parentPy.Spec.Python.HttpReference.Url, // we support a single URL so the original should be taken not the parent one Context: klcv1alpha3.TaskContext{ WorkloadName: "my-workload", AppName: "my-app", diff --git a/operator/controllers/lifecycle/keptntaskdefinition/controller.go b/lifecycle-operator/controllers/lifecycle/keptntaskdefinition/controller.go similarity index 84% rename from operator/controllers/lifecycle/keptntaskdefinition/controller.go rename to lifecycle-operator/controllers/lifecycle/keptntaskdefinition/controller.go index 4f75105ae5..5e8aa6fd58 100644 --- a/operator/controllers/lifecycle/keptntaskdefinition/controller.go +++ b/lifecycle-operator/controllers/lifecycle/keptntaskdefinition/controller.go @@ -21,9 +21,9 @@ import ( "time" "github.com/go-logr/logr" - klcv1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - "github.com/keptn/lifecycle-toolkit/operator/controllers/common" - controllercommon "github.com/keptn/lifecycle-toolkit/operator/controllers/common" + klcv1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common" + controllercommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" @@ -59,14 +59,14 @@ func (r *KeptnTaskDefinitionReconciler) Reconcile(ctx context.Context, req ctrl. return ctrl.Result{Requeue: true, RequeueAfter: 30 * time.Second}, nil } defSpec := common.GetRuntimeSpec(definition) - if definition.Spec.Container == nil && defSpec != nil { //if the spec is well-defined + if definition.Spec.Container == nil && defSpec != nil { // if the spec is well-defined // get configmap reference either existing configmap name or inline generated one cmName := controllercommon.GetCmName(definition.Name, defSpec) - //get existing configmap either generated from inline or user defined + // get existing configmap either generated from inline or user defined cm, err := r.getConfigMap(ctx, cmName, req.Namespace) - //if IsNotFound we need to create it + // if IsNotFound we need to create it if err != nil && !errors.IsNotFound(err) { return ctrl.Result{}, nil } @@ -76,11 +76,11 @@ func (r *KeptnTaskDefinitionReconciler) Reconcile(ctx context.Context, req ctrl. if common.IsInline(defSpec) { functionCm = r.generateConfigMap(defSpec, cmName, definition.Namespace) } - //compare and handle updated and existing + // compare and handle updated and existing r.reconcileConfigMap(ctx, functionCm, cm) - /// if neither exist remove from status + // / if neither exist remove from status r.updateTaskDefinitionStatus(functionCm, definition) - //now we know that the reference to the config map is valid, so we update the definition + // now we know that the reference to the config map is valid, so we update the definition err = r.Client.Status().Update(ctx, definition) if err != nil { r.Log.Error(err, "could not update configmap status reference for: "+definition.Name) diff --git a/operator/controllers/lifecycle/keptntaskdefinition/reconcile_function.go b/lifecycle-operator/controllers/lifecycle/keptntaskdefinition/reconcile_function.go similarity index 83% rename from operator/controllers/lifecycle/keptntaskdefinition/reconcile_function.go rename to lifecycle-operator/controllers/lifecycle/keptntaskdefinition/reconcile_function.go index 25d5d51f4d..1579c54401 100644 --- a/operator/controllers/lifecycle/keptntaskdefinition/reconcile_function.go +++ b/lifecycle-operator/controllers/lifecycle/keptntaskdefinition/reconcile_function.go @@ -4,8 +4,8 @@ import ( "context" "reflect" - klcv1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - apicommon "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" + klcv1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + apicommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" @@ -28,14 +28,14 @@ func (r *KeptnTaskDefinitionReconciler) generateConfigMap(spec *klcv1alpha3.Runt func (r *KeptnTaskDefinitionReconciler) reconcileConfigMap(ctx context.Context, functionCm *corev1.ConfigMap, cm *corev1.ConfigMap) { - if (cm == nil || reflect.DeepEqual(cm, &corev1.ConfigMap{})) && functionCm != nil { //cm does not exist or new taskdef with inline func + if (cm == nil || reflect.DeepEqual(cm, &corev1.ConfigMap{})) && functionCm != nil { // cm does not exist or new taskdef with inline func err := r.Client.Create(ctx, functionCm) if err != nil { r.Log.Error(err, "could not create ConfigMap") r.EventSender.SendK8sEvent(apicommon.PhaseReconcileTask, "Warning", functionCm, apicommon.PhaseStateFailed, "could not create configmap", "") return } - } else if !reflect.DeepEqual(cm, functionCm) && functionCm != nil { //cm and inline func exists but differ + } else if !reflect.DeepEqual(cm, functionCm) && functionCm != nil { // cm and inline func exists but differ err := r.Client.Update(ctx, functionCm) if err != nil { r.Log.Error(err, "could not update ConfigMap") @@ -43,7 +43,7 @@ func (r *KeptnTaskDefinitionReconciler) reconcileConfigMap(ctx context.Context, return } } - //nothing changed + // nothing changed } func (r *KeptnTaskDefinitionReconciler) getConfigMap(ctx context.Context, cmName string, namespace string) (*corev1.ConfigMap, error) { @@ -58,9 +58,9 @@ func (r *KeptnTaskDefinitionReconciler) getConfigMap(ctx context.Context, cmName func (r *KeptnTaskDefinitionReconciler) updateTaskDefinitionStatus(functionCm *corev1.ConfigMap, definition *klcv1alpha3.KeptnTaskDefinition) { // config map referenced but does not exist we can use the status to signify that - if functionCm != nil && definition.Status.Function.ConfigMap != functionCm.Name { //configmap referenced exists but old + if functionCm != nil && definition.Status.Function.ConfigMap != functionCm.Name { // configmap referenced exists but old definition.Status.Function.ConfigMap = functionCm.Name - //and make sure that the definition controls the config map + // and make sure that the definition controls the config map err := controllerutil.SetControllerReference(definition, functionCm, r.Scheme) if err != nil { r.Log.Error(err, "could not set controller reference for ConfigMap: "+functionCm.Name) diff --git a/operator/controllers/lifecycle/keptnworkload/controller.go b/lifecycle-operator/controllers/lifecycle/keptnworkload/controller.go similarity index 93% rename from operator/controllers/lifecycle/keptnworkload/controller.go rename to lifecycle-operator/controllers/lifecycle/keptnworkload/controller.go index ee906024c7..d5439c9687 100644 --- a/operator/controllers/lifecycle/keptnworkload/controller.go +++ b/lifecycle-operator/controllers/lifecycle/keptnworkload/controller.go @@ -21,10 +21,10 @@ import ( "fmt" "github.com/go-logr/logr" - klcv1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - apicommon "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" - controllercommon "github.com/keptn/lifecycle-toolkit/operator/controllers/common" - controllererrors "github.com/keptn/lifecycle-toolkit/operator/controllers/errors" + klcv1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + apicommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" + controllercommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common" + controllererrors "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/errors" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/codes" "go.opentelemetry.io/otel/propagation" @@ -40,7 +40,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" ) -const traceComponentName = "keptn/operator/workload" +const traceComponentName = "keptn/lifecycle-operator/workload" // KeptnWorkloadReconciler reconciles a KeptnWorkload object type KeptnWorkloadReconciler struct { diff --git a/operator/controllers/lifecycle/keptnworkloadinstance/controller.go b/lifecycle-operator/controllers/lifecycle/keptnworkloadinstance/controller.go similarity index 97% rename from operator/controllers/lifecycle/keptnworkloadinstance/controller.go rename to lifecycle-operator/controllers/lifecycle/keptnworkloadinstance/controller.go index 23d3571b0d..255d4a9802 100644 --- a/operator/controllers/lifecycle/keptnworkloadinstance/controller.go +++ b/lifecycle-operator/controllers/lifecycle/keptnworkloadinstance/controller.go @@ -22,10 +22,10 @@ import ( "time" "github.com/go-logr/logr" - klcv1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - apicommon "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" - controllercommon "github.com/keptn/lifecycle-toolkit/operator/controllers/common" - controllererrors "github.com/keptn/lifecycle-toolkit/operator/controllers/errors" + klcv1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + apicommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" + controllercommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common" + controllererrors "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/errors" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/codes" "go.opentelemetry.io/otel/metric" @@ -40,7 +40,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" ) -const traceComponentName = "keptn/operator/workloadinstance" +const traceComponentName = "keptn/lifecycle-operator/workloadinstance" // KeptnWorkloadInstanceReconciler reconciles a KeptnWorkloadInstance object type KeptnWorkloadInstanceReconciler struct { diff --git a/operator/controllers/lifecycle/keptnworkloadinstance/controller_test.go b/lifecycle-operator/controllers/lifecycle/keptnworkloadinstance/controller_test.go similarity index 98% rename from operator/controllers/lifecycle/keptnworkloadinstance/controller_test.go rename to lifecycle-operator/controllers/lifecycle/keptnworkloadinstance/controller_test.go index 67a5020cd6..a27618a70e 100644 --- a/operator/controllers/lifecycle/keptnworkloadinstance/controller_test.go +++ b/lifecycle-operator/controllers/lifecycle/keptnworkloadinstance/controller_test.go @@ -7,11 +7,11 @@ import ( "testing" "time" - klcv1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - apicommon "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" - controllercommon "github.com/keptn/lifecycle-toolkit/operator/controllers/common" - "github.com/keptn/lifecycle-toolkit/operator/controllers/common/fake" - controllererrors "github.com/keptn/lifecycle-toolkit/operator/controllers/errors" + klcv1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + apicommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" + controllercommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common/fake" + controllererrors "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/errors" "github.com/magiconair/properties/assert" "github.com/stretchr/testify/require" testrequire "github.com/stretchr/testify/require" @@ -1043,13 +1043,13 @@ func TestKeptnWorkloadInstanceReconciler_ReconcileDoNotRetryAfterFailedPhase(t * } func setupReconciler() (*KeptnWorkloadInstanceReconciler, chan string, *fake.ITracerMock) { - //setup logger + // setup logger opts := zap.Options{ Development: true, } ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts))) - //fake a tracer + // fake a tracer tr := &fake.ITracerMock{StartFunc: func(ctx context.Context, spanName string, opts ...trace.SpanStartOption) (context.Context, trace.Span) { return ctx, trace.SpanFromContext(ctx) }} diff --git a/operator/controllers/lifecycle/keptnworkloadinstance/reconcile_deploymentstate.go b/lifecycle-operator/controllers/lifecycle/keptnworkloadinstance/reconcile_deploymentstate.go similarity index 93% rename from operator/controllers/lifecycle/keptnworkloadinstance/reconcile_deploymentstate.go rename to lifecycle-operator/controllers/lifecycle/keptnworkloadinstance/reconcile_deploymentstate.go index 3a6e560445..11075b5747 100644 --- a/operator/controllers/lifecycle/keptnworkloadinstance/reconcile_deploymentstate.go +++ b/lifecycle-operator/controllers/lifecycle/keptnworkloadinstance/reconcile_deploymentstate.go @@ -4,9 +4,9 @@ import ( "context" argov1alpha1 "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" - klcv1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - apicommon "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" - controllererrors "github.com/keptn/lifecycle-toolkit/operator/controllers/errors" + klcv1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + apicommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" + controllererrors "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/errors" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" diff --git a/operator/controllers/lifecycle/keptnworkloadinstance/reconcile_prepostdeployment.go b/lifecycle-operator/controllers/lifecycle/keptnworkloadinstance/reconcile_prepostdeployment.go similarity index 83% rename from operator/controllers/lifecycle/keptnworkloadinstance/reconcile_prepostdeployment.go rename to lifecycle-operator/controllers/lifecycle/keptnworkloadinstance/reconcile_prepostdeployment.go index 237657a2da..8717c0c74d 100644 --- a/operator/controllers/lifecycle/keptnworkloadinstance/reconcile_prepostdeployment.go +++ b/lifecycle-operator/controllers/lifecycle/keptnworkloadinstance/reconcile_prepostdeployment.go @@ -5,9 +5,9 @@ import ( "context" "fmt" - klcv1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - apicommon "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" - controllercommon "github.com/keptn/lifecycle-toolkit/operator/controllers/common" + klcv1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + apicommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" + controllercommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common" ) func (r *KeptnWorkloadInstanceReconciler) reconcilePrePostDeployment(ctx context.Context, phaseCtx context.Context, workloadInstance *klcv1alpha3.KeptnWorkloadInstance, checkType apicommon.CheckType) (apicommon.KeptnState, error) { diff --git a/operator/controllers/lifecycle/keptnworkloadinstance/reconcile_prepostevaluation.go b/lifecycle-operator/controllers/lifecycle/keptnworkloadinstance/reconcile_prepostevaluation.go similarity index 84% rename from operator/controllers/lifecycle/keptnworkloadinstance/reconcile_prepostevaluation.go rename to lifecycle-operator/controllers/lifecycle/keptnworkloadinstance/reconcile_prepostevaluation.go index b854d271c5..79d3482f45 100644 --- a/operator/controllers/lifecycle/keptnworkloadinstance/reconcile_prepostevaluation.go +++ b/lifecycle-operator/controllers/lifecycle/keptnworkloadinstance/reconcile_prepostevaluation.go @@ -5,9 +5,9 @@ import ( "context" "fmt" - klcv1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - apicommon "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" - controllercommon "github.com/keptn/lifecycle-toolkit/operator/controllers/common" + klcv1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + apicommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" + controllercommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common" ) func (r *KeptnWorkloadInstanceReconciler) reconcilePrePostEvaluation(ctx context.Context, phaseCtx context.Context, workloadInstance *klcv1alpha3.KeptnWorkloadInstance, checkType apicommon.CheckType) (apicommon.KeptnState, error) { diff --git a/operator/controllers/options/keptnconfig_controller.go b/lifecycle-operator/controllers/options/keptnconfig_controller.go similarity index 91% rename from operator/controllers/options/keptnconfig_controller.go rename to lifecycle-operator/controllers/options/keptnconfig_controller.go index f7926027f2..8af6e775ba 100644 --- a/operator/controllers/options/keptnconfig_controller.go +++ b/lifecycle-operator/controllers/options/keptnconfig_controller.go @@ -22,9 +22,9 @@ import ( "time" "github.com/go-logr/logr" - optionsv1alpha1 "github.com/keptn/lifecycle-toolkit/operator/apis/options/v1alpha1" - controllercommon "github.com/keptn/lifecycle-toolkit/operator/controllers/common" - controllererrors "github.com/keptn/lifecycle-toolkit/operator/controllers/errors" + optionsv1alpha1 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/options/v1alpha1" + controllercommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common" + controllererrors "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/errors" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" ctrl "sigs.k8s.io/controller-runtime" diff --git a/operator/controllers/options/keptnconfig_controller_test.go b/lifecycle-operator/controllers/options/keptnconfig_controller_test.go similarity index 97% rename from operator/controllers/options/keptnconfig_controller_test.go rename to lifecycle-operator/controllers/options/keptnconfig_controller_test.go index a61fb28594..327d07efba 100644 --- a/operator/controllers/options/keptnconfig_controller_test.go +++ b/lifecycle-operator/controllers/options/keptnconfig_controller_test.go @@ -7,8 +7,8 @@ import ( "time" "github.com/go-logr/logr" - optionsv1alpha1 "github.com/keptn/lifecycle-toolkit/operator/apis/options/v1alpha1" - "github.com/keptn/lifecycle-toolkit/operator/controllers/common/fake" + optionsv1alpha1 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/options/v1alpha1" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common/fake" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" @@ -262,7 +262,7 @@ func setupReconciler() *KeptnConfigReconciler { }, } - //setup logger + // setup logger opts := zap.Options{ Development: true, } diff --git a/operator/go.mod b/lifecycle-operator/go.mod similarity index 98% rename from operator/go.mod rename to lifecycle-operator/go.mod index 3253d16f1c..c4aeeabfdb 100644 --- a/operator/go.mod +++ b/lifecycle-operator/go.mod @@ -1,4 +1,4 @@ -module github.com/keptn/lifecycle-toolkit/operator +module github.com/keptn/lifecycle-toolkit/lifecycle-operator go 1.20 diff --git a/operator/go.sum b/lifecycle-operator/go.sum similarity index 100% rename from operator/go.sum rename to lifecycle-operator/go.sum diff --git a/operator/hack/boilerplate.go.txt b/lifecycle-operator/hack/boilerplate.go.txt similarity index 100% rename from operator/hack/boilerplate.go.txt rename to lifecycle-operator/hack/boilerplate.go.txt diff --git a/operator/main.go b/lifecycle-operator/main.go similarity index 91% rename from operator/main.go rename to lifecycle-operator/main.go index 2bea149f92..14c382fb3d 100644 --- a/operator/main.go +++ b/lifecycle-operator/main.go @@ -28,21 +28,21 @@ import ( "github.com/keptn/lifecycle-toolkit/klt-cert-manager/pkg/certificates" certCommon "github.com/keptn/lifecycle-toolkit/klt-cert-manager/pkg/common" "github.com/keptn/lifecycle-toolkit/klt-cert-manager/pkg/webhook" - lifecyclev1alpha1 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1" - lifecyclev1alpha2 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2" - lifecyclev1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - optionsv1alpha1 "github.com/keptn/lifecycle-toolkit/operator/apis/options/v1alpha1" - controllercommon "github.com/keptn/lifecycle-toolkit/operator/controllers/common" - "github.com/keptn/lifecycle-toolkit/operator/controllers/lifecycle/keptnapp" - "github.com/keptn/lifecycle-toolkit/operator/controllers/lifecycle/keptnappcreationrequest" - "github.com/keptn/lifecycle-toolkit/operator/controllers/lifecycle/keptnappversion" - "github.com/keptn/lifecycle-toolkit/operator/controllers/lifecycle/keptnevaluation" - "github.com/keptn/lifecycle-toolkit/operator/controllers/lifecycle/keptntask" - "github.com/keptn/lifecycle-toolkit/operator/controllers/lifecycle/keptntaskdefinition" - "github.com/keptn/lifecycle-toolkit/operator/controllers/lifecycle/keptnworkload" - "github.com/keptn/lifecycle-toolkit/operator/controllers/lifecycle/keptnworkloadinstance" - controlleroptions "github.com/keptn/lifecycle-toolkit/operator/controllers/options" - "github.com/keptn/lifecycle-toolkit/operator/webhooks/pod_mutator" + lifecyclev1alpha1 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha1" + lifecyclev1alpha2 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha2" + lifecyclev1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + optionsv1alpha1 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/options/v1alpha1" + controllercommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/lifecycle/keptnapp" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/lifecycle/keptnappcreationrequest" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/lifecycle/keptnappversion" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/lifecycle/keptnevaluation" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/lifecycle/keptntask" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/lifecycle/keptntaskdefinition" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/lifecycle/keptnworkload" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/lifecycle/keptnworkloadinstance" + controlleroptions "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/options" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/webhooks/pod_mutator" "github.com/prometheus/client_golang/prometheus/promhttp" "go.opentelemetry.io/otel" otelprom "go.opentelemetry.io/otel/exporters/prometheus" @@ -71,7 +71,7 @@ func init() { utilruntime.Must(optionsv1alpha1.AddToScheme(scheme)) utilruntime.Must(lifecyclev1alpha3.AddToScheme(scheme)) utilruntime.Must(argov1alpha1.AddToScheme(scheme)) - //+kubebuilder:scaffold:scheme + // +kubebuilder:scaffold:scheme } type envConfig struct { diff --git a/operator/test/api/metrics/v1alpha3/groupversion_info.go b/lifecycle-operator/test/api/metrics/v1alpha3/groupversion_info.go similarity index 100% rename from operator/test/api/metrics/v1alpha3/groupversion_info.go rename to lifecycle-operator/test/api/metrics/v1alpha3/groupversion_info.go diff --git a/operator/test/api/metrics/v1alpha3/keptnmetric_types.go b/lifecycle-operator/test/api/metrics/v1alpha3/keptnmetric_types.go similarity index 100% rename from operator/test/api/metrics/v1alpha3/keptnmetric_types.go rename to lifecycle-operator/test/api/metrics/v1alpha3/keptnmetric_types.go diff --git a/operator/test/api/metrics/v1alpha3/zz_generated.deepcopy.go b/lifecycle-operator/test/api/metrics/v1alpha3/zz_generated.deepcopy.go similarity index 100% rename from operator/test/api/metrics/v1alpha3/zz_generated.deepcopy.go rename to lifecycle-operator/test/api/metrics/v1alpha3/zz_generated.deepcopy.go diff --git a/operator/test/component/DEVELOPER.md b/lifecycle-operator/test/component/DEVELOPER.md similarity index 100% rename from operator/test/component/DEVELOPER.md rename to lifecycle-operator/test/component/DEVELOPER.md diff --git a/operator/test/component/app/app_suite_test.go b/lifecycle-operator/test/component/app/app_suite_test.go similarity index 80% rename from operator/test/component/app/app_suite_test.go rename to lifecycle-operator/test/component/app/app_suite_test.go index 58028bda63..255681189e 100644 --- a/operator/test/component/app/app_suite_test.go +++ b/lifecycle-operator/test/component/app/app_suite_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - controllercommon "github.com/keptn/lifecycle-toolkit/operator/controllers/common" - "github.com/keptn/lifecycle-toolkit/operator/controllers/lifecycle/keptnapp" - "github.com/keptn/lifecycle-toolkit/operator/test/component/common" + controllercommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/lifecycle/keptnapp" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/test/component/common" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" otelsdk "go.opentelemetry.io/otel/sdk/trace" @@ -36,7 +36,7 @@ var _ = BeforeSuite(func() { var readyToStart chan struct{} ctx, k8sManager, tracer, spanRecorder, k8sClient, readyToStart = common.InitSuite() - ////setup controllers here + // //setup controllers here controller := &keptnapp.KeptnAppReconciler{ Client: k8sManager.GetClient(), Scheme: k8sManager.GetScheme(), @@ -49,7 +49,7 @@ var _ = BeforeSuite(func() { }) var _ = ReportAfterSuite("custom report", func(report Report) { - f, err := os.Create("report.app-operator") + f, err := os.Create("report.app-lifecycle-operator") Expect(err).ToNot(HaveOccurred(), "failed to generate report") for _, specReport := range report.SpecReports { common.WriteReport(specReport, f) diff --git a/operator/test/component/app/app_test.go b/lifecycle-operator/test/component/app/app_test.go similarity index 91% rename from operator/test/component/app/app_test.go rename to lifecycle-operator/test/component/app/app_test.go index 377b171908..4a565f53c1 100644 --- a/operator/test/component/app/app_test.go +++ b/lifecycle-operator/test/component/app/app_test.go @@ -3,9 +3,9 @@ package app_test import ( "fmt" - klcv1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - apicommon "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" - "github.com/keptn/lifecycle-toolkit/operator/test/component/common" + klcv1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + apicommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/test/component/common" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" otelsdk "go.opentelemetry.io/otel/sdk/trace" diff --git a/operator/test/component/appversion/appversion_suite_test.go b/lifecycle-operator/test/component/appversion/appversion_suite_test.go similarity index 81% rename from operator/test/component/appversion/appversion_suite_test.go rename to lifecycle-operator/test/component/appversion/appversion_suite_test.go index 03fde57f76..b6e692858f 100644 --- a/operator/test/component/appversion/appversion_suite_test.go +++ b/lifecycle-operator/test/component/appversion/appversion_suite_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - controllercommon "github.com/keptn/lifecycle-toolkit/operator/controllers/common" - "github.com/keptn/lifecycle-toolkit/operator/controllers/lifecycle/keptnappversion" - "github.com/keptn/lifecycle-toolkit/operator/test/component/common" + controllercommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/lifecycle/keptnappversion" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/test/component/common" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" otelsdk "go.opentelemetry.io/otel/sdk/trace" @@ -36,7 +36,7 @@ var _ = BeforeSuite(func() { var readyToStart chan struct{} ctx, k8sManager, tracer, spanRecorder, k8sClient, readyToStart = common.InitSuite() - ////setup controllers here + // //setup controllers here controller := &keptnappversion.KeptnAppVersionReconciler{ Client: k8sManager.GetClient(), Scheme: k8sManager.GetScheme(), @@ -51,7 +51,7 @@ var _ = BeforeSuite(func() { }) var _ = ReportAfterSuite("custom report", func(report Report) { - f, err := os.Create("report.appversion-operator") + f, err := os.Create("report.appversion-lifecycle-operator") Expect(err).ToNot(HaveOccurred(), "failed to generate report") for _, specReport := range report.SpecReports { common.WriteReport(specReport, f) diff --git a/operator/test/component/appversion/appversion_test.go b/lifecycle-operator/test/component/appversion/appversion_test.go similarity index 95% rename from operator/test/component/appversion/appversion_test.go rename to lifecycle-operator/test/component/appversion/appversion_test.go index e657882680..1cd4a403ad 100644 --- a/operator/test/component/appversion/appversion_test.go +++ b/lifecycle-operator/test/component/appversion/appversion_test.go @@ -5,9 +5,9 @@ import ( "strings" "time" - klcv1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - apicommon "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" - "github.com/keptn/lifecycle-toolkit/operator/test/component/common" + klcv1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + apicommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/test/component/common" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" diff --git a/operator/test/component/common/common.go b/lifecycle-operator/test/component/common/common.go similarity index 95% rename from operator/test/component/common/common.go rename to lifecycle-operator/test/component/common/common.go index 3dbffcfa17..ca2695ce79 100644 --- a/operator/test/component/common/common.go +++ b/lifecycle-operator/test/component/common/common.go @@ -8,10 +8,10 @@ import ( "strings" "time" - klcv1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - apicommon "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" - controllercommon "github.com/keptn/lifecycle-toolkit/operator/controllers/common" - metricsapi "github.com/keptn/lifecycle-toolkit/operator/test/api/metrics/v1alpha3" + klcv1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + apicommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" + controllercommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common" + metricsapi "github.com/keptn/lifecycle-toolkit/lifecycle-operator/test/api/metrics/v1alpha3" . "github.com/onsi/ginkgo/v2" ginkgotypes "github.com/onsi/ginkgo/v2/types" . "github.com/onsi/gomega" diff --git a/operator/test/component/evaluation/evaluation_suite_test.go b/lifecycle-operator/test/component/evaluation/evaluation_suite_test.go similarity index 82% rename from operator/test/component/evaluation/evaluation_suite_test.go rename to lifecycle-operator/test/component/evaluation/evaluation_suite_test.go index 5275362a48..3bf626377e 100644 --- a/operator/test/component/evaluation/evaluation_suite_test.go +++ b/lifecycle-operator/test/component/evaluation/evaluation_suite_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - controllercommon "github.com/keptn/lifecycle-toolkit/operator/controllers/common" - "github.com/keptn/lifecycle-toolkit/operator/controllers/lifecycle/keptnevaluation" - "github.com/keptn/lifecycle-toolkit/operator/test/component/common" + controllercommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/lifecycle/keptnevaluation" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/test/component/common" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" otelsdk "go.opentelemetry.io/otel/sdk/trace" @@ -40,7 +40,7 @@ var _ = BeforeSuite(func() { var readyToStart chan struct{} ctx, k8sManager, tracer, spanRecorder, k8sClient, readyToStart = common.InitSuite() - ////setup controllers here + // //setup controllers here controller := &keptnevaluation.KeptnEvaluationReconciler{ Client: k8sManager.GetClient(), Scheme: k8sManager.GetScheme(), @@ -57,7 +57,7 @@ var _ = BeforeSuite(func() { }) var _ = ReportAfterSuite("custom report", func(report Report) { - f, err := os.Create("report.evaluation-operator") + f, err := os.Create("report.evaluation-lifecycle-operator") Expect(err).ToNot(HaveOccurred(), "failed to generate report") for _, specReport := range report.SpecReports { common.WriteReport(specReport, f) diff --git a/operator/test/component/evaluation/evaluation_test.go b/lifecycle-operator/test/component/evaluation/evaluation_test.go similarity index 95% rename from operator/test/component/evaluation/evaluation_test.go rename to lifecycle-operator/test/component/evaluation/evaluation_test.go index 4fb3f2fd29..da0a442c43 100644 --- a/operator/test/component/evaluation/evaluation_test.go +++ b/lifecycle-operator/test/component/evaluation/evaluation_test.go @@ -5,11 +5,11 @@ import ( "fmt" "time" - klcv1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - apicommon "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" - controllercommon "github.com/keptn/lifecycle-toolkit/operator/controllers/common" - metricsapi "github.com/keptn/lifecycle-toolkit/operator/test/api/metrics/v1alpha3" - "github.com/keptn/lifecycle-toolkit/operator/test/component/common" + klcv1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + apicommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" + controllercommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common" + metricsapi "github.com/keptn/lifecycle-toolkit/lifecycle-operator/test/api/metrics/v1alpha3" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/test/component/common" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" v1 "k8s.io/api/core/v1" diff --git a/operator/test/component/load/load_suite_test.go b/lifecycle-operator/test/component/load/load_suite_test.go similarity index 80% rename from operator/test/component/load/load_suite_test.go rename to lifecycle-operator/test/component/load/load_suite_test.go index 1b4812bfbd..d86bd61a08 100644 --- a/operator/test/component/load/load_suite_test.go +++ b/lifecycle-operator/test/component/load/load_suite_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - controllercommon "github.com/keptn/lifecycle-toolkit/operator/controllers/common" - "github.com/keptn/lifecycle-toolkit/operator/controllers/lifecycle/keptnapp" - "github.com/keptn/lifecycle-toolkit/operator/test/component/common" + controllercommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/lifecycle/keptnapp" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/test/component/common" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" otelsdk "go.opentelemetry.io/otel/sdk/trace" @@ -36,7 +36,7 @@ var _ = BeforeSuite(func() { var readyToStart chan struct{} ctx, k8sManager, tracer, spanRecorder, k8sClient, readyToStart = common.InitSuite() - ////setup controllers here + // //setup controllers here controller := &keptnapp.KeptnAppReconciler{ Client: k8sManager.GetClient(), Scheme: k8sManager.GetScheme(), @@ -49,7 +49,7 @@ var _ = BeforeSuite(func() { }) var _ = ReportAfterSuite("custom report", func(report Report) { - f, err := os.Create("report.load-operator") + f, err := os.Create("report.load-lifecycle-operator") Expect(err).ToNot(HaveOccurred(), "failed to generate report") for _, specReport := range report.SpecReports { common.WriteReport(specReport, f) diff --git a/operator/test/component/load/load_test.go b/lifecycle-operator/test/component/load/load_test.go similarity index 89% rename from operator/test/component/load/load_test.go rename to lifecycle-operator/test/component/load/load_test.go index 0e0eaf9861..ad6f99d3bf 100644 --- a/operator/test/component/load/load_test.go +++ b/lifecycle-operator/test/component/load/load_test.go @@ -7,8 +7,8 @@ import ( "path" "time" - klcv1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - "github.com/keptn/lifecycle-toolkit/operator/test/component/common" + klcv1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/test/component/common" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -23,7 +23,7 @@ const LOAD = 100 var _ = Describe("Load", Ordered, func() { var ( - apps []*klcv1alpha3.KeptnApp //Shelf is declared here + apps []*klcv1alpha3.KeptnApp // Shelf is declared here appVersions []*klcv1alpha3.KeptnAppVersion metrics Metric ) diff --git a/operator/test/component/task/task_suite_test.go b/lifecycle-operator/test/component/task/task_suite_test.go similarity index 81% rename from operator/test/component/task/task_suite_test.go rename to lifecycle-operator/test/component/task/task_suite_test.go index b2c82a3098..abf0b7ae54 100644 --- a/operator/test/component/task/task_suite_test.go +++ b/lifecycle-operator/test/component/task/task_suite_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - controllercommon "github.com/keptn/lifecycle-toolkit/operator/controllers/common" - "github.com/keptn/lifecycle-toolkit/operator/controllers/lifecycle/keptntask" - "github.com/keptn/lifecycle-toolkit/operator/test/component/common" + controllercommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/lifecycle/keptntask" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/test/component/common" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" otelsdk "go.opentelemetry.io/otel/sdk/trace" @@ -37,7 +37,7 @@ var _ = BeforeSuite(func() { _ = os.Setenv(controllercommon.FunctionRuntimeImageKey, "my-image-js") _ = os.Setenv(controllercommon.PythonRuntimeImageKey, "my-image-py") - ////setup controllers here + // //setup controllers here controller := &keptntask.KeptnTaskReconciler{ Client: k8sManager.GetClient(), Scheme: k8sManager.GetScheme(), @@ -51,7 +51,7 @@ var _ = BeforeSuite(func() { }) var _ = ReportAfterSuite("custom report", func(report Report) { - f, err := os.Create("report.task-operator") + f, err := os.Create("report.task-lifecycle-operator") Expect(err).ToNot(HaveOccurred(), "failed to generate report") for _, specReport := range report.SpecReports { common.WriteReport(specReport, f) diff --git a/operator/test/component/task/task_test.go b/lifecycle-operator/test/component/task/task_test.go similarity index 96% rename from operator/test/component/task/task_test.go rename to lifecycle-operator/test/component/task/task_test.go index 6b10c509b8..26586a6490 100644 --- a/operator/test/component/task/task_test.go +++ b/lifecycle-operator/test/component/task/task_test.go @@ -3,10 +3,10 @@ package task_test import ( "context" - klcv1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - apicommon "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" - controllercommon "github.com/keptn/lifecycle-toolkit/operator/controllers/common" - "github.com/keptn/lifecycle-toolkit/operator/test/component/common" + klcv1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + apicommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" + controllercommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/test/component/common" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" batchv1 "k8s.io/api/batch/v1" diff --git a/operator/test/component/taskdefinition/taskdefinition_suite_test.go b/lifecycle-operator/test/component/taskdefinition/taskdefinition_suite_test.go similarity index 77% rename from operator/test/component/taskdefinition/taskdefinition_suite_test.go rename to lifecycle-operator/test/component/taskdefinition/taskdefinition_suite_test.go index 3f91a8e071..d332e236bf 100644 --- a/operator/test/component/taskdefinition/taskdefinition_suite_test.go +++ b/lifecycle-operator/test/component/taskdefinition/taskdefinition_suite_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" - controllercommon "github.com/keptn/lifecycle-toolkit/operator/controllers/common" - "github.com/keptn/lifecycle-toolkit/operator/controllers/lifecycle/keptntaskdefinition" - "github.com/keptn/lifecycle-toolkit/operator/test/component/common" + controllercommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/lifecycle/keptntaskdefinition" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/test/component/common" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ctrl "sigs.k8s.io/controller-runtime" @@ -30,7 +30,7 @@ var _ = BeforeSuite(func() { var readyToStart chan struct{} _, k8sManager, _, _, k8sClient, readyToStart = common.InitSuite() - ////setup controllers here + // //setup controllers here controller := &keptntaskdefinition.KeptnTaskDefinitionReconciler{ Client: k8sManager.GetClient(), Scheme: k8sManager.GetScheme(), @@ -42,7 +42,7 @@ var _ = BeforeSuite(func() { }) var _ = ReportAfterSuite("custom report", func(report Report) { - f, err := os.Create("report.taskdefinition-operator") + f, err := os.Create("report.taskdefinition-lifecycle-operator") Expect(err).ToNot(HaveOccurred(), "failed to generate report") for _, specReport := range report.SpecReports { common.WriteReport(specReport, f) diff --git a/operator/test/component/taskdefinition/taskdefinition_test.go b/lifecycle-operator/test/component/taskdefinition/taskdefinition_test.go similarity index 97% rename from operator/test/component/taskdefinition/taskdefinition_test.go rename to lifecycle-operator/test/component/taskdefinition/taskdefinition_test.go index c08ab34a96..10405d5838 100644 --- a/operator/test/component/taskdefinition/taskdefinition_test.go +++ b/lifecycle-operator/test/component/taskdefinition/taskdefinition_test.go @@ -3,8 +3,8 @@ package taskdefinition_test import ( "context" - klcv1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - "github.com/keptn/lifecycle-toolkit/operator/test/component/common" + klcv1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/test/component/common" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" v1 "k8s.io/api/core/v1" diff --git a/operator/test/component/workload/workload_suite_test.go b/lifecycle-operator/test/component/workload/workload_suite_test.go similarity index 80% rename from operator/test/component/workload/workload_suite_test.go rename to lifecycle-operator/test/component/workload/workload_suite_test.go index 0cf832cd46..a930493afd 100644 --- a/operator/test/component/workload/workload_suite_test.go +++ b/lifecycle-operator/test/component/workload/workload_suite_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - controllercommon "github.com/keptn/lifecycle-toolkit/operator/controllers/common" - "github.com/keptn/lifecycle-toolkit/operator/controllers/lifecycle/keptnworkload" - "github.com/keptn/lifecycle-toolkit/operator/test/component/common" + controllercommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/lifecycle/keptnworkload" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/test/component/common" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" otelsdk "go.opentelemetry.io/otel/sdk/trace" @@ -36,7 +36,7 @@ var _ = BeforeSuite(func() { var readyToStart chan struct{} ctx, k8sManager, tracer, spanRecorder, k8sClient, readyToStart = common.InitSuite() - ////setup controllers here + // //setup controllers here controller := &keptnworkload.KeptnWorkloadReconciler{ Client: k8sManager.GetClient(), Scheme: k8sManager.GetScheme(), @@ -49,7 +49,7 @@ var _ = BeforeSuite(func() { }) var _ = ReportAfterSuite("custom report", func(report Report) { - f, err := os.Create("report.workload-operator") + f, err := os.Create("report.workload-lifecycle-operator") Expect(err).ToNot(HaveOccurred(), "failed to generate report") for _, specReport := range report.SpecReports { common.WriteReport(specReport, f) diff --git a/operator/test/component/workload/workload_test.go b/lifecycle-operator/test/component/workload/workload_test.go similarity index 93% rename from operator/test/component/workload/workload_test.go rename to lifecycle-operator/test/component/workload/workload_test.go index 7447dbe779..c083b53170 100644 --- a/operator/test/component/workload/workload_test.go +++ b/lifecycle-operator/test/component/workload/workload_test.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - klcv1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - apicommon "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" - "github.com/keptn/lifecycle-toolkit/operator/test/component/common" + klcv1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + apicommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/test/component/common" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" otelsdk "go.opentelemetry.io/otel/sdk/trace" diff --git a/operator/test/component/workloadinstance/workloadinstance_suite_test.go b/lifecycle-operator/test/component/workloadinstance/workloadinstance_suite_test.go similarity index 81% rename from operator/test/component/workloadinstance/workloadinstance_suite_test.go rename to lifecycle-operator/test/component/workloadinstance/workloadinstance_suite_test.go index 86774f19cd..831c1af650 100644 --- a/operator/test/component/workloadinstance/workloadinstance_suite_test.go +++ b/lifecycle-operator/test/component/workloadinstance/workloadinstance_suite_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - controllercommon "github.com/keptn/lifecycle-toolkit/operator/controllers/common" - "github.com/keptn/lifecycle-toolkit/operator/controllers/lifecycle/keptnworkloadinstance" - "github.com/keptn/lifecycle-toolkit/operator/test/component/common" + controllercommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/lifecycle/keptnworkloadinstance" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/test/component/common" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" otelsdk "go.opentelemetry.io/otel/sdk/trace" @@ -36,7 +36,7 @@ var _ = BeforeSuite(func() { var readyToStart chan struct{} ctx, k8sManager, tracer, spanRecorder, k8sClient, readyToStart = common.InitSuite() - ////setup controllers here + // //setup controllers here controller := &keptnworkloadinstance.KeptnWorkloadInstanceReconciler{ Client: k8sManager.GetClient(), Scheme: k8sManager.GetScheme(), @@ -51,7 +51,7 @@ var _ = BeforeSuite(func() { }) var _ = ReportAfterSuite("custom report", func(report Report) { - f, err := os.Create("report.workloadinstance-operator") + f, err := os.Create("report.workloadinstance-lifecycle-operator") Expect(err).ToNot(HaveOccurred(), "failed to generate report") for _, specReport := range report.SpecReports { common.WriteReport(specReport, f) diff --git a/operator/test/component/workloadinstance/workloadinstance_test.go b/lifecycle-operator/test/component/workloadinstance/workloadinstance_test.go similarity index 98% rename from operator/test/component/workloadinstance/workloadinstance_test.go rename to lifecycle-operator/test/component/workloadinstance/workloadinstance_test.go index 29ab3491fe..5550f1f1c2 100644 --- a/operator/test/component/workloadinstance/workloadinstance_test.go +++ b/lifecycle-operator/test/component/workloadinstance/workloadinstance_test.go @@ -5,9 +5,9 @@ import ( "strings" "time" - klcv1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - apicommon "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" - "github.com/keptn/lifecycle-toolkit/operator/test/component/common" + klcv1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + apicommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/test/component/common" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" appsv1 "k8s.io/api/apps/v1" diff --git a/operator/test/e2e/DEVELOPER.md b/lifecycle-operator/test/e2e/DEVELOPER.md similarity index 97% rename from operator/test/e2e/DEVELOPER.md rename to lifecycle-operator/test/e2e/DEVELOPER.md index 65952c9267..4ab5ecefdf 100644 --- a/operator/test/e2e/DEVELOPER.md +++ b/lifecycle-operator/test/e2e/DEVELOPER.md @@ -7,7 +7,7 @@ This test suite can run test verifying the operator ```shell kind create cluster cd lifecycle-toolkit -make build-deploy-operator RELEASE_REGISTRY=yourregistry +make build-deploy-lifecycle-operator RELEASE_REGISTRY=yourregistry ``` diff --git a/operator/test/e2e/operator_test.go b/lifecycle-operator/test/e2e/operator_test.go similarity index 100% rename from operator/test/e2e/operator_test.go rename to lifecycle-operator/test/e2e/operator_test.go diff --git a/operator/test/e2e/suite_test.go b/lifecycle-operator/test/e2e/suite_test.go similarity index 95% rename from operator/test/e2e/suite_test.go rename to lifecycle-operator/test/e2e/suite_test.go index f7fe0a185a..833e25c678 100644 --- a/operator/test/e2e/suite_test.go +++ b/lifecycle-operator/test/e2e/suite_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - klcv1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" + klcv1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" . "github.com/onsi/ginkgo/v2" "github.com/onsi/ginkgo/v2/types" . "github.com/onsi/gomega" @@ -99,7 +99,7 @@ func ignoreAlreadyExists(err error) error { } var _ = ReportAfterSuite("custom report", func(report Report) { - f, err := os.Create("report.E2E-operator") + f, err := os.Create("report.E2E-lifecycle-operator") Expect(err).ToNot(HaveOccurred(), "failed to generate report") fmt.Fprintf(f, "%s \n", time.Now().UTC()) diff --git a/operator/webhooks/config.go b/lifecycle-operator/webhooks/config.go similarity index 100% rename from operator/webhooks/config.go rename to lifecycle-operator/webhooks/config.go diff --git a/operator/webhooks/pod_mutator/pod_mutating_webhook.go b/lifecycle-operator/webhooks/pod_mutator/pod_mutating_webhook.go similarity index 97% rename from operator/webhooks/pod_mutator/pod_mutating_webhook.go rename to lifecycle-operator/webhooks/pod_mutator/pod_mutating_webhook.go index d7183acf8c..d930f74247 100644 --- a/operator/webhooks/pod_mutator/pod_mutating_webhook.go +++ b/lifecycle-operator/webhooks/pod_mutator/pod_mutating_webhook.go @@ -11,11 +11,11 @@ import ( argov1alpha1 "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" "github.com/go-logr/logr" - klcv1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - apicommon "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" - "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/semconv" - operatorcommon "github.com/keptn/lifecycle-toolkit/operator/common" - controllercommon "github.com/keptn/lifecycle-toolkit/operator/controllers/common" + klcv1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + apicommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" + "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/semconv" + operatorcommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/common" + controllercommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/codes" "go.opentelemetry.io/otel/propagation" diff --git a/operator/webhooks/pod_mutator/pod_mutating_webhook_test.go b/lifecycle-operator/webhooks/pod_mutator/pod_mutating_webhook_test.go similarity index 99% rename from operator/webhooks/pod_mutator/pod_mutating_webhook_test.go rename to lifecycle-operator/webhooks/pod_mutator/pod_mutating_webhook_test.go index 67971737bf..d4f3579531 100644 --- a/operator/webhooks/pod_mutator/pod_mutating_webhook_test.go +++ b/lifecycle-operator/webhooks/pod_mutator/pod_mutating_webhook_test.go @@ -8,10 +8,10 @@ import ( "github.com/go-logr/logr" "github.com/go-logr/logr/testr" - klcv1alpha3 "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3" - apicommon "github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha3/common" - controllercommon "github.com/keptn/lifecycle-toolkit/operator/controllers/common" - fakeclient "github.com/keptn/lifecycle-toolkit/operator/controllers/common/fake" + klcv1alpha3 "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3" + apicommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/apis/lifecycle/v1alpha3/common" + controllercommon "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common" + fakeclient "github.com/keptn/lifecycle-toolkit/lifecycle-operator/controllers/common/fake" "github.com/stretchr/testify/require" "go.opentelemetry.io/otel/trace" admissionv1 "k8s.io/api/admission/v1" diff --git a/metrics-operator/api/v1alpha2/keptnmetricsprovider_types.go b/metrics-operator/api/v1alpha2/keptnmetricsprovider_types.go index f6ebbacd00..0193b5b11f 100644 --- a/metrics-operator/api/v1alpha2/keptnmetricsprovider_types.go +++ b/metrics-operator/api/v1alpha2/keptnmetricsprovider_types.go @@ -29,11 +29,9 @@ type KeptnMetricsProviderSpec struct { SecretKeyRef corev1.SecretKeySelector `json:"secretKeyRef,omitempty"` } -type EmptyStatus struct{} - -//+kubebuilder:object:root=true -//+kubebuilder:subresource:status -//+kubebuilder:resource:path=keptnmetricsproviders,shortName=kmp +// +kubebuilder:object:root=true +// +kubebuilder:subresource:status +// +kubebuilder:resource:path=keptnmetricsproviders,shortName=kmp // KeptnMetricsProvider is the Schema for the keptnmetricsproviders API type KeptnMetricsProvider struct { @@ -42,10 +40,10 @@ type KeptnMetricsProvider struct { Spec KeptnMetricsProviderSpec `json:"spec,omitempty"` // unused field - Status EmptyStatus `json:"status,omitempty"` + Status string `json:"status,omitempty"` } -//+kubebuilder:object:root=true +// +kubebuilder:object:root=true // KeptnMetricsProviderList contains a list of KeptnMetricsProvider type KeptnMetricsProviderList struct { diff --git a/metrics-operator/api/v1alpha2/zz_generated.deepcopy.go b/metrics-operator/api/v1alpha2/zz_generated.deepcopy.go index e156bcfc40..c160923088 100644 --- a/metrics-operator/api/v1alpha2/zz_generated.deepcopy.go +++ b/metrics-operator/api/v1alpha2/zz_generated.deepcopy.go @@ -25,21 +25,6 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" ) -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *EmptyStatus) DeepCopyInto(out *EmptyStatus) { - *out = *in -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EmptyStatus. -func (in *EmptyStatus) DeepCopy() *EmptyStatus { - if in == nil { - return nil - } - out := new(EmptyStatus) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *KeptnMetric) DeepCopyInto(out *KeptnMetric) { *out = *in @@ -142,7 +127,6 @@ func (in *KeptnMetricsProvider) DeepCopyInto(out *KeptnMetricsProvider) { out.TypeMeta = in.TypeMeta in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) in.Spec.DeepCopyInto(&out.Spec) - out.Status = in.Status } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KeptnMetricsProvider. diff --git a/metrics-operator/api/v1alpha3/keptnmetricsprovider_types.go b/metrics-operator/api/v1alpha3/keptnmetricsprovider_types.go index 4614280ba2..f60e6749ef 100644 --- a/metrics-operator/api/v1alpha3/keptnmetricsprovider_types.go +++ b/metrics-operator/api/v1alpha3/keptnmetricsprovider_types.go @@ -36,8 +36,6 @@ type KeptnMetricsProviderSpec struct { SecretKeyRef corev1.SecretKeySelector `json:"secretKeyRef,omitempty"` } -type EmptyStatus struct{} - // +kubebuilder:object:root=true // +kubebuilder:subresource:status // +kubebuilder:resource:path=keptnmetricsproviders,shortName=kmp @@ -50,7 +48,7 @@ type KeptnMetricsProvider struct { Spec KeptnMetricsProviderSpec `json:"spec,omitempty"` // unused field - Status EmptyStatus `json:"status,omitempty"` + Status string `json:"status,omitempty"` } // +kubebuilder:object:root=true diff --git a/metrics-operator/api/v1alpha3/zz_generated.deepcopy.go b/metrics-operator/api/v1alpha3/zz_generated.deepcopy.go index 707a32bb29..e52006c8e0 100644 --- a/metrics-operator/api/v1alpha3/zz_generated.deepcopy.go +++ b/metrics-operator/api/v1alpha3/zz_generated.deepcopy.go @@ -25,21 +25,6 @@ import ( "k8s.io/apimachinery/pkg/runtime" ) -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *EmptyStatus) DeepCopyInto(out *EmptyStatus) { - *out = *in -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new EmptyStatus. -func (in *EmptyStatus) DeepCopy() *EmptyStatus { - if in == nil { - return nil - } - out := new(EmptyStatus) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *KeptnMetric) DeepCopyInto(out *KeptnMetric) { *out = *in @@ -147,7 +132,6 @@ func (in *KeptnMetricsProvider) DeepCopyInto(out *KeptnMetricsProvider) { out.TypeMeta = in.TypeMeta in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) in.Spec.DeepCopyInto(&out.Spec) - out.Status = in.Status } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KeptnMetricsProvider. diff --git a/metrics-operator/config/crd/bases/metrics.keptn.sh_keptnmetricsproviders.yaml b/metrics-operator/config/crd/bases/metrics.keptn.sh_keptnmetricsproviders.yaml index bf3b531ea6..886d2a7da9 100644 --- a/metrics-operator/config/crd/bases/metrics.keptn.sh_keptnmetricsproviders.yaml +++ b/metrics-operator/config/crd/bases/metrics.keptn.sh_keptnmetricsproviders.yaml @@ -62,7 +62,7 @@ spec: type: object status: description: unused field - type: object + type: string type: object served: true storage: false @@ -122,7 +122,7 @@ spec: type: object status: description: unused field - type: object + type: string type: object served: true storage: true