fixup! Certificate support for image registry

cmd/manager/main.go

@@ -83,7 +83,7 @@ func main() {
 	)
 	flag.StringVar(&metricsAddr, "metrics-bind-address", ":8080", "The address the metric endpoint binds to.")
 	flag.StringVar(&probeAddr, "health-probe-bind-address", ":8081", "The address the probe endpoint binds to.")
-	flag.StringVar(&caCertDir, "ca-cert-dir", "", "The directory of TLS certificate to use for verifying HTTPS connections to the Catalogd and docker-registry web servers.")
+	flag.StringVar(&caCertDir, "ca-certs-dir", "", "The directory of TLS certificate to use for verifying HTTPS connections to the Catalogd and docker-registry web servers.")
 	flag.BoolVar(&enableLeaderElection, "leader-elect", false,
 		"Enable leader election for controller manager. "+
 			"Enabling this will ensure there is only one active controller manager.")

config/overlays/tls/patches/manager_deployment_cert.yaml

@@ -6,4 +6,4 @@
   value: {"name":"catalogd-certificate", "readOnly": true, "mountPath":"/var/certs/catalogd.crt", "subPath":"catalogd.crt"}
 - op: add
   path: /spec/template/spec/containers/0/args/-
-  value: "--ca-cert-dir=/var/certs"
+  value: "--ca-certs-dir=/var/certs"

internal/httputil/httputil.go

@@ -5,7 +5,6 @@ import (
 	"crypto/x509"
 	"net/http"
 	"os"
-	"path/filepath"
 	"strings"
 	"time"
 )
@@ -16,22 +15,19 @@ func LoadCerts(caDir string) (string, error) {
 	}
 
 	var certs []string
-	err := filepath.Walk(caDir, func(path string, info os.FileInfo, err error) error {
-		if err != nil {
-			return err
-		}
-		if info.IsDir() {
-			return nil
+	dirEntries, err := os.ReadDir(caDir)
+	if err != nil {
+		return "", err
+	}
+	for _, e := range dirEntries {
+		if e.IsDir() {
+			continue
 		}
-		data, err := os.ReadFile(path)
+		data, err := os.ReadFile(e.Name())
 		if err != nil {
-			return err
+			return "", err
 		}
 		certs = append(certs, string(data))
-		return nil
-	})
-	if err != nil {
-		return "", err
 	}
 	return strings.Join(certs, "\n"), nil
 }