diff --git a/staging/src/k8s.io/apiserver/pkg/server/options/encryptionconfig/config.go b/staging/src/k8s.io/apiserver/pkg/server/options/encryptionconfig/config.go
index 1ce4795c33f..4c0048bf0ea 100644
--- a/staging/src/k8s.io/apiserver/pkg/server/options/encryptionconfig/config.go
+++ b/staging/src/k8s.io/apiserver/pkg/server/options/encryptionconfig/config.go
@@ -24,7 +24,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"os"
 	"sync"
@@ -124,7 +123,7 @@ func GetKMSPluginHealthzCheckers(filepath string) ([]healthz.HealthChecker, erro
 func getKMSPluginProbes(reader io.Reader) ([]interface{}, error) {
 	var result []interface{}
 
-	configFileContents, err := ioutil.ReadAll(reader)
+	configFileContents, err := io.ReadAll(reader)
 	if err != nil {
 		return nil, fmt.Errorf("could not read content of encryption provider configuration: %v", err)
 	}
@@ -270,7 +269,7 @@ func GetTransformerOverrides(filepath string) (map[schema.GroupResource]value.Tr
 }
 
 func parseEncryptionConfiguration(f io.Reader) (map[schema.GroupResource]value.Transformer, error) {
-	configFileContents, err := ioutil.ReadAll(f)
+	configFileContents, err := io.ReadAll(f)
 	if err != nil {
 		return nil, fmt.Errorf("could not read contents: %v", err)
 	}
diff --git a/staging/src/k8s.io/apiserver/pkg/server/options/encryptionconfig/config_test.go b/staging/src/k8s.io/apiserver/pkg/server/options/encryptionconfig/config_test.go
index 38a545bf67e..7136dc36cf7 100644
--- a/staging/src/k8s.io/apiserver/pkg/server/options/encryptionconfig/config_test.go
+++ b/staging/src/k8s.io/apiserver/pkg/server/options/encryptionconfig/config_test.go
@@ -22,7 +22,6 @@ import (
 	"encoding/base64"
 	"errors"
 	"io"
-	"io/ioutil"
 	"os"
 	"sync"
 	"testing"
@@ -53,7 +52,7 @@ func mustReadConfig(t *testing.T, path string) []byte {
 	}
 	defer f.Close()
 
-	configFileContents, err := ioutil.ReadAll(f)
+	configFileContents, err := io.ReadAll(f)
 	if err != nil {
 		t.Fatalf("could not read contents of encryption config: %v", err)
 	}
diff --git a/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/kmsv2/envelope.go b/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/kmsv2/envelope.go
index 5b65f12424b..775f14c44cc 100644
--- a/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/kmsv2/envelope.go
+++ b/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/kmsv2/envelope.go
@@ -60,8 +60,6 @@ type envelopeTransformer struct {
 
 	cacheSize    int
 	cacheEnabled bool
-
-	pluginName string
 }
 
 // EncryptResponse is the response from the Envelope service when encrypting data.
diff --git a/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/kmsv2/envelope_test.go b/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/kmsv2/envelope_test.go
index 83e1a8e0981..2229444d9d0 100644
--- a/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/kmsv2/envelope_test.go
+++ b/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/kmsv2/envelope_test.go
@@ -181,9 +181,7 @@ func TestEnvelopeCacheLimit(t *testing.T) {
 }
 
 func TestEncodeDecode(t *testing.T) {
-	envelopeTransformer := &envelopeTransformer{
-		pluginName: "testplugin",
-	}
+	envelopeTransformer := &envelopeTransformer{}
 
 	obj := &kmstypes.EncryptedObject{
 		EncryptedData: []byte{0x01, 0x02, 0x03},
@@ -207,9 +205,7 @@ func TestEncodeDecode(t *testing.T) {
 }
 
 func TestDecodeError(t *testing.T) {
-	et := &envelopeTransformer{
-		pluginName: "testplugin",
-	}
+	et := &envelopeTransformer{}
 
 	testCases := []struct {
 		desc          string