more test fixes

Author: porthorian

internal/mode/static/state/graph/configmaps.go

@@ -68,7 +68,7 @@ func (r *configMapResolver) resolve(nsname types.NamespacedName) error {
 	r.resolvedCaCertConfigMaps[nsname] = &caCertConfigMapEntry{
 		caCertConfigMap: CaCertConfigMap{
 			Source:     cm,
-			CertBundle: NewCertificateBundle(nsname, "ConfigMap", cert),
+			CertBundle: NewCertificateBundle(nsname, cm.Kind, cert),
 		},
 		err: validationErr,
 	}

internal/mode/static/state/graph/graph_test.go

@@ -41,6 +41,9 @@ func TestBuildGraph(t *testing.T) {
 	}
 
 	cm := &v1.ConfigMap{
+		TypeMeta: metav1.TypeMeta{
+			Kind: "ConfigMap",
+		},
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      "configmap",
 			Namespace: "service",
@@ -338,6 +341,9 @@ func TestBuildGraph(t *testing.T) {
 	}
 
 	secret := &v1.Secret{
+		TypeMeta: metav1.TypeMeta{
+			Kind: "Secret",
+		},
 		ObjectMeta: metav1.ObjectMeta{
 			Namespace: testNs,
 			Name:      "secret",

internal/mode/static/state/graph/secret_test.go

@@ -208,10 +208,6 @@ func TestSecretResolver(t *testing.T) {
 		},
 		client.ObjectKeyFromObject(invalidSecretType): {
 			Source: invalidSecretType,
-			CertBundle: NewCertificateBundle(client.ObjectKeyFromObject(invalidSecretType), "Secret", &Certificate{
-				TLSCert:       cert,
-				TLSPrivateKey: key,
-			}),
 		},
 		client.ObjectKeyFromObject(invalidSecretCert): {
 			Source: invalidSecretCert,