diff --git a/pkg/collector/upgrade/versions.go b/pkg/collector/upgrade/versions.go index 71069fa909..8484a18e5d 100644 --- a/pkg/collector/upgrade/versions.go +++ b/pkg/collector/upgrade/versions.go @@ -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. diff --git a/pkg/sidecar/pod_test.go b/pkg/sidecar/pod_test.go index 78fe9ad125..3c25adc3fa 100644 --- a/pkg/sidecar/pod_test.go +++ b/pkg/sidecar/pod_test.go @@ -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{ @@ -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{ @@ -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"