Skip to content

Commit ab29e82

Browse files
authored
Merge pull request #115 from mengqiy/move_pkg_to_internal
move cert pkg to internal
2 parents 7c37648 + 788468e commit ab29e82

24 files changed

+16
-16
lines changed

pkg/webhook/bootstrap.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ import (
3434
"k8s.io/apimachinery/pkg/runtime"
3535
"sigs.k8s.io/controller-runtime/pkg/client"
3636
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
37-
"sigs.k8s.io/controller-runtime/pkg/webhook/cert"
38-
"sigs.k8s.io/controller-runtime/pkg/webhook/cert/writer"
37+
"sigs.k8s.io/controller-runtime/pkg/webhook/internal/cert"
38+
"sigs.k8s.io/controller-runtime/pkg/webhook/internal/cert/writer"
3939
"sigs.k8s.io/controller-runtime/pkg/webhook/types"
4040
)
4141

File renamed without changes.

pkg/webhook/cert/generator/fake/certgenerator.go renamed to pkg/webhook/internal/cert/generator/fake/certgenerator.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package fake
1919
import (
2020
"fmt"
2121

22-
"sigs.k8s.io/controller-runtime/pkg/webhook/cert/generator"
22+
"sigs.k8s.io/controller-runtime/pkg/webhook/internal/cert/generator"
2323
)
2424

2525
// CertGenerator is a CertGenerator for testing.

pkg/webhook/cert/provisioner.go renamed to pkg/webhook/internal/cert/provisioner.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ import (
2424
"k8s.io/apimachinery/pkg/runtime"
2525
"sigs.k8s.io/controller-runtime/pkg/client"
2626
"sigs.k8s.io/controller-runtime/pkg/client/config"
27-
"sigs.k8s.io/controller-runtime/pkg/webhook/cert/generator"
28-
"sigs.k8s.io/controller-runtime/pkg/webhook/cert/writer"
27+
"sigs.k8s.io/controller-runtime/pkg/webhook/internal/cert/generator"
28+
"sigs.k8s.io/controller-runtime/pkg/webhook/internal/cert/writer"
2929
)
3030

3131
// Provisioner provisions certificates for webhook configurations and writes them to an output

pkg/webhook/cert/writer/certwriter.go renamed to pkg/webhook/internal/cert/writer/certwriter.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
admissionregistrationv1beta1 "k8s.io/api/admissionregistration/v1beta1"
3030
"k8s.io/apimachinery/pkg/runtime"
3131
"sigs.k8s.io/controller-runtime/pkg/client"
32-
"sigs.k8s.io/controller-runtime/pkg/webhook/cert/generator"
32+
"sigs.k8s.io/controller-runtime/pkg/webhook/internal/cert/generator"
3333
)
3434

3535
const (

pkg/webhook/cert/writer/certwriter_test.go renamed to pkg/webhook/internal/cert/writer/certwriter_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
. "github.com/onsi/ginkgo"
2424
. "github.com/onsi/gomega"
2525
"sigs.k8s.io/controller-runtime/pkg/client"
26-
"sigs.k8s.io/controller-runtime/pkg/webhook/cert/generator"
26+
"sigs.k8s.io/controller-runtime/pkg/webhook/internal/cert/generator"
2727

2828
admissionregistration "k8s.io/api/admissionregistration/v1beta1"
2929
"k8s.io/apimachinery/pkg/api/errors"

pkg/webhook/cert/writer/fs.go renamed to pkg/webhook/internal/cert/writer/fs.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ import (
2727
admissionregistrationv1beta1 "k8s.io/api/admissionregistration/v1beta1"
2828
"k8s.io/apimachinery/pkg/api/meta"
2929
"k8s.io/apimachinery/pkg/runtime"
30-
certgenerator "sigs.k8s.io/controller-runtime/pkg/webhook/cert/generator"
31-
"sigs.k8s.io/controller-runtime/pkg/webhook/cert/writer/internal/atomic"
30+
certgenerator "sigs.k8s.io/controller-runtime/pkg/webhook/internal/cert/generator"
31+
"sigs.k8s.io/controller-runtime/pkg/webhook/internal/cert/writer/atomic"
3232
)
3333

3434
const (

pkg/webhook/cert/writer/fs_test.go renamed to pkg/webhook/internal/cert/writer/fs_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ import (
3030
corev1 "k8s.io/api/core/v1"
3131
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3232
"k8s.io/apimachinery/pkg/types"
33-
"sigs.k8s.io/controller-runtime/pkg/webhook/cert/generator"
34-
fakegenerator "sigs.k8s.io/controller-runtime/pkg/webhook/cert/generator/fake"
33+
"sigs.k8s.io/controller-runtime/pkg/webhook/internal/cert/generator"
34+
fakegenerator "sigs.k8s.io/controller-runtime/pkg/webhook/internal/cert/generator/fake"
3535
)
3636

3737
var _ = Describe("FSCertWriter", func() {

pkg/webhook/cert/writer/secret.go renamed to pkg/webhook/internal/cert/writer/secret.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"k8s.io/apimachinery/pkg/runtime"
3030
"k8s.io/apimachinery/pkg/types"
3131
"sigs.k8s.io/controller-runtime/pkg/client"
32-
"sigs.k8s.io/controller-runtime/pkg/webhook/cert/generator"
32+
"sigs.k8s.io/controller-runtime/pkg/webhook/internal/cert/generator"
3333
)
3434

3535
const (

pkg/webhook/cert/writer/secret_test.go renamed to pkg/webhook/internal/cert/writer/secret_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ import (
3030
"k8s.io/apimachinery/pkg/types"
3131
"sigs.k8s.io/controller-runtime/pkg/client"
3232
"sigs.k8s.io/controller-runtime/pkg/client/fake"
33-
"sigs.k8s.io/controller-runtime/pkg/webhook/cert/generator"
34-
fakegenerator "sigs.k8s.io/controller-runtime/pkg/webhook/cert/generator/fake"
33+
"sigs.k8s.io/controller-runtime/pkg/webhook/internal/cert/generator"
34+
fakegenerator "sigs.k8s.io/controller-runtime/pkg/webhook/internal/cert/generator/fake"
3535
)
3636

3737
var _ = Describe("SecretCertWriter", func() {

pkg/webhook/server.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ import (
2929
"sigs.k8s.io/controller-runtime/pkg/client"
3030
"sigs.k8s.io/controller-runtime/pkg/manager"
3131
"sigs.k8s.io/controller-runtime/pkg/runtime/inject"
32-
"sigs.k8s.io/controller-runtime/pkg/webhook/cert"
33-
"sigs.k8s.io/controller-runtime/pkg/webhook/cert/writer"
32+
"sigs.k8s.io/controller-runtime/pkg/webhook/internal/cert"
33+
"sigs.k8s.io/controller-runtime/pkg/webhook/internal/cert/writer"
3434
"sigs.k8s.io/controller-runtime/pkg/webhook/types"
3535
)
3636

0 commit comments

Comments
 (0)