Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[KMS] move util from envelope to kms package #116070

Merged
merged 1 commit into from Feb 27, 2023
Merged

[KMS] move util from envelope to kms package #116070

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/grpc_service.go
View file
Open in desktop
Expand Up @@ -28,9 +28,9 @@ import (
"google.golang.org/grpc/credentials/insecure"

utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apiserver/pkg/storage/value/encrypt/envelope/util"
"k8s.io/klog/v2"
kmsapi "k8s.io/kms/apis/v1beta1"
"k8s.io/kms/pkg/util"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/kmsv2/grpc_service.go
View file
Open in desktop
Expand Up @@ -28,10 +28,10 @@ import (

utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apiserver/pkg/storage/value/encrypt/envelope/metrics"
"k8s.io/apiserver/pkg/storage/value/encrypt/envelope/util"
"k8s.io/klog/v2"
kmsapi "k8s.io/kms/apis/v2alpha1"
kmsservice "k8s.io/kms/pkg/service"
"k8s.io/kms/pkg/util"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion ...orage/value/encrypt/envelope/util/util.go → staging/src/k8s.io/kms/pkg/util/util.go
View file
Open in desktop
Expand Up @@ -27,7 +27,7 @@ const (
unixProtocol = "unix"
)

// Parse the endpoint to extract schema, host or path.
// ParseEndpoint parses the endpoint to extract schema, host or path.
func ParseEndpoint(endpoint string) (string, error) {
if len(endpoint) == 0 {
return "", fmt.Errorf("remote KMS provider can't use empty string as endpoint")
Expand Down
0 .../value/encrypt/envelope/util/util_test.go → staging/src/k8s.io/kms/pkg/util/util_test.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion vendor/modules.txt
View file
Open in desktop
Expand Up @@ -1577,7 +1577,6 @@ k8s.io/apiserver/pkg/storage/value/encrypt/envelope/kmsv2/v2alpha1
k8s.io/apiserver/pkg/storage/value/encrypt/envelope/metrics
k8s.io/apiserver/pkg/storage/value/encrypt/envelope/testing/v1beta1
k8s.io/apiserver/pkg/storage/value/encrypt/envelope/testing/v2alpha1
k8s.io/apiserver/pkg/storage/value/encrypt/envelope/util
k8s.io/apiserver/pkg/storage/value/encrypt/identity
k8s.io/apiserver/pkg/storage/value/encrypt/secretbox
k8s.io/apiserver/pkg/storageversion
Expand Down Expand Up @@ -2108,6 +2107,7 @@ k8s.io/klog/v2/test
k8s.io/kms/apis/v1beta1
k8s.io/kms/apis/v2alpha1
k8s.io/kms/pkg/service
k8s.io/kms/pkg/util
# k8s.io/kube-aggregator v0.0.0 => ./staging/src/k8s.io/kube-aggregator
## explicit; go 1.19
k8s.io/kube-aggregator/pkg/apis/apiregistration
Expand Down