Skip to content

Commit ac3acbc

Browse files
renovate[bot]0sewa0
renovate[bot]
and
0sewa0
authored
fix(deps): update module github.com/dynatrace/dynatrace-bootstrapper to v1.2.0 (main) (#6105)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Marcell Sevcsik <[email protected]>
1 parent e034717 commit ac3acbc

File tree

19 files changed

+45
-45
lines changed

19 files changed

+45
-45
lines changed

‎cmd/bootstrapper/cmd.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package bootstrapper
22

33
import (
4-
"github.com/Dynatrace/dynatrace-bootstrapper/cmd"
5-
"github.com/Dynatrace/dynatrace-bootstrapper/cmd/configure"
6-
"github.com/Dynatrace/dynatrace-bootstrapper/cmd/move"
4+
"github.com/Dynatrace/dynatrace-bootstrapper/cmd/k8sinit"
5+
"github.com/Dynatrace/dynatrace-bootstrapper/cmd/k8sinit/configure"
6+
"github.com/Dynatrace/dynatrace-bootstrapper/cmd/k8sinit/move"
77
"github.com/Dynatrace/dynatrace-operator/cmd/bootstrapper/download"
88
"github.com/Dynatrace/dynatrace-operator/pkg/arch"
99
dtclient "github.com/Dynatrace/dynatrace-operator/pkg/clients/dynatrace"
@@ -18,8 +18,8 @@ import (
1818
const (
1919
Use = "bootstrap"
2020

21-
TargetFolderFlag = cmd.TargetFolderFlag
22-
SuppressErrorsFlag = cmd.SuppressErrorsFlag
21+
TargetFolderFlag = k8sinit.TargetFolderFlag
22+
SuppressErrorsFlag = k8sinit.SuppressErrorsFlag
2323
TechnologiesFlag = move.TechnologyFlag
2424

2525
TargetVersionFlag = "version"

‎cmd/bootstrapper/cmd_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"path/filepath"
66
"testing"
77

8-
"github.com/Dynatrace/dynatrace-bootstrapper/cmd/configure"
9-
"github.com/Dynatrace/dynatrace-bootstrapper/cmd/configure/attributes/container"
10-
"github.com/Dynatrace/dynatrace-bootstrapper/cmd/configure/attributes/pod"
8+
"github.com/Dynatrace/dynatrace-bootstrapper/cmd/k8sinit/configure"
9+
"github.com/Dynatrace/dynatrace-bootstrapper/cmd/k8sinit/configure/attributes/container"
10+
"github.com/Dynatrace/dynatrace-bootstrapper/cmd/k8sinit/configure/attributes/pod"
1111
"github.com/Dynatrace/dynatrace-bootstrapper/pkg/configure/oneagent/pmc"
1212
"github.com/Dynatrace/dynatrace-bootstrapper/pkg/configure/oneagent/preload"
1313
"github.com/stretchr/testify/assert"

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/Dynatrace/dynatrace-operator
33
go 1.25.0
44

55
require (
6-
github.com/Dynatrace/dynatrace-bootstrapper v1.1.3
6+
github.com/Dynatrace/dynatrace-bootstrapper v1.2.0
77
github.com/container-storage-interface/spec v1.12.0
88
github.com/docker/cli v29.1.5+incompatible
99
github.com/evanphx/json-patch v5.9.11+incompatible

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
github.com/Dynatrace/dynatrace-bootstrapper v1.1.3 h1:kEJPUFtYdK9zmbAh/VolS9olRXxMbPTNrkWYJcmEZts=
2-
github.com/Dynatrace/dynatrace-bootstrapper v1.1.3/go.mod h1:ay06V+TDGXVTY1FpmZj386RJ7XBbxwLcJdsbiCjlK4w=
1+
github.com/Dynatrace/dynatrace-bootstrapper v1.2.0 h1:BTPXQAVvDSei/vyYEltG/0NfHDykGq9BvhMGPiOyHLI=
2+
github.com/Dynatrace/dynatrace-bootstrapper v1.2.0/go.mod h1:kn5omRWE5sRTwTCTrSl3L3NLJv77FA8pzx2/UPPMGuA=
33
github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0=
44
github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
55
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=

‎pkg/webhook/mutation/pod/handler/injection/attributes.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"fmt"
55
"strings"
66

7-
containerattr "github.com/Dynatrace/dynatrace-bootstrapper/cmd/configure/attributes/container"
8-
podattr "github.com/Dynatrace/dynatrace-bootstrapper/cmd/configure/attributes/pod"
7+
containerattr "github.com/Dynatrace/dynatrace-bootstrapper/cmd/k8sinit/configure/attributes/container"
8+
podattr "github.com/Dynatrace/dynatrace-bootstrapper/cmd/k8sinit/configure/attributes/pod"
99
"github.com/Dynatrace/dynatrace-operator/pkg/util/kubernetes/fields/k8senv"
1010
dtwebhook "github.com/Dynatrace/dynatrace-operator/pkg/webhook/mutation/pod/mutator"
1111
"github.com/Dynatrace/dynatrace-operator/pkg/webhook/mutation/pod/volumes"

‎pkg/webhook/mutation/pod/handler/injection/attributes_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"strings"
88
"testing"
99

10-
containerattr "github.com/Dynatrace/dynatrace-bootstrapper/cmd/configure/attributes/container"
11-
podattr "github.com/Dynatrace/dynatrace-bootstrapper/cmd/configure/attributes/pod"
10+
containerattr "github.com/Dynatrace/dynatrace-bootstrapper/cmd/k8sinit/configure/attributes/container"
11+
podattr "github.com/Dynatrace/dynatrace-bootstrapper/cmd/k8sinit/configure/attributes/pod"
1212
"github.com/Dynatrace/dynatrace-operator/pkg/api/latest/dynakube"
1313
"github.com/Dynatrace/dynatrace-operator/pkg/api/latest/dynakube/metadataenrichment"
1414
"github.com/Dynatrace/dynatrace-operator/pkg/api/latest/dynakube/oneagent"

‎pkg/webhook/mutation/pod/handler/injection/deprecated.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package injection
22

3-
import podattr "github.com/Dynatrace/dynatrace-bootstrapper/cmd/configure/attributes/pod"
3+
import podattr "github.com/Dynatrace/dynatrace-bootstrapper/cmd/k8sinit/configure/attributes/pod"
44

55
const (
66
deprecatedClusterIDKey = "dt.kubernetes.cluster.id"

‎pkg/webhook/mutation/pod/handler/injection/deprecated_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package injection
33
import (
44
"testing"
55

6-
podattr "github.com/Dynatrace/dynatrace-bootstrapper/cmd/configure/attributes/pod"
6+
podattr "github.com/Dynatrace/dynatrace-bootstrapper/cmd/k8sinit/configure/attributes/pod"
77
"github.com/stretchr/testify/assert"
88
"github.com/stretchr/testify/require"
99
)

‎pkg/webhook/mutation/pod/handler/injection/init.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package injection
22

33
import (
4-
"github.com/Dynatrace/dynatrace-bootstrapper/cmd"
5-
"github.com/Dynatrace/dynatrace-bootstrapper/cmd/configure"
4+
"github.com/Dynatrace/dynatrace-bootstrapper/cmd/k8sinit"
5+
"github.com/Dynatrace/dynatrace-bootstrapper/cmd/k8sinit/configure"
66
"github.com/Dynatrace/dynatrace-operator/cmd/bootstrapper"
77
"github.com/Dynatrace/dynatrace-operator/pkg/api/latest/dynakube"
88
"github.com/Dynatrace/dynatrace-operator/pkg/util/kubernetes/fields/k8sresource"
@@ -28,7 +28,7 @@ func (h *Handler) createInitContainerBase(pod *corev1.Pod, dk dynakube.DynaKube)
2828
}
2929

3030
if areErrorsSuppressed(pod, dk) {
31-
args = append(args, arg.Arg{Name: cmd.SuppressErrorsFlag})
31+
args = append(args, arg.Arg{Name: k8sinit.SuppressErrorsFlag})
3232
}
3333

3434
initContainer := &corev1.Container{

‎pkg/webhook/mutation/pod/handler/injection/init_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package injection
33
import (
44
"testing"
55

6-
"github.com/Dynatrace/dynatrace-bootstrapper/cmd"
6+
"github.com/Dynatrace/dynatrace-bootstrapper/cmd/k8sinit"
77
"github.com/Dynatrace/dynatrace-operator/cmd/bootstrapper"
88
"github.com/Dynatrace/dynatrace-operator/pkg/api/exp"
99
"github.com/Dynatrace/dynatrace-operator/pkg/api/latest/dynakube"
@@ -148,7 +148,7 @@ func TestCreateInitContainerBase(t *testing.T) {
148148

149149
initContainer := wh.createInitContainerBase(pod, *dk)
150150

151-
assert.NotContains(t, initContainer.Args, "--"+cmd.SuppressErrorsFlag)
151+
assert.NotContains(t, initContainer.Args, "--"+k8sinit.SuppressErrorsFlag)
152152
})
153153

154154
t.Run("should not set suppress-error arg - according to pod", func(t *testing.T) {
@@ -159,7 +159,7 @@ func TestCreateInitContainerBase(t *testing.T) {
159159

160160
initContainer := wh.createInitContainerBase(pod, *dk)
161161

162-
assert.NotContains(t, initContainer.Args, "--"+cmd.SuppressErrorsFlag)
162+
assert.NotContains(t, initContainer.Args, "--"+k8sinit.SuppressErrorsFlag)
163163
})
164164

165165
t.Run("should set suppress-error arg - default", func(t *testing.T) {
@@ -170,7 +170,7 @@ func TestCreateInitContainerBase(t *testing.T) {
170170

171171
initContainer := wh.createInitContainerBase(pod, *dk)
172172

173-
assert.Contains(t, initContainer.Args, "--"+cmd.SuppressErrorsFlag)
173+
assert.Contains(t, initContainer.Args, "--"+k8sinit.SuppressErrorsFlag)
174174
})
175175

176176
t.Run("should set suppress-error arg - unknown value", func(t *testing.T) {
@@ -181,7 +181,7 @@ func TestCreateInitContainerBase(t *testing.T) {
181181

182182
initContainer := wh.createInitContainerBase(pod, *dk)
183183

184-
assert.Contains(t, initContainer.Args, "--"+cmd.SuppressErrorsFlag)
184+
assert.Contains(t, initContainer.Args, "--"+k8sinit.SuppressErrorsFlag)
185185

186186
dk = getTestDynakube()
187187
dk.Annotations = map[string]string{}
@@ -190,7 +190,7 @@ func TestCreateInitContainerBase(t *testing.T) {
190190

191191
initContainer = wh.createInitContainerBase(pod, *dk)
192192

193-
assert.Contains(t, initContainer.Args, "--"+cmd.SuppressErrorsFlag)
193+
assert.Contains(t, initContainer.Args, "--"+k8sinit.SuppressErrorsFlag)
194194
})
195195
}
196196

0 commit comments

Comments
 (0)