feat: TLS authentication

tomjo · tomjo · commit af3fcc41bc0c · 2024-01-19T10:57:08.000+01:00
diff --git a/pkg/admin/interface.go b/pkg/admin/interface.go
@@ -235,7 +235,6 @@ func NewPulsarAdmin(conf PulsarAdminConfig) (PulsarAdmin, error) {
 		if err != nil {
 			return nil, err
 		}
-		adminClient = admin.NewWithAuthProvider(config, oauthProvider)
 	} else if conf.Token != "" {
 		config.Token = conf.Token
 
diff --git a/pkg/connection/reconciler.go b/pkg/connection/reconciler.go
@@ -222,7 +222,7 @@ func (r *PulsarConnectionReconciler) MakePulsarAdminConfig(ctx context.Context)
 }
 
 // MakePulsarAdminConfig create pulsar admin configuration
-func (r *PulsarConnectionReconciler) MakePulsarAdminConfig(ctx context.Context, connection *resourcev1alpha1.PulsarConnection,
+func MakePulsarAdminConfig(ctx context.Context, connection *resourcev1alpha1.PulsarConnection,
 	k8sClient client.Client) (*admin.PulsarAdminConfig, error) {
 	if connection.Spec.AdminServiceURL == "" && connection.Spec.AdminServiceSecureURL == "" {
 		return nil, fmt.Errorf("adminServiceURL or adminServiceSecureURL must not be empty")

Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,6 @@ func NewPulsarAdmin(conf PulsarAdminConfig) (PulsarAdmin, error) {`
`235`	`235`	`if err != nil {`
`236`	`236`	`return nil, err`
`237`	`237`	`}`
`238`		`- adminClient = admin.NewWithAuthProvider(config, oauthProvider)`
`239`	`238`	`} else if conf.Token != "" {`
`240`	`239`	`config.Token = conf.Token`
`241`	`240`
Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,7 @@ func (r *PulsarConnectionReconciler) MakePulsarAdminConfig(ctx context.Context)`
`222`	`222`	`}`
`223`	`223`
`224`	`224`	`// MakePulsarAdminConfig create pulsar admin configuration`
`225`		`-func (r PulsarConnectionReconciler) MakePulsarAdminConfig(ctx context.Context, connection resourcev1alpha1.PulsarConnection,`
	`225`	`+func MakePulsarAdminConfig(ctx context.Context, connection *resourcev1alpha1.PulsarConnection,`
`226`	`226`	`k8sClient client.Client) (*admin.PulsarAdminConfig, error) {`
`227`	`227`	`if connection.Spec.AdminServiceURL == "" && connection.Spec.AdminServiceSecureURL == "" {`
`228`	`228`	`return nil, fmt.Errorf("adminServiceURL or adminServiceSecureURL must not be empty")`