fixup! Certificate support for image registry

Signed-off-by: Todd Short <tshort@redhat.com>

Makefile

@@ -155,7 +155,6 @@ test-e2e: GO_BUILD_FLAGS := -cover
 test-e2e: run image-registry build-push-e2e-catalog registry-load-bundles e2e e2e-coverage kind-clean #HELP Run e2e test suite on local kind cluster
 
 .PHONY: extension-developer-e2e
-extension-developer-e2e: KUSTOMIZE_BUILD_DIR := config/overlays/certs
 extension-developer-e2e: KIND_CLUSTER_NAME := operator-controller-ext-dev-e2e  #EXHELP Run extension-developer e2e on local kind cluster
 extension-developer-e2e: run image-registry test-ext-dev-e2e kind-clean
 

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", "", "The directory of TLS certificate to use for verifying HTTPS connections to the Catalogd and docker-registry web servers.")
+	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.BoolVar(&enableLeaderElection, "leader-elect", false,
 		"Enable leader election for controller manager. "+
 			"Enabling this will ensure there is only one active controller manager.")

config/overlays/e2e/kustomization.yaml

@@ -1,7 +1,7 @@
 namespace: olmv1-system
 
 resources:
-- ../../overlays/certs
+- ../../overlays/tls
 - manager_e2e_coverage_pvc.yaml
 - manager_e2e_coverage_copy_pod.yaml
 

config/overlays/tls/kustomization.yaml

@@ -12,9 +12,11 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
 - ../../base
+- resources/manager_cert.yaml
 
 patches:
 - target:
     kind: Deployment
     name: controller-manager
-  path: patches/manager_deployment_cert.yaml
+  path: patches/manager_deployment_cert.yaml
+- path: patches/manager_cert_patch.yaml

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=/var/certs"
+  value: "--ca-cert-dir=/var/certs"

internal/controllers/clusterextension_controller.go

@@ -550,9 +550,8 @@ func (r *ClusterExtensionReconciler) generateBundleDeploymentForUnpack(ctx conte
 			Source: rukpakv1alpha2.BundleSource{
 				Type: rukpakv1alpha2.SourceTypeImage,
 				Image: &rukpakv1alpha2.ImageSource{
-					Ref:                   bundlePath,
-					InsecureSkipTLSVerify: false,
-					CertificateData:       certData,
+					Ref:             bundlePath,
+					CertificateData: certData,
 				},
 			},
 		},