github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-08 11:38:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #116901 from pacoxu/cleanup-KubeletCredentialProviders

Browse Source 
remove GAed KubeletCredentialProviders （1.28）
This commit is contained in:
Kubernetes Prow Robot 2023-05-08 07:55:53 -07:00 committed by GitHub
commit dd43d864c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/gce/config-default.sh
View File

@ -562,6 +562,6 @@ export CLOUD_PROVIDER_FLAG="${CLOUD_PROVIDER_FLAG:-gce}"
# are presented to kubelet: # are presented to kubelet:
# --image-credential-provider-config=${path-to-config} # --image-credential-provider-config=${path-to-config}
# --image-credential-provider-bin-dir=${path-to-auth-provider-binary} # --image-credential-provider-bin-dir=${path-to-auth-provider-binary}
# Also, it is required that DisableKubeletCloudCredentialProviders and KubeletCredentialProviders # Also, it is required that DisableKubeletCloudCredentialProviders
# feature gates are set to true for kubelet to use external credential provider. # feature gates are set to true for kubelet to use external credential provider.
ENABLE_AUTH_PROVIDER_GCP="${ENABLE_AUTH_PROVIDER_GCP:-false}" ENABLE_AUTH_PROVIDER_GCP="${ENABLE_AUTH_PROVIDER_GCP:-false}"

4
cluster/gce/gci/configure.sh
View File

@ -717,8 +717,8 @@ function install-kube-binary-config {
# are presented to kubelet: # are presented to kubelet:
# --image-credential-provider-config=${path-to-config} # --image-credential-provider-config=${path-to-config}
# --image-credential-provider-bin-dir=${path-to-auth-provider-binary} # --image-credential-provider-bin-dir=${path-to-auth-provider-binary}
# Also, it is required that DisableKubeletCloudCredentialProviders and KubeletCredentialProviders # Also, it is required that DisableKubeletCloudCredentialProviders
# feature gates are set to true for kubelet to use external credential provider. # feature gate is set to true for kubelet to use external credential provider.
if [[ "${ENABLE_AUTH_PROVIDER_GCP:-}" == "true" ]]; then if [[ "${ENABLE_AUTH_PROVIDER_GCP:-}" == "true" ]]; then
# Install out-of-tree auth-provider-gcp binary to enable kubelet to dynamically # Install out-of-tree auth-provider-gcp binary to enable kubelet to dynamically
# retrieve credentials for a container image registry. # retrieve credentials for a container image registry.

10
pkg/features/kube_features.go
View File

@ -408,14 +408,6 @@ const (
// yet. // yet.
JobTrackingWithFinalizers featuregate.Feature = "JobTrackingWithFinalizers" JobTrackingWithFinalizers featuregate.Feature = "JobTrackingWithFinalizers"
// owner: @andrewsykim @adisky @ndixita
// alpha: v1.20
// beta: v1.24
// GA: v1.26
//
// Enable kubelet exec plugins for image pull credentials.
KubeletCredentialProviders featuregate.Feature = "KubeletCredentialProviders"
// owner: @AkihiroSuda // owner: @AkihiroSuda
// alpha: v1.22 // alpha: v1.22
// //
@ -953,8 +945,6 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
JobTrackingWithFinalizers: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.28 JobTrackingWithFinalizers: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.28
KubeletCredentialProviders: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.28
KubeletInUserNamespace: {Default: false, PreRelease: featuregate.Alpha}, KubeletInUserNamespace: {Default: false, PreRelease: featuregate.Alpha},
KubeletPodResources: {Default: true, PreRelease: featuregate.Beta}, KubeletPodResources: {Default: true, PreRelease: featuregate.Beta},

2
test/e2e_node/image_credential_provider.go
View File

@ -30,7 +30,7 @@ import (
admissionapi "k8s.io/pod-security-admission/api" admissionapi "k8s.io/pod-security-admission/api"
) )
var _ = SIGDescribe("ImageCredentialProvider [Feature:KubeletCredentialProviders]", func() { var _ = SIGDescribe("ImageCredentialProvider", func() {
f := framework.NewDefaultFramework("image-credential-provider") f := framework.NewDefaultFramework("image-credential-provider")
f.NamespacePodSecurityEnforceLevel = admissionapi.LevelPrivileged f.NamespacePodSecurityEnforceLevel = admissionapi.LevelPrivileged
var podClient *e2epod.PodClient var podClient *e2epod.PodClient

2
test/e2e_node/plugins/gcp-credential-provider/README.md
View File

@ -29,7 +29,7 @@ providers:
3. Configuring the following additional flags on the kubelet: 3. Configuring the following additional flags on the kubelet:
``` ```
--feature-gates=DisableKubeletCloudCredentialProviders=true,KubeletCredentialProviders=true --feature-gates=DisableKubeletCloudCredentialProviders=true
--image-credential-provider-config=/tmp/node-e2e-123456/credential-provider.yaml --image-credential-provider-config=/tmp/node-e2e-123456/credential-provider.yaml
--image-credential-provider-bin-dir=/tmp/node-e2e-12345 --image-credential-provider-bin-dir=/tmp/node-e2e-12345
``` ```

2
test/e2e_node/remote/node_e2e.go
View File

@ -96,7 +96,7 @@ func prependMemcgNotificationFlag(args string) string {
// a credential provider plugin. // a credential provider plugin.
func prependGCPCredentialProviderFlag(args, workspace string) string { func prependGCPCredentialProviderFlag(args, workspace string) string {
credentialProviderConfig := filepath.Join(workspace, "credential-provider.yaml") credentialProviderConfig := filepath.Join(workspace, "credential-provider.yaml")
featureGateFlag := "--kubelet-flags=--feature-gates=DisableKubeletCloudCredentialProviders=true,KubeletCredentialProviders=true" featureGateFlag := "--kubelet-flags=--feature-gates=DisableKubeletCloudCredentialProviders=true"
configFlag := fmt.Sprintf("--kubelet-flags=--image-credential-provider-config=%s", credentialProviderConfig) configFlag := fmt.Sprintf("--kubelet-flags=--image-credential-provider-config=%s", credentialProviderConfig)
binFlag := fmt.Sprintf("--kubelet-flags=--image-credential-provider-bin-dir=%s", workspace) binFlag := fmt.Sprintf("--kubelet-flags=--image-credential-provider-bin-dir=%s", workspace)
return fmt.Sprintf("%s %s %s %s", featureGateFlag, configFlag, binFlag, args) return fmt.Sprintf("%s %s %s %s", featureGateFlag, configFlag, binFlag, args)