feat: migrate the vector builder to the productlogging package

zncdatadev · Sep 3, 2024 · f133ba9 · f133ba9
1 parent ef15e94
commit f133ba9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/pkg/builder/vector.go → pkg/productlogging/vector.go b/pkg/builder/vector.go → pkg/productlogging/vector.go
@@ -1,4 +1,4 @@
-package builder
+package productlogging
 
 import (
  "context"
@@ -11,6 +11,7 @@ import (
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
  ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
 
+ "github.com/zncdatadev/operator-go/pkg/builder"
  pkgclient "github.com/zncdatadev/operator-go/pkg/client"
  "github.com/zncdatadev/operator-go/pkg/config"
  "github.com/zncdatadev/operator-go/pkg/constants"
@@ -633,8 +634,8 @@ func (v *VectorDecorator) appendVectorContainer(containers *[]corev1.Container)
 
 func (v *VectorDecorator) NewVectorContainer() *corev1.Container {
 
- vectorContainer := NewContainerBuilder(VectorContainerName, VectorImage).
- SetImagePullPolicy(DefaultImagePullPolicy).
+ vectorContainer := builder.NewContainerBuilder(VectorContainerName, VectorImage).
+ SetImagePullPolicy(builder.DefaultImagePullPolicy).
  SetCommand(VectorCommand()).
  SetArgs(VectorCommandArgs()).
  AddVolumeMounts(VectorVolumeMount(v.VectorConfigVolumeName, v.LogVolumeName)).

diff --git a/pkg/builder/vector_test.go → pkg/productlogging/vector_test.go b/pkg/builder/vector_test.go → pkg/productlogging/vector_test.go
@@ -1,12 +1,12 @@
-package builder_test
+package productlogging_test
 
 import (
  "testing"
 
  "github.com/stretchr/testify/assert"
 
- "github.com/zncdatadev/operator-go/pkg/builder"
  "github.com/zncdatadev/operator-go/pkg/constants"
+ "github.com/zncdatadev/operator-go/pkg/productlogging"
 )
 
 func TestLogProviderCommandArgs(t *testing.T) {
@@ -63,13 +63,13 @@ mkdir -p /kubedoop/log/_vector && touch /kubedoop/log/_vector/shutdown
 `,
  }
 
- args, err := builder.LogProviderCommand(entrypointScript)
+ args, err := productlogging.LogProviderCommand(entrypointScript)
  assert.NoError(t, err)
  assert.Equal(t, expectedArgs, args)
 }
 
 func TestVectorYamlFormatter(t *testing.T) {
- actualYaml, err := builder.ParseVectorYaml(map[string]interface{}{
+ actualYaml, err := productlogging.ParseVectorYaml(map[string]interface{}{
  "LogDir": constants.KubedoopLogDir,
  "Namespace": "default",
  "Cluster": "simple-trino",