mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-19 09:52:49 +00:00
Merge pull request #116070 from aramase/aramase/f/kms-pkg/util
[KMS] move util from envelope to kms package
This commit is contained in:
commit
0e077bb7ac
@ -28,9 +28,9 @@ import (
|
|||||||
"google.golang.org/grpc/credentials/insecure"
|
"google.golang.org/grpc/credentials/insecure"
|
||||||
|
|
||||||
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
|
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
|
||||||
"k8s.io/apiserver/pkg/storage/value/encrypt/envelope/util"
|
|
||||||
"k8s.io/klog/v2"
|
"k8s.io/klog/v2"
|
||||||
kmsapi "k8s.io/kms/apis/v1beta1"
|
kmsapi "k8s.io/kms/apis/v1beta1"
|
||||||
|
"k8s.io/kms/pkg/util"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
@ -28,10 +28,10 @@ import (
|
|||||||
|
|
||||||
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
|
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
|
||||||
"k8s.io/apiserver/pkg/storage/value/encrypt/envelope/metrics"
|
"k8s.io/apiserver/pkg/storage/value/encrypt/envelope/metrics"
|
||||||
"k8s.io/apiserver/pkg/storage/value/encrypt/envelope/util"
|
|
||||||
"k8s.io/klog/v2"
|
"k8s.io/klog/v2"
|
||||||
kmsapi "k8s.io/kms/apis/v2alpha1"
|
kmsapi "k8s.io/kms/apis/v2alpha1"
|
||||||
kmsservice "k8s.io/kms/pkg/service"
|
kmsservice "k8s.io/kms/pkg/service"
|
||||||
|
"k8s.io/kms/pkg/util"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
@ -27,7 +27,7 @@ const (
|
|||||||
unixProtocol = "unix"
|
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) {
|
func ParseEndpoint(endpoint string) (string, error) {
|
||||||
if len(endpoint) == 0 {
|
if len(endpoint) == 0 {
|
||||||
return "", fmt.Errorf("remote KMS provider can't use empty string as endpoint")
|
return "", fmt.Errorf("remote KMS provider can't use empty string as endpoint")
|
2
vendor/modules.txt
vendored
2
vendor/modules.txt
vendored
@ -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/metrics
|
||||||
k8s.io/apiserver/pkg/storage/value/encrypt/envelope/testing/v1beta1
|
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/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/identity
|
||||||
k8s.io/apiserver/pkg/storage/value/encrypt/secretbox
|
k8s.io/apiserver/pkg/storage/value/encrypt/secretbox
|
||||||
k8s.io/apiserver/pkg/storageversion
|
k8s.io/apiserver/pkg/storageversion
|
||||||
@ -2108,6 +2107,7 @@ k8s.io/klog/v2/test
|
|||||||
k8s.io/kms/apis/v1beta1
|
k8s.io/kms/apis/v1beta1
|
||||||
k8s.io/kms/apis/v2alpha1
|
k8s.io/kms/apis/v2alpha1
|
||||||
k8s.io/kms/pkg/service
|
k8s.io/kms/pkg/service
|
||||||
|
k8s.io/kms/pkg/util
|
||||||
# k8s.io/kube-aggregator v0.0.0 => ./staging/src/k8s.io/kube-aggregator
|
# k8s.io/kube-aggregator v0.0.0 => ./staging/src/k8s.io/kube-aggregator
|
||||||
## explicit; go 1.19
|
## explicit; go 1.19
|
||||||
k8s.io/kube-aggregator/pkg/apis/apiregistration
|
k8s.io/kube-aggregator/pkg/apis/apiregistration
|
||||||
|
Loading…
Reference in New Issue
Block a user