Skip to content

Commit 5d67218

Browse files
authored
Revert "Fixes argoproj#10234 - Postgres SSL Certificate fix (argoproj#10300)" (#16)
This PR: - reverts the broken postgres connection PR
1 parent f3d4c77 commit 5d67218

3 files changed

Lines changed: 4 additions & 52 deletions

File tree

Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,6 @@ FROM gcr.io/distroless/static as workflow-controller
9191

9292
USER 8737
9393

94-
WORKDIR /home/argo
95-
9694
COPY hack/ssh_known_hosts /etc/ssh/
9795
COPY hack/nsswitch.conf /etc/
9896
COPY --chown=8737 --from=workflow-controller-build /go/src/github.com/argoproj/argo-workflows/dist/workflow-controller /bin/

config/config.go

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -232,19 +232,8 @@ func (c DatabaseConfig) GetHostname() string {
232232

233233
type PostgreSQLConfig struct {
234234
DatabaseConfig
235-
SSL bool `json:"ssl,omitempty"`
236-
SSLMode string `json:"sslMode,omitempty"`
237-
CaCertSecret apiv1.SecretKeySelector `json:"caCertSecret,omitempty"`
238-
ClientCertSecret apiv1.SecretKeySelector `json:"clientCertSecret,omitempty"`
239-
ClientKeySecret apiv1.SecretKeySelector `json:"clientKeySecret,omitempty"`
240-
CertPath string `json:"certPath"`
241-
}
242-
243-
func (c PostgreSQLConfig) GetPGCertPath() string {
244-
if c.CertPath != "" {
245-
return c.CertPath
246-
}
247-
return "/home/argo/pgcerts"
235+
SSL bool `json:"ssl,omitempty"`
236+
SSLMode string `json:"sslMode,omitempty"`
248237
}
249238

250239
type MySQLConfig struct {

persist/sqldb/sqldb.go

Lines changed: 2 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package sqldb
33
import (
44
"context"
55
"fmt"
6-
"os"
76
"time"
87

98
"k8s.io/client-go/kubernetes"
@@ -54,43 +53,9 @@ func CreatePostGresDBSession(kubectlConfig kubernetes.Interface, namespace strin
5453
}
5554

5655
if cfg.SSL {
57-
if cfg.SSLMode != "" && cfg.SSLMode != "disable" {
58-
err := os.MkdirAll(cfg.GetPGCertPath(), 0700)
59-
if err != nil {
60-
return nil, "", err
61-
}
62-
rootCertByte, err := util.GetSecrets(ctx, kubectlConfig, namespace, cfg.CaCertSecret.Name, cfg.CaCertSecret.Key)
63-
if err != nil {
64-
return nil, "", err
65-
}
66-
err = os.WriteFile(cfg.GetPGCertPath()+"/ca.crt", rootCertByte, 0600)
67-
if err != nil {
68-
return nil, "", err
69-
}
70-
71-
serverCertByte, err := util.GetSecrets(ctx, kubectlConfig, namespace, cfg.ClientCertSecret.Name, cfg.ClientCertSecret.Key)
72-
if err != nil {
73-
return nil, "", err
74-
}
75-
err = os.WriteFile(cfg.GetPGCertPath()+"/tls.crt", serverCertByte, 0600)
76-
if err != nil {
77-
return nil, "", err
78-
}
79-
80-
serverKeyByte, err := util.GetSecrets(ctx, kubectlConfig, namespace, cfg.ClientKeySecret.Name, cfg.ClientKeySecret.Key)
81-
if err != nil {
82-
return nil, "", err
83-
}
84-
err = os.WriteFile(cfg.GetPGCertPath()+"/tls.key", serverKeyByte, 0400)
85-
if err != nil {
86-
return nil, "", err
87-
}
88-
56+
if cfg.SSLMode != "" {
8957
options := map[string]string{
90-
"sslmode": cfg.SSLMode,
91-
"sslrootcert": cfg.GetPGCertPath() + "/ca.crt",
92-
"sslkey": cfg.GetPGCertPath() + "/tls.key",
93-
"sslcert": cfg.GetPGCertPath() + "/tls.crt",
58+
"sslmode": cfg.SSLMode,
9459
}
9560
settings.Options = options
9661
}

0 commit comments

Comments
 (0)