From 113f61ebcf641bb70705b5914a1f32fe192fadec Mon Sep 17 00:00:00 2001
From: Sveta Smirnova <sveta.smirnova@percona.com>
Date: Thu, 16 May 2024 18:19:10 +0300
Subject: [PATCH] PT-2299 - collect openssl x509 certificate information for
 each secret

- Added missed secrets for PostgreSQL Operator v1
---
 src/go/pt-k8s-debug-collector/dumper/dumper.go | 12 +++++++++++-
 src/go/pt-k8s-debug-collector/main_test.go     |  4 ++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/go/pt-k8s-debug-collector/dumper/dumper.go b/src/go/pt-k8s-debug-collector/dumper/dumper.go
index ef746419..789beb36 100644
--- a/src/go/pt-k8s-debug-collector/dumper/dumper.go
+++ b/src/go/pt-k8s-debug-collector/dumper/dumper.go
@@ -6,13 +6,13 @@ import (
 	"compress/gzip"
 	"encoding/base64"
 	"encoding/json"
-	"html/template"
 	"log"
 	"os"
 	"os/exec"
 	"path/filepath"
 	"regexp"
 	"strings"
+	"text/template"
 	"time"
 
 	"github.com/pkg/errors"
@@ -132,6 +132,16 @@ func New(location, namespace, resource string, kubeconfig string, forwardport st
 				resource:  "perconapgclusters",
 				dataNames: []string{"ca.crt"},
 			},
+			sslSecret{
+				secret:    "{{ .Name }}-ssl-keypair",
+				resource:  "perconapgclusters",
+				dataNames: []string{"tls.crt"},
+			},
+			sslSecret{
+				secret:    "{{ .Name }}-replication-ssl-keypair",
+				resource:  "perconapgclusters",
+				dataNames: []string{"tls.crt"},
+			},
 			sslSecret{
 				secret:    "pgo.tls",
 				resource:  "perconapgclusters",
diff --git a/src/go/pt-k8s-debug-collector/main_test.go b/src/go/pt-k8s-debug-collector/main_test.go
index 849daf08..32c26a86 100644
--- a/src/go/pt-k8s-debug-collector/main_test.go
+++ b/src/go/pt-k8s-debug-collector/main_test.go
@@ -276,12 +276,16 @@ func TestSSLResourceOption(t *testing.T) {
 			cmds: [][]string{
 				{"tar", "--to-command", "grep -m 1 -o ca.crt", "-xzf", "cluster-dump.tar.gz", "--wildcards", "cluster-dump/*/*ssl-ca"},
 				{"tar", "--to-command", "grep -m 1 -o Certificate", "-xzf", "cluster-dump.tar.gz", "--wildcards", "cluster-dump/*/*ssl-ca"},
+				{"tar", "--to-command", "grep -m 1 -o tls.crt", "-xzf", "cluster-dump.tar.gz", "--wildcards", "cluster-dump/*/*-ssl-keypair"},
+				{"tar", "--to-command", "grep -m 1 -o Certificate", "-xzf", "cluster-dump.tar.gz", "--wildcards", "cluster-dump/*/*-ssl-keypair"},
 				{"tar", "--to-command", "grep -m 1 -o tls.crt", "-xzf", "cluster-dump.tar.gz", "--wildcards", "cluster-dump/*/pgo.tls"},
 				{"tar", "--to-command", "grep -m 1 -o Certificate", "-xzf", "cluster-dump.tar.gz", "--wildcards", "cluster-dump/*/pgo.tls"},
 			},
 			want: []string{
 				"ca.crt",
 				"Certificate",
+				"tls.crt\ntls.crt",
+				"Certificate\nCertificate",
 				"tls.crt",
 				"Certificate",
 			},