Skip to content
This repository was archived by the owner on Jul 11, 2023. It is now read-only.

Commit 8ce0c4b

Browse files
committed
fix: update configClient call and logging
Fixes incorrect configClient call and removes log definition. Signed-off-by: jaellio <[email protected]>
1 parent baff85f commit 8ce0c4b

File tree

4 files changed

+4
-5
lines changed

4 files changed

+4
-5
lines changed

pkg/certificate/providers/config.go

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
cmmeta "github.com/jetstack/cert-manager/pkg/apis/meta/v1"
99
cmversionedclient "github.com/jetstack/cert-manager/pkg/client/clientset/versioned"
1010
"github.com/pkg/errors"
11+
"github.com/rs/zerolog/log"
1112
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1213
"k8s.io/client-go/kubernetes"
1314
"k8s.io/client-go/rest"

pkg/certificate/providers/config_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ func TestGetCertificateManager(t *testing.T) {
136136
},
137137
}),
138138
informerCollectionFunc: func(tc testCase) (*informers.InformerCollection, error) {
139-
ic, err := informers.NewInformerCollection("osm", nil, informers.WithKubeClient(tc.kubeClient), informers.WithConfigClient(tc.configClient))
139+
ic, err := informers.NewInformerCollection("osm", nil, informers.WithKubeClient(tc.kubeClient), informers.WithConfigClient(tc.configClient, "", "osm-system"))
140140
if err != nil {
141141
return nil, err
142142
}
@@ -196,7 +196,7 @@ func TestGetCertificateManager(t *testing.T) {
196196
},
197197
}),
198198
informerCollectionFunc: func(tc testCase) (*informers.InformerCollection, error) {
199-
ic, err := informers.NewInformerCollection("osm", nil, informers.WithKubeClient(tc.kubeClient), informers.WithConfigClient(tc.configClient, "", "osm-namespace"))
199+
ic, err := informers.NewInformerCollection("osm", nil, informers.WithKubeClient(tc.kubeClient), informers.WithConfigClient(tc.configClient, "", "osm-system"))
200200
if err != nil {
201201
return nil, err
202202
}

pkg/certificate/providers/options.go

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"errors"
55
"fmt"
66

7+
"github.com/rs/zerolog/log"
78
corev1 "k8s.io/api/core/v1"
89

910
"github.com/openservicemesh/osm/pkg/apis/config/v1alpha2"

pkg/certificate/providers/types.go

-3
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,8 @@ import (
88
"github.com/openservicemesh/osm/pkg/apis/config/v1alpha2"
99
"github.com/openservicemesh/osm/pkg/certificate"
1010
"github.com/openservicemesh/osm/pkg/certificate/pem"
11-
"github.com/openservicemesh/osm/pkg/logger"
1211
)
1312

14-
var log = logger.New("certificate/provider")
15-
1613
// Kind specifies the certificate provider kind
1714
type Kind string
1815

0 commit comments

Comments
 (0)