Skip to content

Commit

Permalink
Change all imports of the CRs we use (#3451)
Browse files Browse the repository at this point in the history 
Co-authored-by: Marcell Sevcsik <marcell.sevcsik@dynatrace.com>
Co-authored-by: aorcholski <84514340+aorcholski@users.noreply.github.com>
  • Loading branch information
@andriisoldatenko @0sewa0 @aorcholski
3 people committed Jul 12, 2024
1 parent bec4ad4 commit 7677e1f
Show file tree
Hide file tree
Showing 223 changed files with 4,772 additions and 4,772 deletions.
10 changes: 5 additions & 5 deletions cmd/support_archive/resource_query.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package support_archive
import (
"reflect"

dynatracev1alpha1 "github.com/Dynatrace/dynatrace-operator/pkg/api/v1alpha1"
"github.com/Dynatrace/dynatrace-operator/pkg/api/v1alpha1"
"github.com/Dynatrace/dynatrace-operator/pkg/api/v1alpha1/edgeconnect"
dynatracev1beta2 "github.com/Dynatrace/dynatrace-operator/pkg/api/v1beta2"
dynakubev1beta2 "github.com/Dynatrace/dynatrace-operator/pkg/api/v1beta2/dynakube"
"github.com/Dynatrace/dynatrace-operator/pkg/api/v1beta2"
"github.com/Dynatrace/dynatrace-operator/pkg/api/v1beta2/dynakube"
"github.com/Dynatrace/dynatrace-operator/pkg/util/kubeobjects/labels"
"github.com/Dynatrace/dynatrace-operator/pkg/webhook"
appsv1 "k8s.io/api/apps/v1"
Expand Down Expand Up @@ -86,8 +86,8 @@ func getComponentsQueryGroup(namespace string, appName string, labelKey string)
func getCustomResourcesQueryGroup(namespace string) resourceQueryGroup {
return resourceQueryGroup{
resources: []schema.GroupVersionKind{
toGroupVersionKind(dynatracev1beta2.GroupVersion, dynakubev1beta2.DynaKube{}),
toGroupVersionKind(dynatracev1alpha1.GroupVersion, edgeconnect.EdgeConnect{}),
toGroupVersionKind(v1beta2.GroupVersion, dynakube.DynaKube{}),
toGroupVersionKind(v1alpha1.GroupVersion, edgeconnect.EdgeConnect{}),
},
filters: []client.ListOption{
client.InNamespace(namespace),
Expand Down
4 changes: 2 additions & 2 deletions cmd/support_archive/troubleshoot_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"testing"

"github.com/Dynatrace/dynatrace-operator/pkg/api/scheme/fake"
dynatracev1beta2 "github.com/Dynatrace/dynatrace-operator/pkg/api/v1beta2/dynakube"
"github.com/Dynatrace/dynatrace-operator/pkg/api/v1beta2/dynakube"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
appsv1 "k8s.io/api/apps/v1"
Expand All @@ -37,7 +37,7 @@ func TestTroubleshootCollector(t *testing.T) {
Name: "random",
},
},
&dynatracev1beta2.DynaKube{
&dynakube.DynaKube{
TypeMeta: typeMeta("DynaKube"),
ObjectMeta: objectMeta("dynakube1"),
},
Expand Down
46 changes: 23 additions & 23 deletions cmd/troubleshoot/builder.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/Dynatrace/dynatrace-operator/cmd/config"
"github.com/Dynatrace/dynatrace-operator/pkg/api/scheme"
dynatracev1beta2 "github.com/Dynatrace/dynatrace-operator/pkg/api/v1beta2/dynakube"
"github.com/Dynatrace/dynatrace-operator/pkg/api/v1beta2/dynakube"
"github.com/Dynatrace/dynatrace-operator/pkg/logd"
"github.com/Dynatrace/dynatrace-operator/pkg/oci/dockerkeychain"
"github.com/Dynatrace/dynatrace-operator/pkg/oci/registry"
Expand Down Expand Up @@ -106,7 +106,7 @@ func RunTroubleshootCmd(ctx context.Context, log logd.Logger, namespaceName stri
return
}

dynakubes := &dynatracev1beta2.DynaKubeList{}
dynakubes := &dynakube.DynaKubeList{}

err = apiReader.List(ctx, dynakubes, &client.ListOptions{Namespace: namespaceName})
if checkCRD(log, err) != nil {
Expand All @@ -125,62 +125,62 @@ func GetK8SClusterAPIReader(kubeConfig *rest.Config) (client.Reader, error) {
return k8scluster.GetAPIReader(), nil
}

func runChecksForAllDynakubes(ctx context.Context, baseLog logd.Logger, apiReader client.Reader, httpClient *http.Client, dynakubes []dynatracev1beta2.DynaKube) {
for _, dynakube := range dynakubes {
err := runChecksForDynakube(ctx, baseLog, apiReader, httpClient, dynakube)
func runChecksForAllDynakubes(ctx context.Context, baseLog logd.Logger, apiReader client.Reader, httpClient *http.Client, dynakubes []dynakube.DynaKube) {
for _, dk := range dynakubes {
err := runChecksForDynakube(ctx, baseLog, apiReader, httpClient, dk)
if err != nil {
logErrorf(baseLog, "Error in DynaKube %s/%s", dynakube.Namespace, dynakube.Name)
logErrorf(baseLog, "Error in DynaKube %s/%s", dk.Namespace, dk.Name)
}
}
}

func runChecksForDynakube(ctx context.Context, baseLog logd.Logger, apiReader client.Reader, httpClient *http.Client, dynakube dynatracev1beta2.DynaKube) error {
func runChecksForDynakube(ctx context.Context, baseLog logd.Logger, apiReader client.Reader, httpClient *http.Client, dk dynakube.DynaKube) error {
log := baseLog.WithName(dynakubeCheckLoggerName)

logNewCheckf(log, "checking if '%s:%s' Dynakube is configured correctly", dynakube.Namespace, dynakube.Name)
logInfof(log, "using '%s:%s' Dynakube", dynakube.Namespace, dynakube.Name)
logNewCheckf(log, "checking if '%s:%s' Dynakube is configured correctly", dk.Namespace, dk.Name)
logInfof(log, "using '%s:%s' Dynakube", dk.Namespace, dk.Name)

pullSecret, err := checkDynakube(ctx, baseLog, apiReader, &dynakube)
pullSecret, err := checkDynakube(ctx, baseLog, apiReader, &dk)
if err != nil {
return errors.Wrapf(err, "'%s:%s' Dynakube isn't valid. %s",
dynakube.Namespace, dynakube.Name, dynakubeNotValidMessage())
dk.Namespace, dk.Name, dynakubeNotValidMessage())
}

logOkf(log, "'%s:%s' Dynakube is valid", dynakube.Namespace, dynakube.Name)
logOkf(log, "'%s:%s' Dynakube is valid", dk.Namespace, dk.Name)

keychain, err := dockerkeychain.NewDockerKeychain(ctx, apiReader, pullSecret)
if err != nil {
return err
}

transport, err := createTransport(ctx, apiReader, &dynakube, httpClient)
transport, err := createTransport(ctx, apiReader, &dk, httpClient)
if err != nil {
return err
}

err = verifyAllImagesAvailable(ctx, log, keychain, transport, &dynakube)
err = verifyAllImagesAvailable(ctx, log, keychain, transport, &dk)
if err != nil {
return err
}

return checkProxySettings(ctx, log, apiReader, &dynakube)
return checkProxySettings(ctx, log, apiReader, &dk)
}

func createTransport(ctx context.Context, apiReader client.Reader, dynakube *dynatracev1beta2.DynaKube, httpClient *http.Client) (*http.Transport, error) {
func createTransport(ctx context.Context, apiReader client.Reader, dk *dynakube.DynaKube, httpClient *http.Client) (*http.Transport, error) {
var transport *http.Transport
if httpClient != nil && httpClient.Transport != nil {
transport = httpClient.Transport.(*http.Transport).Clone()
} else {
transport = http.DefaultTransport.(*http.Transport).Clone()
}

return registry.PrepareTransportForDynaKube(ctx, apiReader, transport, dynakube)
return registry.PrepareTransportForDynaKube(ctx, apiReader, transport, dk)
}

func getDynakubes(ctx context.Context, log logd.Logger, apiReader client.Reader, namespaceName string, dynakubeName string) ([]dynatracev1beta2.DynaKube, error) {
func getDynakubes(ctx context.Context, log logd.Logger, apiReader client.Reader, namespaceName string, dynakubeName string) ([]dynakube.DynaKube, error) {
var err error

var dynakubes []dynatracev1beta2.DynaKube
var dynakubes []dynakube.DynaKube

if dynakubeName == "" {
logNewDynakubef(log, "no Dynakube specified - checking all Dynakubes in namespace '%s'", namespaceName)
Expand All @@ -190,19 +190,19 @@ func getDynakubes(ctx context.Context, log logd.Logger, apiReader client.Reader,
return nil, err
}
} else {
dynakube, err := getSelectedDynakube(ctx, apiReader, namespaceName, dynakubeName)
dk, err := getSelectedDynakube(ctx, apiReader, namespaceName, dynakubeName)
if err != nil {
return nil, err
}

dynakubes = append(dynakubes, dynakube)
dynakubes = append(dynakubes, dk)
}

return dynakubes, nil
}

func getAllDynakubesInNamespace(ctx context.Context, log logd.Logger, apiReader client.Reader, namespaceName string) ([]dynatracev1beta2.DynaKube, error) {
var dynakubes dynatracev1beta2.DynaKubeList
func getAllDynakubesInNamespace(ctx context.Context, log logd.Logger, apiReader client.Reader, namespaceName string) ([]dynakube.DynaKube, error) {
var dynakubes dynakube.DynaKubeList

err := apiReader.List(ctx, &dynakubes, client.InNamespace(namespaceName))
if err != nil {
Expand Down
16 changes: 8 additions & 8 deletions cmd/troubleshoot/builder_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"testing"

"github.com/Dynatrace/dynatrace-operator/pkg/api/scheme/fake"
dynatracev1beta2 "github.com/Dynatrace/dynatrace-operator/pkg/api/v1beta2/dynakube"
"github.com/Dynatrace/dynatrace-operator/pkg/api/v1beta2/dynakube"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand All @@ -22,27 +22,27 @@ func TestTroubleshootCommandBuilder(t *testing.T) {
})

t.Run("getAllDynakubesInNamespace", func(t *testing.T) {
dynakube := buildTestDynakube()
clt := fake.NewClient(&dynakube)
dk := buildTestDynakube()
clt := fake.NewClient(&dk)

dynakubes, err := getAllDynakubesInNamespace(context.Background(), getNullLogger(t), clt, testNamespace)
require.NoError(t, err)
assert.Len(t, dynakubes, 1)
assert.Equal(t, dynakube.Name, dynakubes[0].Name)
assert.Equal(t, dk.Name, dynakubes[0].Name)
})

t.Run("getDynakube - only check one dynakube if set", func(t *testing.T) {
dynakube := buildTestDynakube()
clt := fake.NewClient(&dynakube)
dk := buildTestDynakube()
clt := fake.NewClient(&dk)
dynakubes, err := getDynakubes(context.Background(), getNullLogger(t), clt, testNamespace, testDynakube)
require.NoError(t, err)
assert.Len(t, dynakubes, 1)
assert.Equal(t, testDynakube, dynakubes[0].Name)
})
}

func buildTestDynakube() dynatracev1beta2.DynaKube {
return dynatracev1beta2.DynaKube{
func buildTestDynakube() dynakube.DynaKube {
return dynakube.DynaKube{
TypeMeta: metav1.TypeMeta{},
ObjectMeta: metav1.ObjectMeta{
Name: testDynakube,
Expand Down
20 changes: 10 additions & 10 deletions cmd/troubleshoot/component.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package troubleshoot

import (
dynatracev1beta2 "github.com/Dynatrace/dynatrace-operator/pkg/api/v1beta2/dynakube"
"github.com/Dynatrace/dynatrace-operator/pkg/api/v1beta2/dynakube"
)

type component string
Expand Down Expand Up @@ -30,26 +30,26 @@ func (c component) SkipImageCheck(image string) bool {
return image == "" && c != componentCodeModules
}

func (c component) getImage(dynakube *dynatracev1beta2.DynaKube) (string, bool) {
if dynakube == nil {
func (c component) getImage(dk *dynakube.DynaKube) (string, bool) {
if dk == nil {
return "", false
}

switch c {
case componentOneAgent:
if dynakube.CustomOneAgentImage() != "" {
return dynakube.CustomOneAgentImage(), true
if dk.CustomOneAgentImage() != "" {
return dk.CustomOneAgentImage(), true
}

return dynakube.OneAgentImage(), false
return dk.OneAgentImage(), false
case componentCodeModules:
return dynakube.CustomCodeModulesImage(), true
return dk.CustomCodeModulesImage(), true
case componentActiveGate:
if dynakube.CustomActiveGateImage() != "" {
return dynakube.CustomActiveGateImage(), true
if dk.CustomActiveGateImage() != "" {
return dk.CustomActiveGateImage(), true
}

return dynakube.ActiveGateImage(), false
return dk.ActiveGateImage(), false
}

return "", false
Expand Down

0 comments on commit 7677e1f

Please sign in to comment.