@@ -550,11 +550,12 @@ func (f Framework) GetSchedulableNodes() []corev1.Node {
550550 return ret
551551}
552552
553+ // DeployOpenshiftCerts creates cert-manager resources for TLS certificate management.
554+ // Note: This function assumes cert-manager is already installed (which happens during
555+ // 'make cluster-up' via hack/cluster.sh).
553556func (f Framework ) DeployOpenshiftCerts (serviceName , serviceNamespace , clusterIssuerName , caCertName , caCertSecretName , pmIssuerName , tlsCertName , tlsCertSecretName string ) {
554557 f .T .Helper ()
555558
556- f .InstallCertManager ()
557-
558559 f .CreateSelfSignedClusterIssuer (clusterIssuerName )
559560
560561 caCert := f .CreateCACertificate (caCertName , caCertSecretName , serviceNamespace , clusterIssuerName )
@@ -590,32 +591,6 @@ func (f Framework) DeployOpenshiftCerts(serviceName, serviceNamespace, clusterIs
590591 }, Timeout (5 * time .Minute ))
591592}
592593
593- func (f Framework ) InstallCertManager () {
594- f .T .Helper ()
595-
596- _ , err := oc .Literal ().From ("kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.18.2/cert-manager.yaml" ).Run ()
597- assert .NoError (f .T , err , "failed to install cert-manager" )
598-
599- f .WaitUntil ("cert-manager pods are running" , func (ctx context.Context ) (bool , error ) {
600- pods := corev1.PodList {}
601- err := f .client .List (ctx , & pods , client .InNamespace ("cert-manager" ))
602- if err != nil {
603- return false , err
604- }
605-
606- for _ , pod := range pods .Items {
607- if pod .Status .Phase != corev1 .PodRunning {
608- return false , nil
609- }
610- }
611- return true , nil
612- }, Timeout (5 * time .Minute ))
613-
614- f .T .Cleanup (func () {
615- _ , err := oc .Literal ().From ("kubectl delete -f https://github.com/cert-manager/cert-manager/releases/download/v1.18.2/cert-manager.yaml" ).Run ()
616- assert .NoError (f .T , err , "failed to uninstall cert-manager" )
617- })
618- }
619594
620595func (f Framework ) CreateSelfSignedClusterIssuer (name string ) * certv1.ClusterIssuer {
621596 issuer := certv1.ClusterIssuer {
0 commit comments