diff --git a/go.mod b/go.mod index 5aa905820..2659a6a9e 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/radiofrance/dib -go 1.26.6 +go 1.27.1 require ( github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.14.0 diff --git a/pkg/buildkit/builder.go b/pkg/buildkit/builder.go index bba2d0292..467ecdd21 100644 --- a/pkg/buildkit/builder.go +++ b/pkg/buildkit/builder.go @@ -371,9 +371,7 @@ func buildPod(dockerConfigSecret string, podConfig k8sutils.PodConfig, args []st for _, secretName := range podConfig.EnvSecrets { envFrom = append(envFrom, corev1.EnvFromSource{ SecretRef: &corev1.SecretEnvSource{ - LocalObjectReference: corev1.LocalObjectReference{ - Name: secretName, - }, + Name: secretName, }, }) } @@ -398,19 +396,15 @@ func buildPod(dockerConfigSecret string, podConfig k8sutils.PodConfig, args []st }, }, LivenessProbe: &corev1.Probe{ - ProbeHandler: corev1.ProbeHandler{ - Exec: &corev1.ExecAction{ - Command: []string{"buildctl", "debug", "workers"}, - }, + Exec: &corev1.ExecAction{ + Command: []string{"buildctl", "debug", "workers"}, }, InitialDelaySeconds: 5, PeriodSeconds: 30, }, ReadinessProbe: &corev1.Probe{ - ProbeHandler: corev1.ProbeHandler{ - Exec: &corev1.ExecAction{ - Command: []string{"buildctl", "debug", "workers"}, - }, + Exec: &corev1.ExecAction{ + Command: []string{"buildctl", "debug", "workers"}, }, InitialDelaySeconds: 5, PeriodSeconds: 30, @@ -476,11 +470,9 @@ func buildPod(dockerConfigSecret string, podConfig k8sutils.PodConfig, args []st Volumes: []corev1.Volume{ { Name: dockerConfigSecret, - VolumeSource: corev1.VolumeSource{ - Secret: &corev1.SecretVolumeSource{ - SecretName: dockerConfigSecret, - DefaultMode: ptr.To[int32](420), - }, + Secret: &corev1.SecretVolumeSource{ + SecretName: dockerConfigSecret, + DefaultMode: ptr.To[int32](420), }, }, }, diff --git a/pkg/dib/build_test.go b/pkg/dib/build_test.go index 1de675ce7..2025fba92 100644 --- a/pkg/dib/build_test.go +++ b/pkg/dib/build_test.go @@ -208,9 +208,7 @@ func TestRebuildGraph(t *testing.T) { Version: "v1.0.0", Graph: test.buildGraph(), TestRunners: test.testRunners, - BuildOpts: dib.BuildOpts{ - ReportsDir: mock.ReportsDir, - }, + ReportsDir: mock.ReportsDir, } res := dibBuilder.RebuildGraph(context.Background(), builder, mock.RateLimiter{}, map[string]string{}) diff --git a/pkg/dib/plan_test.go b/pkg/dib/plan_test.go index 42dd04c5c..d58a0aced 100644 --- a/pkg/dib/plan_test.go +++ b/pkg/dib/plan_test.go @@ -59,11 +59,9 @@ func Test_Plan_RebuildAll(t *testing.T) { } dibBuilder := &dib.Builder{ - Graph: graph, - BuildOpts: dib.BuildOpts{ - ForceRebuild: true, - NoTests: false, - }, + Graph: graph, + ForceRebuild: true, + NoTests: false, } err := dibBuilder.Plan(registry) require.NoError(t, err) @@ -113,11 +111,9 @@ func Test_Plan_RebuildOnlyModifiedImages(t *testing.T) { } dibBuilder := &dib.Builder{ - Graph: graph, - BuildOpts: dib.BuildOpts{ - ForceRebuild: false, - NoTests: false, - }, + Graph: graph, + ForceRebuild: false, + NoTests: false, } err := dibBuilder.Plan(registry) require.NoError(t, err) @@ -161,11 +157,9 @@ func Test_Plan_TestsDisabled(t *testing.T) { registry.ExistingRefs = []string{} dibBuilder := &dib.Builder{ - Graph: graph, - BuildOpts: dib.BuildOpts{ - ForceRebuild: true, - NoTests: true, - }, + Graph: graph, + ForceRebuild: true, + NoTests: true, } err := dibBuilder.Plan(registry) require.NoError(t, err) diff --git a/pkg/goss/executor_kubernetes.go b/pkg/goss/executor_kubernetes.go index 88c8633ba..bae4546d1 100644 --- a/pkg/goss/executor_kubernetes.go +++ b/pkg/goss/executor_kubernetes.go @@ -110,10 +110,8 @@ func (e KubernetesExecutor) Execute(ctx context.Context, output io.Writer, opts Volumes: []corev1.Volume{ { Name: "shared", - VolumeSource: corev1.VolumeSource{ - EmptyDir: &corev1.EmptyDirVolumeSource{ - Medium: corev1.StorageMediumMemory, - }, + EmptyDir: &corev1.EmptyDirVolumeSource{ + Medium: corev1.StorageMediumMemory, }, }, }, diff --git a/pkg/kubernetes/exec.go b/pkg/kubernetes/exec.go index 55331ee2d..5d4de09de 100644 --- a/pkg/kubernetes/exec.go +++ b/pkg/kubernetes/exec.go @@ -7,7 +7,6 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime/schema" - "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/resource" "k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes/scheme" @@ -28,14 +27,10 @@ func NewExecOptions(clientSet kubernetes.Interface, restConfig rest.Config) *Exe return &ExecOptions{ exec.ExecOptions{ - StreamOptions: exec.StreamOptions{ - IOStreams: genericclioptions.IOStreams{ - In: os.Stdin, - Out: os.Stdout, - ErrOut: os.Stderr, - }, - Stdin: false, - }, + In: os.Stdin, + Out: os.Stdout, + ErrOut: os.Stderr, + Stdin: false, FilenameOptions: resource.FilenameOptions{}, Executor: &exec.DefaultRemoteExecutor{}, PodClient: clientSet.CoreV1(),