github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 02:09:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #120365 from aramase/aramase/c/kms_scheme_cleanup

Browse Source 
register API types only once for encryption config
This commit is contained in:
Kubernetes Prow Robot 2023-09-05 16:21:03 -07:00 committed by GitHub
commit 10d257889d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
staging/src/k8s.io/apiserver/pkg/server/options/encryptionconfig/config.go
View File

@ -104,6 +104,15 @@ const (
kmsReloadHealthCheckName = "kms-providers" kmsReloadHealthCheckName = "kms-providers"
) )
var codecs serializer.CodecFactory
func init() {
configScheme := runtime.NewScheme()
utilruntime.Must(apiserverconfig.AddToScheme(configScheme))
utilruntime.Must(apiserverconfigv1.AddToScheme(configScheme))
codecs = serializer.NewCodecFactory(configScheme)
}
type kmsPluginHealthzResponse struct { type kmsPluginHealthzResponse struct {
err error err error
received time.Time received time.Time
@ -475,11 +484,6 @@ func loadConfig(filepath string, reload bool) (*apiserverconfig.EncryptionConfig
return nil, "", fmt.Errorf("encryption provider configuration file %q is empty", filepath) return nil, "", fmt.Errorf("encryption provider configuration file %q is empty", filepath)
} }
scheme := runtime.NewScheme()
codecs := serializer.NewCodecFactory(scheme)
utilruntime.Must(apiserverconfig.AddToScheme(scheme))
utilruntime.Must(apiserverconfigv1.AddToScheme(scheme))
configObj, gvk, err := codecs.UniversalDecoder().Decode(data, nil, nil) configObj, gvk, err := codecs.UniversalDecoder().Decode(data, nil, nil)
if err != nil { if err != nil {
return nil, "", fmt.Errorf("error decoding encryption provider configuration file %q: %w", filepath, err) return nil, "", fmt.Errorf("error decoding encryption provider configuration file %q: %w", filepath, err)