Merge pull request #2183 from jubittajohn/fix-makeServerCert-call-4.22

openshift-merge-bot[bot] · web-flow · commit ecbc792a4313 · 2026-04-29T15:12:28.000Z
OCPBUGS-84536: Update MakeServerCert to use time.Duration instead of days
diff --git a/pkg/controller/controllercmd/cmd.go b/pkg/controller/controllercmd/cmd.go
@@ -287,7 +287,7 @@ func (c *ControllerCommandConfig) AddDefaultRotationToConfig(config *operatorv1a
 			config.ServingInfo.CertFile = filepath.Join(temporaryCertDir, "tls.crt")
 			config.ServingInfo.KeyFile = filepath.Join(temporaryCertDir, "tls.key")
 			// nothing can trust this, so we don't really care about hostnames
-			servingCert, err := ca.MakeServerCert(sets.New("localhost"), 30)
+			servingCert, err := ca.MakeServerCert(sets.New("localhost"), time.Hour*24*30)
 			if err != nil {
 				return nil, nil, err
 			}

Original file line number	Diff line number	Diff line change
`@@ -287,7 +287,7 @@ func (c ControllerCommandConfig) AddDefaultRotationToConfig(config operatorv1a`
`287`	`287`	`config.ServingInfo.CertFile = filepath.Join(temporaryCertDir, "tls.crt")`
`288`	`288`	`config.ServingInfo.KeyFile = filepath.Join(temporaryCertDir, "tls.key")`
`289`	`289`	`// nothing can trust this, so we don't really care about hostnames`
`290`		`- servingCert, err := ca.MakeServerCert(sets.New("localhost"), 30)`
	`290`	`+ servingCert, err := ca.MakeServerCert(sets.New("localhost"), time.Hour2430)`
`291`	`291`	`if err != nil {`
`292`	`292`	`return nil, nil, err`
`293`	`293`	`}`