mirror of
https://github.com/percona/percona-toolkit.git
synced 2025-09-19 10:34:01 +00:00
PT-2299 - collect openssl x509 certificate information for each secret
- Added missed secrets for PostgreSQL Operator v1
This commit is contained in:
@@ -6,13 +6,13 @@ import (
|
|||||||
"compress/gzip"
|
"compress/gzip"
|
||||||
"encoding/base64"
|
"encoding/base64"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"html/template"
|
|
||||||
"log"
|
"log"
|
||||||
"os"
|
"os"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"regexp"
|
"regexp"
|
||||||
"strings"
|
"strings"
|
||||||
|
"text/template"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
@@ -132,6 +132,16 @@ func New(location, namespace, resource string, kubeconfig string, forwardport st
|
|||||||
resource: "perconapgclusters",
|
resource: "perconapgclusters",
|
||||||
dataNames: []string{"ca.crt"},
|
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{
|
sslSecret{
|
||||||
secret: "pgo.tls",
|
secret: "pgo.tls",
|
||||||
resource: "perconapgclusters",
|
resource: "perconapgclusters",
|
||||||
|
@@ -276,12 +276,16 @@ func TestSSLResourceOption(t *testing.T) {
|
|||||||
cmds: [][]string{
|
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 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 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 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"},
|
{"tar", "--to-command", "grep -m 1 -o Certificate", "-xzf", "cluster-dump.tar.gz", "--wildcards", "cluster-dump/*/pgo.tls"},
|
||||||
},
|
},
|
||||||
want: []string{
|
want: []string{
|
||||||
"ca.crt",
|
"ca.crt",
|
||||||
"Certificate",
|
"Certificate",
|
||||||
|
"tls.crt\ntls.crt",
|
||||||
|
"Certificate\nCertificate",
|
||||||
"tls.crt",
|
"tls.crt",
|
||||||
"Certificate",
|
"Certificate",
|
||||||
},
|
},
|
||||||
|
Reference in New Issue
Block a user