Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(operator): fix linter issues #579

Merged
merged 14 commits into from
Jan 12, 2023
Merged

chore(operator): fix linter issues #579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
1c06d94
rebase to current main
odubajDT Jan 10, 2023
9b19c47
introduce linter ignorers
odubajDT Jan 10, 2023
7c93eea
additional linter ignorers
odubajDT Jan 10, 2023
52f6e17
more linters
odubajDT Jan 10, 2023
9d38dff
final
odubajDT Jan 10, 2023
3e8c81b
debug
odubajDT Jan 10, 2023
ca3e4e6
fixed race in component tests
odubajDT Jan 10, 2023
45898c1
refactor keptnevaluation controller
odubajDT Jan 11, 2023
0b55559
refactor workloadinstane and appversion controllers
odubajDT Jan 11, 2023
51ced15
refactor workloadinstance
odubajDT Jan 11, 2023
439a0b4
pr review
odubajDT Jan 12, 2023
7f46088
fix flaky test
odubajDT Jan 12, 2023
eb1c08c
Update operator/controllers/common/helperfunctions.go
odubajDT Jan 12, 2023
6304702
Update operator/controllers/common/helperfunctions.go
odubajDT Jan 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions operator/apis/lifecycle/v1alpha1/keptnappversion_conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ import (
)

