fixes import

Dynatrace · Jul 12, 2024 · 6cfc3e4 · 6cfc3e4
1 parent 37c7e24
commit 6cfc3e4
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 20 deletions.
diff --git a/pkg/api/v1beta2/dynakube/validation/oneagent.go b/pkg/api/v1beta2/dynakube/validation/oneagent.go
@@ -28,24 +28,24 @@ The conflicting Dynakube: %s
 
 func conflictingOneAgentConfiguration(_ context.Context, _ *Validator, dk *dynakube.DynaKube) string {
 	counter := 0
-	if dynakube.ApplicationMonitoringMode() {
+	if dk.ApplicationMonitoringMode() {
 		counter += 1
 	}
 
-	if dynakube.CloudNativeFullstackMode() {
+	if dk.CloudNativeFullstackMode() {
 		counter += 1
 	}
 
-	if dynakube.ClassicFullStackMode() {
+	if dk.ClassicFullStackMode() {
 		counter += 1
 	}
 
-	if dynakube.HostMonitoringMode() {
+	if dk.HostMonitoringMode() {
 		counter += 1
 	}
 
 	if counter > 1 {
-		log.Info("requested dynakube has conflicting one agent configuration", "name", dynakube.Name, "namespace", dynakube.Namespace)
+		log.Info("requested dynakube has conflicting one agent configuration", "name", dk.Name, "namespace", dk.Namespace)
 
 		return errorConflictingOneagentMode
 	}
@@ -70,12 +70,12 @@ func conflictingNodeSelector(ctx context.Context, dv *Validator, dk *dynakube.Dy
 			continue
 		}
 
-		nodeSelectorMap := dynakube.NodeSelector()
+		nodeSelectorMap := dk.NodeSelector()
 		validNodeSelectorMap := item.NodeSelector()
 
-		if item.Name != dynakube.Name {
+		if item.Name != dk.Name {
 			if hasConflictingMatchLabels(nodeSelectorMap, validNodeSelectorMap) {
-				log.Info("requested dynakube has conflicting nodeSelector", "name", dynakube.Name, "namespace", dynakube.Namespace)
+				log.Info("requested dynakube has conflicting nodeSelector", "name", dk.Name, "namespace", dk.Namespace)
 
 				return fmt.Sprintf(errorNodeSelectorConflict, item.Name)
 			}
@@ -108,8 +108,8 @@ func hasConflictingMatchLabels(labelMap, otherLabelMap map[string]string) bool {
 	return labelSelector.Matches(otherLabelSelectorLabels) || otherLabelSelector.Matches(labelSelectorLabels)
 }
 
-func hasOneAgentVolumeStorageEnabled(dynakube *dynatracev1beta2.DynaKube) (isEnabled bool, isSet bool) {
-	envVar := env.FindEnvVar(dynakube.GetOneAgentEnvironment(), oneagentEnableVolumeStorageEnvVarName)
+func hasOneAgentVolumeStorageEnabled(dk *dynakube.DynaKube) (isEnabled bool, isSet bool) {
+	envVar := env.FindEnvVar(dk.GetOneAgentEnvironment(), oneagentEnableVolumeStorageEnvVarName)
 	isSet = envVar != nil
 	isEnabled = isSet && envVar.Value == "true"
 
@@ -142,7 +142,7 @@ func conflictingHostGroupSettings(_ context.Context, _ *Validator, dk *dynakube.
 	return ""
 }
 
-func validateOneAgentVersionIsSemVerCompliant(_ context.Context, _ *dynakubeValidator, dk *dynakube.DynaKube) string {
+func validateOneAgentVersionIsSemVerCompliant(_ context.Context, _ *Validator, dk *dynakube.DynaKube) string {
 	agentVersion := dk.CustomOneAgentVersion()
 	if agentVersion == "" {
 		return ""

diff --git a/pkg/api/v1beta2/dynakube/validation/oneagent_test.go b/pkg/api/v1beta2/dynakube/validation/oneagent_test.go
@@ -428,16 +428,16 @@ func createDynakubeWithHostGroup(args []string, hostGroup string) *dynakube.Dyna
 func TestValidateOneAgentVersionIsSemVer(t *testing.T) {
 	testCasesAcceptedVersions := []string{"", "1.0.0", "1.200.1"}
 
-	testCasesNotAcceptedVersions := []string{"latest", "raw", "1.200.1-raw", "1.200.1+build", "1.200", "1", "1.0", "v1.200.0"}
+	testCasesNotAcceptedVersions := []string{"latest", "raw", "1.200.1-raw", "v1.200.1-raw", "1.200.1+build", "v1.200.1+build", "1.200.1-raw+build", "v1.200.1-raw+build", "1.200", "v1.200", "1", "v1", "1.0", "v1.0", "v1.200.0"}
 
 	for _, tc := range testCasesAcceptedVersions {
 		t.Run("should accept version "+tc, func(t *testing.T) {
-			assertAllowedResponseWithoutWarnings(t, &dynatracev1beta2.DynaKube{
+			assertAllowed(t, &dynakube.DynaKube{
 				ObjectMeta: defaultDynakubeObjectMeta,
-				Spec: dynatracev1beta2.DynaKubeSpec{
+				Spec: dynakube.DynaKubeSpec{
 					APIURL: testApiUrl,
-					OneAgent: dynatracev1beta2.OneAgentSpec{
-						ClassicFullStack: &dynatracev1beta2.HostInjectSpec{
+					OneAgent: dynakube.OneAgentSpec{
+						ClassicFullStack: &dynakube.HostInjectSpec{
 							Version: tc,
 						},
 					},
@@ -448,12 +448,12 @@ func TestValidateOneAgentVersionIsSemVer(t *testing.T) {
 
 	for _, tc := range testCasesNotAcceptedVersions {
 		t.Run("should accept version "+tc, func(t *testing.T) {
-			assertDeniedResponse(t, []string{"Only semantic versions in the form of major.minor.patch (e.g. 1.0.0) are allowed!"}, &dynatracev1beta2.DynaKube{
+			assertDenied(t, []string{"Only semantic versions in the form of major.minor.patch (e.g. 1.0.0) are allowed!"}, &dynakube.DynaKube{
 				ObjectMeta: defaultDynakubeObjectMeta,
-				Spec: dynatracev1beta2.DynaKubeSpec{
+				Spec: dynakube.DynaKubeSpec{
 					APIURL: testApiUrl,
-					OneAgent: dynatracev1beta2.OneAgentSpec{
-						ClassicFullStack: &dynatracev1beta2.HostInjectSpec{
+					OneAgent: dynakube.OneAgentSpec{
+						ClassicFullStack: &dynakube.HostInjectSpec{
 							Version: tc,
 						},
 					},

diff --git a/pkg/api/v1beta2/dynakube/validation/validation.go b/pkg/api/v1beta2/dynakube/validation/validation.go
@@ -37,6 +37,7 @@ var (
 		nameTooLong,
 		namespaceSelectorViolateLabelSpec,
 		imageFieldHasTenantImage,
+		validateOneAgentVersionIsSemVerCompliant,
 	}
 	validatorWarningFuncs = []validatorFunc{
 		missingActiveGateMemoryLimit,

diff --git a/pkg/webhook/validation/dynakube/config.go b/pkg/webhook/validation/dynakube/config.go