chore(lifecycle-operator): clean up unused API logic (#3351)

Signed-off-by: odubajDT <ondrej.dubaj@dynatrace.com>
keptn · Apr 2, 2024 · 016dc07 · 016dc07
1 parent 01c3bdb
commit 016dc07
Show file tree

Hide file tree

Showing 104 changed files with 176 additions and 12,126 deletions.
diff --git a/.github/scripts/.helm-tests/default/result.yaml b/.github/scripts/.helm-tests/default/result.yaml
@@ -1710,6 +1710,8 @@ spec:
                     MapCarrier is a TextMapCarrier that uses a map held in memory as a storage
                     medium for propagated key-value pairs.
                   type: object
+                description: PhaseTraceID is a map storing TraceIDs of OpenTelemetry
+                  spans in lifecycle phases
                 type: object
               postDeploymentEvaluationStatus:
                 default: Pending

diff --git a/.github/scripts/.helm-tests/lifecycle-only/result.yaml b/.github/scripts/.helm-tests/lifecycle-only/result.yaml
@@ -1656,6 +1656,8 @@ spec:
                     MapCarrier is a TextMapCarrier that uses a map held in memory as a storage
                     medium for propagated key-value pairs.
                   type: object
+                description: PhaseTraceID is a map storing TraceIDs of OpenTelemetry
+                  spans in lifecycle phases
                 type: object
               postDeploymentEvaluationStatus:
                 default: Pending

diff --git a/.github/scripts/.helm-tests/lifecycle-with-certs/result.yaml b/.github/scripts/.helm-tests/lifecycle-with-certs/result.yaml
@@ -1671,6 +1671,8 @@ spec:
                     MapCarrier is a TextMapCarrier that uses a map held in memory as a storage
                     medium for propagated key-value pairs.
                   type: object
+                description: PhaseTraceID is a map storing TraceIDs of OpenTelemetry
+                  spans in lifecycle phases
                 type: object
               postDeploymentEvaluationStatus:
                 default: Pending

diff --git a/.github/scripts/.helm-tests/local-global-precedence/result.yaml b/.github/scripts/.helm-tests/local-global-precedence/result.yaml
@@ -1774,6 +1774,8 @@ spec:
                     MapCarrier is a TextMapCarrier that uses a map held in memory as a storage
                     medium for propagated key-value pairs.
                   type: object
+                description: PhaseTraceID is a map storing TraceIDs of OpenTelemetry
+                  spans in lifecycle phases
                 type: object
               postDeploymentEvaluationStatus:
                 default: Pending

diff --git a/docs/docs/reference/api-reference/lifecycle/v1/index.md b/docs/docs/reference/api-reference/lifecycle/v1/index.md
@@ -1091,7 +1091,7 @@ _Appears in:_
 
 _Underlying type:_ _[MapCarrier](https://pkg.go.dev/go.opentelemetry.io/otel/propagation#MapCarrier)_
 
-
+PhaseTraceID is a map storing TraceIDs of OpenTelemetry spans in lifecycle phases
 
 
 

diff --git a/docs/docs/reference/api-reference/lifecycle/v1alpha1/index.md b/docs/docs/reference/api-reference/lifecycle/v1alpha1/index.md
@@ -156,10 +156,6 @@ _Appears in:_
 | `configMap` _string_ |  || ✓ |  |
 
 
-
-
-
-
 #### HttpReference
 
 
@@ -499,10 +495,6 @@ _Appears in:_
 | `endTime` _[Time](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#time-v1-meta)_ |  || ✓ |  |
 
 
-
-
-
-
 #### KeptnState
 
 _Underlying type:_ _string_
@@ -931,8 +923,6 @@ _Appears in:_
 | `secret` _string_ |  || ✓ |  |
 
 
-
-
 #### TaskContext
 
 

diff --git a/docs/docs/reference/api-reference/lifecycle/v1alpha2/index.md b/docs/docs/reference/api-reference/lifecycle/v1alpha2/index.md
@@ -497,10 +497,6 @@ _Appears in:_
 | `endTime` _[Time](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#time-v1-meta)_ |  || ✓ |  |
 
 
-
-
-
-
 #### KeptnState
 
 _Underlying type:_ _string_
@@ -882,7 +878,7 @@ _Appears in:_
 
 _Underlying type:_ _[MapCarrier](https://pkg.go.dev/go.opentelemetry.io/otel/propagation#MapCarrier)_
 
-
+PhaseTraceID is a map storing TraceIDs of OpenTelemetry spans in lifecycle phases
 
 
 
@@ -928,8 +924,6 @@ _Appears in:_
 | `secret` _string_ |  || ✓ |  |
 
 
-
-
 #### TaskContext
 
 

diff --git a/docs/docs/reference/api-reference/lifecycle/v1alpha3/index.md b/docs/docs/reference/api-reference/lifecycle/v1alpha3/index.md
@@ -34,8 +34,6 @@ Package v1alpha3 contains API Schema definitions for the lifecycle v1alpha3 API
 
 
 
-
-
 #### AutomountServiceAccountTokenSpec
 
 
@@ -560,8 +558,6 @@ _Appears in:_
 | `endTime` _[Time](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#time-v1-meta)_ | EndTime represents the time at which the KeptnEvaluation finished. || ✓ |  |
 
 
-
-
 #### KeptnMetricReference
 
 
@@ -579,8 +575,6 @@ _Appears in:_
 | `namespace` _string_ | Namespace is the namespace where the referenced KeptnMetric is located. || ✓ |  |
 
 
-
-
 #### KeptnState
 
 _Underlying type:_ _string_
@@ -969,7 +963,7 @@ _Appears in:_
 
 _Underlying type:_ _[MapCarrier](https://pkg.go.dev/go.opentelemetry.io/otel/propagation#MapCarrier)_
 
-
+PhaseTraceID is a map storing TraceIDs of OpenTelemetry spans in lifecycle phases
 
 
 
@@ -1053,8 +1047,6 @@ _Appears in:_
 | `name` _string_ |  || x |  |
 
 
-
-
 #### TaskContext
 
 

diff --git a/docs/docs/reference/api-reference/lifecycle/v1beta1/index.md b/docs/docs/reference/api-reference/lifecycle/v1beta1/index.md
@@ -36,8 +36,6 @@ Package v1beta1 contains API Schema definitions for the lifecycle v1beta1 API gr
 
 
 
-
-
 #### AutomountServiceAccountTokenSpec
 
 
@@ -679,8 +677,6 @@ _Appears in:_
 | `endTime` _[Time](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#time-v1-meta)_ | EndTime represents the time at which the KeptnEvaluation finished. || ✓ |  |
 
 
-
-
 #### KeptnMetricReference
 
 
@@ -698,8 +694,6 @@ _Appears in:_
 | `namespace` _string_ | Namespace is the namespace where the referenced KeptnMetric is located. || ✓ |  |
 
 
-
-
 #### KeptnState
 
 _Underlying type:_ _string_
@@ -1092,7 +1086,7 @@ _Appears in:_
 
 _Underlying type:_ _[MapCarrier](https://pkg.go.dev/go.opentelemetry.io/otel/propagation#MapCarrier)_
 
-
+PhaseTraceID is a map storing TraceIDs of OpenTelemetry spans in lifecycle phases
 
 
 
@@ -1176,8 +1170,6 @@ _Appears in:_
 | `name` _string_ |  || x |  |
 
 
-
-
 #### TaskContext
 
 

diff --git a/lifecycle-operator/apis/lifecycle/v1/common/phases.go b/lifecycle-operator/apis/lifecycle/v1/common/phases.go
@@ -115,6 +115,7 @@ var (
 	PhaseDeprecated               = KeptnPhaseType{LongName: "Deprecated", ShortName: "Deprecated"}
 )
 
+// PhaseTraceID is a map storing TraceIDs of OpenTelemetry spans in lifecycle phases
 type PhaseTraceID map[string]propagation.MapCarrier
 
 func (pid PhaseTraceID) SetPhaseTraceID(phase string, carrier propagation.MapCarrier) {

diff --git a/lifecycle-operator/apis/lifecycle/v1/keptnapp_types.go b/lifecycle-operator/apis/lifecycle/v1/keptnapp_types.go
@@ -24,9 +24,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-// EDIT THIS FILE!  THIS IS SCAFFOLDING FOR YOU TO OWN!
-// NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
-
 // KeptnAppSpec defines the desired state of KeptnApp
 type KeptnAppSpec struct {
 	// Version defines the version of the application. For automatically created KeptnApps,

diff --git a/lifecycle-operator/apis/lifecycle/v1alpha1/common/common.go b/lifecycle-operator/apis/lifecycle/v1alpha1/common/common.go
@@ -5,179 +5,17 @@ package common
 
 import (
 	"errors"
-	"fmt"
-	"math/rand"
 
-	"go.opentelemetry.io/otel/attribute"
-	"go.opentelemetry.io/otel/metric"
+	"go.opentelemetry.io/otel/propagation"
 )
 
-const WorkloadAnnotation = "keptn.sh/workload"
-const VersionAnnotation = "keptn.sh/version"
-const AppAnnotation = "keptn.sh/app"
-const PreDeploymentTaskAnnotation = "keptn.sh/pre-deployment-tasks"
-const PostDeploymentTaskAnnotation = "keptn.sh/post-deployment-tasks"
-const K8sRecommendedWorkloadAnnotations = "app.kubernetes.io/name"
-const K8sRecommendedVersionAnnotations = "app.kubernetes.io/version"
-const K8sRecommendedAppAnnotations = "app.kubernetes.io/part-of"
-const PreDeploymentEvaluationAnnotation = "keptn.sh/pre-deployment-evaluations"
-const PostDeploymentEvaluationAnnotation = "keptn.sh/post-deployment-evaluations"
-const TaskNameAnnotation = "keptn.sh/task-name"
-const NamespaceEnabledAnnotation = "keptn.sh/lifecycle-toolkit"
-
-const CreateAppTaskSpanName = "create_%s_app_task"
-const CreateWorkloadTaskSpanName = "create_%s_deployment_task"
-const CreateAppEvalSpanName = "create_%s_app_evaluation"
-const CreateWorkloadEvalSpanName = "create_%s_deployment_evaluation"
-
-const MaxAppNameLength = 25
-const MaxWorkloadNameLength = 25
-const MaxTaskNameLength = 25
-const MaxVersionLength = 12
-
 var ErrCannotCastKeptnAppVersion = errors.New("cannot cast KeptnAppVersion to v1")
 var ErrCannotCastKeptnApp = errors.New("cannot cast KeptnApp to v1")
 
 // KeptnState  is a string containing current Phase state  (Progressing/Succeeded/Failed/Unknown/Pending/Cancelled)
 type KeptnState string
 
-const (
-	StateProgressing KeptnState = "Progressing"
-	StateSucceeded   KeptnState = "Succeeded"
-	StateFailed      KeptnState = "Failed"
-	StateUnknown     KeptnState = "Unknown"
-	StatePending     KeptnState = "Pending"
-	StateCancelled   KeptnState = "Cancelled"
-)
-
-func (k KeptnState) IsCompleted() bool {
-	return k == StateSucceeded || k == StateFailed || k == StateCancelled
-}
-
-func (k KeptnState) IsSucceeded() bool {
-	return k == StateSucceeded
-}
-
-func (k KeptnState) IsFailed() bool {
-	return k == StateFailed
-}
-
-func (k KeptnState) IsCancelled() bool {
-	return k == StateCancelled
-}
-
-func (k KeptnState) IsPending() bool {
-	return k == StatePending
-}
-
-type StatusSummary struct {
-	Total       int
-	Progressing int
-	Failed      int
-	Succeeded   int
-	Pending     int
-	Unknown     int
-	Cancelled   int
-}
-
-func UpdateStatusSummary(status KeptnState, summary StatusSummary) StatusSummary {
-	switch status {
-	case StateFailed:
-		summary.Failed++
-	case StateCancelled:
-		summary.Cancelled++
-	case StateSucceeded:
-		summary.Succeeded++
-	case StateProgressing:
-		summary.Progressing++
-	case StatePending, "":
-		summary.Pending++
-	case StateUnknown:
-		summary.Unknown++
-	}
-	return summary
-}
-
-func (s StatusSummary) GetTotalCount() int {
-	return s.Failed + s.Succeeded + s.Progressing + s.Pending + s.Unknown + s.Cancelled
-}
-
-func GetOverallState(s StatusSummary) KeptnState {
-	if s.Failed > 0 || s.Cancelled > 0 {
-		return StateFailed
-	}
-	if s.Progressing > 0 {
-		return StateProgressing
-	}
-	if s.Pending > 0 {
-		return StatePending
-	}
-	if s.Unknown > 0 || s.GetTotalCount() != s.Total {
-		return StateUnknown
-	}
-	return StateSucceeded
-}
-
-func TruncateString(s string, max int) string {
-	if len(s) > max {
-		return s[:max]
-	}
-	return s
-}
-
 type CheckType string
 
-const PreDeploymentCheckType CheckType = "pre"
-const PostDeploymentCheckType CheckType = "post"
-const PreDeploymentEvaluationCheckType CheckType = "pre-eval"
-const PostDeploymentEvaluationCheckType CheckType = "post-eval"
-
-type KeptnMeters struct {
-	TaskCount          metric.Int64Counter
-	TaskDuration       metric.Float64Histogram
-	DeploymentCount    metric.Int64Counter
-	DeploymentDuration metric.Float64Histogram
-	AppCount           metric.Int64Counter
-	AppDuration        metric.Float64Histogram
-	EvaluationCount    metric.Int64Counter
-	EvaluationDuration metric.Float64Histogram
-}
-
-const (
-	AppName                 attribute.Key = attribute.Key("keptn.deployment.app.name")
-	AppVersion              attribute.Key = attribute.Key("keptn.deployment.app.version")
-	AppNamespace            attribute.Key = attribute.Key("keptn.deployment.app.namespace")
-	AppStatus               attribute.Key = attribute.Key("keptn.deployment.app.status")
-	AppPreviousVersion      attribute.Key = attribute.Key("keptn.deployment.app.previousversion")
-	WorkloadName            attribute.Key = attribute.Key("keptn.deployment.workload.name")
-	WorkloadVersion         attribute.Key = attribute.Key("keptn.deployment.workload.version")
-	WorkloadPreviousVersion attribute.Key = attribute.Key("keptn.deployment.workload.previousversion")
-	WorkloadNamespace       attribute.Key = attribute.Key("keptn.deployment.workload.namespace")
-	WorkloadStatus          attribute.Key = attribute.Key("keptn.deployment.workload.status")
-	TaskStatus              attribute.Key = attribute.Key("keptn.deployment.task.status")
-	TaskName                attribute.Key = attribute.Key("keptn.deployment.task.name")
-	TaskType                attribute.Key = attribute.Key("keptn.deployment.task.type")
-	EvaluationStatus        attribute.Key = attribute.Key("keptn.deployment.evaluation.status")
-	EvaluationName          attribute.Key = attribute.Key("keptn.deployment.evaluation.name")
-	EvaluationType          attribute.Key = attribute.Key("keptn.deployment.evaluation.type")
-)
-
-func GenerateTaskName(checkType CheckType, taskName string) string {
-	randomId := rand.Intn(99_999-10_000) + 10000
-	return fmt.Sprintf("%s-%s-%d", checkType, TruncateString(taskName, 32), randomId)
-}
-
-func GenerateEvaluationName(checkType CheckType, evalName string) string {
-	randomId := rand.Intn(99_999-10_000) + 10000
-	return fmt.Sprintf("%s-%s-%d", checkType, TruncateString(evalName, 27), randomId)
-}
-
-type GaugeValue struct {
-	Value      int64
-	Attributes []attribute.KeyValue
-}
-
-type GaugeFloatValue struct {
-	Value      float64
-	Attributes []attribute.KeyValue
-}
+// PhaseTraceID is a map storing TraceIDs of OpenTelemetry spans in lifecycle phases
+type PhaseTraceID map[string]propagation.MapCarrier