use secret-type as FieldSelector

Author: agrevtsev

internal/kubernetes.go

@@ -37,28 +37,24 @@ func (exporter *Exporter) parseAllKubeSecrets() ([]*certificateRef, []error) {
 	}
 
 	for _, namespace := range namespaces {
-		secrets, err := exporter.getWatchedSecrets(namespace)
-		if err != nil {
-			outputErrors = append(outputErrors, fmt.Errorf("failed to fetch secrets from namespace \"%s\": %s", namespace, err.Error()))
-			continue
-		}
+		for _, secretType := range exporter.KubeSecretTypes {
+			typeAndKey := strings.Split(secretType, ":")
+			secrets, err := exporter.getWatchedSecrets(namespace, typeAndKey[0])
+			if err != nil {
+				outputErrors = append(outputErrors, fmt.Errorf("failed to fetch secrets from namespace \"%s\": %s", namespace, err.Error()))
+				continue
+			}
 
-		for _, secret := range secrets {
-			for _, secretType := range exporter.KubeSecretTypes {
-				typeAndKey := strings.Split(secretType, ":")
-
-				if secret.Type == v1.SecretType(typeAndKey[0]) && len(secret.Data[typeAndKey[1]]) > 0 {
-					output = append(output, &certificateRef{
-						path:          fmt.Sprintf("k8s/%s/%s", namespace, secret.GetName()),
-						format:        certificateFormatKubeSecret,
-						kubeSecret:    secret,
-						kubeSecretKey: typeAndKey[1],
-					})
-				}
+			for _, secret := range secrets {
+				output = append(output, &certificateRef{
+					path:          fmt.Sprintf("k8s/%s/%s", namespace, secret.GetName()),
+					format:        certificateFormatKubeSecret,
+					kubeSecret:    secret,
+					kubeSecretKey: typeAndKey[1],
+				})
 			}
 		}
 	}
-
 	return output, outputErrors
 }
 
@@ -95,7 +91,7 @@ func (exporter *Exporter) listNamespacesToWatch() ([]string, error) {
 	return namespaces, nil
 }
 
-func (exporter *Exporter) getWatchedSecrets(namespace string) ([]v1.Secret, error) {
+func (exporter *Exporter) getWatchedSecrets(namespace string, secretType string) ([]v1.Secret, error) {
 	cachedSecrets, cached := exporter.secretsCache.Get(namespace)
 	if cached {
 		return cachedSecrets.([]v1.Secret), nil
@@ -124,7 +120,7 @@ func (exporter *Exporter) getWatchedSecrets(namespace string) ([]v1.Secret, erro
 	}
 
 	labelSelector := metav1.LabelSelector{MatchLabels: includedLabelsWithValue}
-	fieldSelector := fields.SelectorFromSet(fields.Set{"type": "kubernetes.io/tls"})
+	fieldSelector := fields.SelectorFromSet(fields.Set{"type" : secretType})
 	secrets, err := exporter.kubeClient.CoreV1().Secrets(namespace).List(context.Background(), metav1.ListOptions{
 		LabelSelector: labels.Set(labelSelector.MatchLabels).String(),
 		FieldSelector: fieldSelector.String(),