Skip to content

Commit 8b4020e

Browse files
committed
Correctly set default CertDir path for metrics server vs webhook server.
1 parent dd611ab commit 8b4020e

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

internal/config/config.go

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,12 @@ type WebhookServerConfig struct {
5555
ClientCAName string `json:"clientCAName"`
5656
}
5757

58+
func SetDefaults_WebhookServerConfig(obj *WebhookServerConfig) {
59+
if obj.TLS.CertDir == "" {
60+
obj.TLS.CertDir = filepath.Join(os.TempDir(), "k8s-webhook-server", "serving-certs")
61+
}
62+
}
63+
5864
func (c *WebhookServerConfig) Options(ctx context.Context, secretsClient client.Client) webhook.Options {
5965
opts := webhook.Options{
6066
Host: c.Host,
@@ -98,6 +104,10 @@ func SetDefaults_MetricsServerConfig(obj *MetricsServerConfig) {
98104
if obj.BindAddress == "" {
99105
obj.BindAddress = "0"
100106
}
107+
108+
if len(obj.TLS.CertDir) == 0 {
109+
obj.TLS.CertDir = filepath.Join(os.TempDir(), "k8s-metrics-server", "serving-certs")
110+
}
101111
}
102112

103113
func (c *MetricsServerConfig) Options(ctx context.Context, secretsClient client.Client) metricsserver.Options {
@@ -186,10 +196,6 @@ func (c *TLSConfig) Options(ctx context.Context, secretsClient client.Client) []
186196
}
187197

188198
func SetDefaults_TLSConfig(obj *TLSConfig) {
189-
if len(obj.CertDir) == 0 {
190-
obj.CertDir = filepath.Join(os.TempDir(), "k8s-metrics-server", "serving-certs")
191-
}
192-
193199
if len(obj.CertName) == 0 {
194200
obj.CertName = "tls.crt"
195201
}

internal/config/zz_generated.defaults.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)