// ConvertTo converts the src v1alpha1.KeptnAppVersion to the hub version (v1alpha2.KeptnAppVersion)
//
//nolint:gocyclo
func (src *KeptnAppVersion) ConvertTo(dstRaw conversion.Hub) error {
dst, ok := dstRaw.(*v1alpha2.KeptnAppVersion)

Expand Down Expand Up @@ -121,6 +123,8 @@ func (src *KeptnAppVersion) ConvertTo(dstRaw conversion.Hub) error {
}

// ConvertFrom converts from the hub version (v1alpha2.KeptnAppVersion) to this version (v1alpha1.KeptnAppVersion)
//
//nolint:gocyclo
func (dst *KeptnAppVersion) ConvertFrom(srcRaw conversion.Hub) error {
src, ok := srcRaw.(*v1alpha2.KeptnAppVersion)

Expand Down
1 change: 1 addition & 0 deletions operator/apis/lifecycle/v1alpha1/keptnappversion_conversion_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//nolint:dupl
package v1alpha1

import (
Expand Down
2 changes: 2 additions & 0 deletions operator/apis/lifecycle/v1alpha1/keptnappversion_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

//nolint:dupl
func TestKeptnAppVersion(t *testing.T) {
app := &KeptnAppVersion{
ObjectMeta: metav1.ObjectMeta{
Expand Down Expand Up @@ -244,6 +245,7 @@ func TestKeptnAppVersion_GetWorkloadNameOfApp(t *testing.T) {
}
}

//nolint:dupl
func TestKeptnAppVersion_CancelRemainingPhases(t *testing.T) {
app := KeptnAppVersion{
Status: KeptnAppVersionStatus{
Expand Down
4 changes: 2 additions & 2 deletions operator/apis/lifecycle/v1alpha1/keptnevaluationprovider_conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ package v1alpha1

import (
"fmt"
"github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1/common"
corev1 "k8s.io/api/core/v1"

"github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1/common"
"github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2"
corev1 "k8s.io/api/core/v1"
"sigs.k8s.io/controller-runtime/pkg/conversion"
)

Expand Down
8 changes: 4 additions & 4 deletions operator/apis/lifecycle/v1alpha1/keptnevaluationprovider_conversion_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package v1alpha1

import (
"github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1/common"
corev1 "k8s.io/api/core/v1"
v2 "sigs.k8s.io/controller-runtime/pkg/webhook/conversion/testdata/api/v2"
"testing"

"github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha1/common"
"github.com/keptn/lifecycle-toolkit/operator/apis/lifecycle/v1alpha2"
"github.com/stretchr/testify/require"
"k8s.io/apimachinery/pkg/apis/meta/v1"
corev1 "k8s.io/api/core/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
v2 "sigs.k8s.io/controller-runtime/pkg/webhook/conversion/testdata/api/v2"
)

func TestKeptnEvalProvider_ConvertFrom(t *testing.T) {
Expand Down
1 change: 1 addition & 0 deletions operator/apis/lifecycle/v1alpha1/keptnworkloadinstance_conversion_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//nolint:dupl
package v1alpha1

import (
Expand Down
2 changes: 2 additions & 0 deletions operator/apis/lifecycle/v1alpha1/keptnworkloadinstance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

//nolint:dupl
func TestKeptnWorkloadInstance(t *testing.T) {
workload := &KeptnWorkloadInstance{
ObjectMeta: metav1.ObjectMeta{
Expand Down Expand Up @@ -217,6 +218,7 @@ func TestKeptnWorkloadInstance(t *testing.T) {
}, workload.GetSpanAttributes())
}

//nolint:dupl
func TestKeptnWorkloadInstance_CancelRemainingPhases(t *testing.T) {
workloadInstance := KeptnWorkloadInstance{
Status: KeptnWorkloadInstanceStatus{
Expand Down
1 change: 1 addition & 0 deletions operator/apis/lifecycle/v1alpha2/keptnappversion_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,7 @@ func TestKeptnAppVersion_GetWorkloadNameOfApp(t *testing.T) {
}
}

//nolint:dupl
func TestKeptnAppVersion_DeprecateRemainingPhases(t *testing.T) {
app := KeptnAppVersion{
Status: KeptnAppVersionStatus{
Expand Down
1 change: 1 addition & 0 deletions operator/apis/lifecycle/v1alpha2/keptnappversion_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,7 @@ func (v KeptnAppVersion) GetWorkloadNameOfApp(workloadName string) string {
return fmt.Sprintf("%s-%s", v.Spec.AppName, workloadName)
}

//nolint:dupl
func (a *KeptnAppVersion) DeprecateRemainingPhases(phase common.KeptnPhaseType) {
// no need to deprecate anything when post-eval tasks fail
if phase == common.PhaseAppPostEvaluation {
Expand Down
1 change: 1 addition & 0 deletions operator/apis/lifecycle/v1alpha2/keptnworkloadinstance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@ func TestKeptnWorkloadInstance(t *testing.T) {
}, workload.GetSpanAttributes())
}

//nolint:dupl
func TestKeptnWorkloadInstance_DeprecateRemainingPhases(t *testing.T) {
workloadInstance := KeptnWorkloadInstance{
Status: KeptnWorkloadInstanceStatus{
Expand Down
1 change: 1 addition & 0 deletions operator/apis/lifecycle/v1alpha2/keptnworkloadinstance_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,6 +379,7 @@ func (w KeptnWorkloadInstance) SetSpanAttributes(span trace.Span) {
span.SetAttributes(w.GetSpanAttributes()...)
}

//nolint:dupl
func (w *KeptnWorkloadInstance) DeprecateRemainingPhases(phase common.KeptnPhaseType) {
// no need to deprecate anything when post-eval tasks fail
if phase == common.PhaseWorkloadPostEvaluation {
Expand Down
16 changes: 8 additions & 8 deletions operator/config/crd/bases/lifecycle.keptn.sh_keptnappversions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,13 +360,13 @@ spec:
items:
properties:
definitionName:
description: name of EvaluationDefinition/TaskDefiniton
description: DefinitionName is the name of the EvaluationDefinition/TaskDefiniton
type: string
endTime:
format: date-time
type: string
name:
description: name of Evaluation/Task
description: Name is the name of the Evaluation/Task
type: string
startTime:
format: date-time
Expand All @@ -383,13 +383,13 @@ spec:
items:
properties:
definitionName:
description: name of EvaluationDefinition/TaskDefiniton
description: DefinitionName is the name of the EvaluationDefinition/TaskDefiniton
type: string
endTime:
format: date-time
type: string
name:
description: name of Evaluation/Task
description: Name is the name of the Evaluation/Task
type: string
startTime:
format: date-time
Expand All @@ -406,13 +406,13 @@ spec:
items:
properties:
definitionName:
description: name of EvaluationDefinition/TaskDefiniton
description: DefinitionName is the name of the EvaluationDefinition/TaskDefiniton
type: string
endTime:
format: date-time
type: string
name:
description: name of Evaluation/Task
description: Name is the name of the Evaluation/Task
type: string
startTime:
format: date-time
Expand All @@ -429,13 +429,13 @@ spec:
items:
properties:
definitionName:
description: name of EvaluationDefinition/TaskDefiniton
description: DefinitionName is the name of the EvaluationDefinition/TaskDefiniton
type: string
endTime:
format: date-time
type: string
name:
description: name of Evaluation/Task
description: Name is the name of the Evaluation/Task
type: string
startTime:
format: date-time
Expand Down
16 changes: 8 additions & 8 deletions operator/config/crd/bases/lifecycle.keptn.sh_keptnworkloadinstances.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,13 +370,13 @@ spec:
items:
properties:
definitionName:
description: name of EvaluationDefinition/TaskDefiniton
description: DefinitionName is the name of the EvaluationDefinition/TaskDefiniton
type: string
endTime:
format: date-time
type: string
name:
description: name of Evaluation/Task
description: Name is the name of the Evaluation/Task
type: string
startTime:
format: date-time
Expand All @@ -393,13 +393,13 @@ spec:
items:
properties:
definitionName:
description: name of EvaluationDefinition/TaskDefiniton
description: DefinitionName is the name of the EvaluationDefinition/TaskDefiniton
type: string
endTime:
format: date-time
type: string
name:
description: name of Evaluation/Task
description: Name is the name of the Evaluation/Task
type: string
startTime:
format: date-time
Expand All @@ -416,13 +416,13 @@ spec:
items:
properties:
definitionName:
description: name of EvaluationDefinition/TaskDefiniton
description: DefinitionName is the name of the EvaluationDefinition/TaskDefiniton
type: string
endTime:
format: date-time
type: string
name:
description: name of Evaluation/Task
description: Name is the name of the Evaluation/Task
type: string
startTime:
format: date-time
Expand All @@ -439,13 +439,13 @@ spec:
items:
properties:
definitionName:
description: name of EvaluationDefinition/TaskDefiniton
description: DefinitionName is the name of the EvaluationDefinition/TaskDefiniton
type: string
endTime:
format: date-time
type: string
name:
description: name of Evaluation/Task
description: Name is the name of the Evaluation/Task
type: string
startTime:
format: date-time
Expand Down
Loading