Skip to content

Commit

Permalink
Merge pull request #247 from openshift-cherrypick-robot/cherry-pick-2…
Browse files Browse the repository at this point in the history
…46-to-release-4.4

[release-4.4] Bug 1833122: Have targetconfig controller use cm/default-ingress-cert
  • Loading branch information
openshift-merge-robot committed Jun 12, 2020
2 parents 02325ba + 45497c3 commit 24a8262
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/operator/target_config_reconciler_v410_00.go
Expand Up @@ -218,7 +218,7 @@ func manageServiceAccountCABundle(lister corev1listers.ConfigMapLister, client c
resourcesynccontroller.ResourceLocation{Namespace: operatorclient.GlobalMachineSpecifiedConfigNamespace, Name: "kube-apiserver-server-ca"},
// include the ca bundle needed to recognize default
// certificates generated by cluster-ingress-operator
resourcesynccontroller.ResourceLocation{Namespace: operatorclient.GlobalMachineSpecifiedConfigNamespace, Name: "router-ca"},
resourcesynccontroller.ResourceLocation{Namespace: operatorclient.GlobalMachineSpecifiedConfigNamespace, Name: "default-ingress-cert"},
)
if err != nil {
return nil, false, err
Expand Down

0 comments on commit 24a8262

Please sign in to comment.