Skip to content

[chore](pkg): fix gofumpt issues part 1 #4805

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

Merged
jaronoff97 merged 2 commits into from
Mar 8, 2026
Merged

[chore](pkg): fix gofumpt issues part 1 #4805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
803f873
[chore](pkg): fix gofumpt issues part 1
mmorel-35 Mar 6, 2026
97cad9d
Merge branch 'main' into gofumpt-pkg-1
mmorel-35 Mar 8, 2026
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
8 changes: 5 additions & 3 deletions pkg/collector/upgrade/versions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@ import (
"github.com/open-telemetry/opentelemetry-operator/apis/v1beta1"
)

// Deprecated use upgradeFuncV1beta1.
type upgradeFunc func(u VersionUpgrade, otelcol *v1alpha1.OpenTelemetryCollector) (*v1alpha1.OpenTelemetryCollector, error)
type upgradeFuncV1beta1 func(u VersionUpgrade, otelcol *v1beta1.OpenTelemetryCollector) (*v1beta1.OpenTelemetryCollector, error)
type (
// Deprecated use upgradeFuncV1beta1.
upgradeFunc func(u VersionUpgrade, otelcol *v1alpha1.OpenTelemetryCollector) (*v1alpha1.OpenTelemetryCollector, error)
upgradeFuncV1beta1 func(u VersionUpgrade, otelcol *v1beta1.OpenTelemetryCollector) (*v1beta1.OpenTelemetryCollector, error)
)

type otelcolVersion struct {
// deprecated use upgradeV1beta1.
Expand Down
18 changes: 12 additions & 6 deletions pkg/sidecar/pod_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,8 @@ func TestExistsIn(t *testing.T) {
pod corev1.Pod
expected bool
}{
{"has-sidecar",
{
"has-sidecar",
corev1.Pod{
Spec: corev1.PodSpec{
Containers: []corev1.Container{
Expand All @@ -331,9 +332,11 @@ func TestExistsIn(t *testing.T) {
},
},
},
true},
true,
},

{"does-have-native-sidecar",
{
"does-have-native-sidecar",
corev1.Pod{
Spec: corev1.PodSpec{
Containers: []corev1.Container{
Expand All @@ -344,15 +347,18 @@ func TestExistsIn(t *testing.T) {
},
},
},
true},
true,
},

{"does-not-have-sidecar",
{
"does-not-have-sidecar",
corev1.Pod{
Spec: corev1.PodSpec{
Containers: []corev1.Container{},
},
},
false},
false,
},
} {
t.Run(tt.desc, func(t *testing.T) {
useNativeSidecars := tt.desc == "does-have-native-sidecar"
Expand Down
Loading