Stop relying on GVK being set on SCP object

elastic · Jan 29, 2024 · 2504e27 · 2504e27
1 parent 5a1c4a8
commit 2504e27
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/pkg/controller/elasticsearch/filesettings/secret.go b/pkg/controller/elasticsearch/filesettings/secret.go
@@ -124,7 +124,7 @@ func SetSoftOwner(settingsSecret *corev1.Secret, policy policyv1alpha1.StackConf
 	}
 	settingsSecret.Labels[reconciler.SoftOwnerNamespaceLabel] = policy.GetNamespace()
 	settingsSecret.Labels[reconciler.SoftOwnerNameLabel] = policy.GetName()
-	settingsSecret.Labels[reconciler.SoftOwnerKindLabel] = policy.GetObjectKind().GroupVersionKind().Kind
+	settingsSecret.Labels[reconciler.SoftOwnerKindLabel] = policyv1alpha1.Kind
 }
 
 // setSecureSettings stores the SecureSettings Secret sources referenced in the given StackConfigPolicy in the annotation of the Settings Secret.
@@ -163,7 +163,7 @@ func CanBeOwnedBy(settingsSecret corev1.Secret, policy policyv1alpha1.StackConfi
 		return reconciler.SoftOwnerRef{}, true
 	}
 	// or the owner is already the given policy
-	canBeOwned := currentOwner.Kind == policy.Kind && currentOwner.Namespace == policy.Namespace && currentOwner.Name == policy.Name
+	canBeOwned := currentOwner.Kind == policyv1alpha1.Kind && currentOwner.Namespace == policy.Namespace && currentOwner.Name == policy.Name
 	return currentOwner, canBeOwned
 }
 

diff --git a/pkg/controller/stackconfigpolicy/controller_test.go b/pkg/controller/stackconfigpolicy/controller_test.go
@@ -111,9 +111,6 @@ func TestReconcileStackConfigPolicy_Reconcile(t *testing.T) {
 		Name:      "test-policy",
 	}
 	policyFixture := policyv1alpha1.StackConfigPolicy{
-		TypeMeta: metav1.TypeMeta{
-			Kind: "StackConfigPolicy",
-		},
 		ObjectMeta: metav1.ObjectMeta{
 			Namespace: "ns",
 			Name:      "test-policy",

diff --git a/pkg/controller/stackconfigpolicy/kibana_config_settings.go b/pkg/controller/stackconfigpolicy/kibana_config_settings.go
@@ -118,7 +118,7 @@ func canBeOwned(ctx context.Context, c k8s.Client, policy policyv1alpha1.StackCo
 		return currentOwner, true, nil
 	}
 	// or the owner is already the given policy
-	canBeOwned := currentOwner.Kind == policy.Kind && currentOwner.Namespace == policy.Namespace && currentOwner.Name == policy.Name
+	canBeOwned := currentOwner.Kind == policyv1alpha1.Kind && currentOwner.Namespace == policy.Namespace && currentOwner.Name == policy.Name
 	return currentOwner, canBeOwned, nil
 }
 

diff --git a/pkg/controller/stackconfigpolicy/kibana_config_settings_test.go b/pkg/controller/stackconfigpolicy/kibana_config_settings_test.go
@@ -68,7 +68,7 @@ func Test_newKibanaConfigSecret(t *testing.T) {
 						"asset.policy.k8s.elastic.co/on-delete": "delete",
 						"kibana.k8s.elastic.co/name":            "test-kb",
 						"common.k8s.elastic.co/type":            "kibana",
-						"eck.k8s.elastic.co/owner-kind":         "",
+						"eck.k8s.elastic.co/owner-kind":         "StackConfigPolicy",
 						"eck.k8s.elastic.co/owner-name":         "test-policy",
 						"eck.k8s.elastic.co/owner-namespace":    "test-policy-ns",
 					},