update dependencies (#6267)

Signed-off-by: hongming <coder.scala@gmail.com>
This commit is contained in:
hongming
2024-11-06 10:27:06 +08:00
committed by GitHub
parent faf255a084
commit cfebd96a1f
4263 changed files with 341374 additions and 132036 deletions

View File

@@ -27,9 +27,9 @@ import (
"strings"
"time"
jsonpatch "github.com/evanphx/json-patch"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
jsonpatch "gopkg.in/evanphx/json-patch.v4"
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/meta"
@@ -427,9 +427,10 @@ type FeatureGate string
const (
ApplySet FeatureGate = "KUBECTL_APPLYSET"
CmdPluginAsSubcommand FeatureGate = "KUBECTL_ENABLE_CMD_SHADOW"
InteractiveDelete FeatureGate = "KUBECTL_INTERACTIVE_DELETE"
OpenAPIV3Patch FeatureGate = "KUBECTL_OPENAPIV3_PATCH"
RemoteCommandWebsockets FeatureGate = "KUBECTL_REMOTE_COMMAND_WEBSOCKETS"
PortForwardWebsockets FeatureGate = "KUBECTL_PORT_FORWARD_WEBSOCKETS"
DebugCustomProfile FeatureGate = "KUBECTL_DEBUG_CUSTOM_PROFILE"
)
// IsEnabled returns true iff environment variable is set to true.
@@ -523,11 +524,9 @@ func AddLabelSelectorFlagVar(cmd *cobra.Command, p *string) {
cmd.Flags().StringVarP(p, "selector", "l", *p, "Selector (label query) to filter on, supports '=', '==', and '!='.(e.g. -l key1=value1,key2=value2). Matching objects must satisfy all of the specified label constraints.")
}
func AddPruningFlags(cmd *cobra.Command, prune *bool, pruneAllowlist *[]string, pruneWhitelist *[]string, all *bool, applySetRef *string) {
func AddPruningFlags(cmd *cobra.Command, prune *bool, pruneAllowlist *[]string, all *bool, applySetRef *string) {
// Flags associated with the original allowlist-based alpha
cmd.Flags().StringArrayVar(pruneAllowlist, "prune-allowlist", *pruneAllowlist, "Overwrite the default allowlist with <group/version/kind> for --prune")
cmd.Flags().StringArrayVar(pruneWhitelist, "prune-whitelist", *pruneWhitelist, "Overwrite the default whitelist with <group/version/kind> for --prune") // TODO: Remove this in kubectl 1.28 or later
_ = cmd.Flags().MarkDeprecated("prune-whitelist", "Use --prune-allowlist instead.")
cmd.Flags().BoolVar(all, "all", *all, "Select all resources in the namespace of the specified resource types.")
// Flags associated with the new ApplySet-based alpha

View File

@@ -45,6 +45,7 @@ import (
rbacv1beta1 "k8s.io/api/rbac/v1beta1"
schedulingv1alpha1 "k8s.io/api/scheduling/v1alpha1"
storagev1 "k8s.io/api/storage/v1"
storagev1alpha1 "k8s.io/api/storage/v1alpha1"
storagev1beta1 "k8s.io/api/storage/v1beta1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
metav1beta1 "k8s.io/apimachinery/pkg/apis/meta/v1beta1"
@@ -78,5 +79,5 @@ func init() {
utilruntime.Must(Scheme.SetVersionPriority(policyv1beta1.SchemeGroupVersion, policyv1.SchemeGroupVersion))
utilruntime.Must(Scheme.SetVersionPriority(rbacv1.SchemeGroupVersion, rbacv1beta1.SchemeGroupVersion, rbacv1alpha1.SchemeGroupVersion))
utilruntime.Must(Scheme.SetVersionPriority(schedulingv1alpha1.SchemeGroupVersion))
utilruntime.Must(Scheme.SetVersionPriority(storagev1.SchemeGroupVersion, storagev1beta1.SchemeGroupVersion))
utilruntime.Must(Scheme.SetVersionPriority(storagev1.SchemeGroupVersion, storagev1beta1.SchemeGroupVersion, storagev1alpha1.SchemeGroupVersion))
}

View File

@@ -736,7 +736,7 @@ msgstr "kubectl kontrolliert den Kubernetes-Cluster-Manager"
#~ "\n"
#~ "\t\t# Apply the configuration in manifest.yaml and delete all the other "
#~ "configmaps that are not in the file.\n"
#~ "\t\tkubectl apply --prune -f manifest.yaml --all --prune-whitelist=core/"
#~ "\t\tkubectl apply --prune -f manifest.yaml --all --prune-allowlist=core/"
#~ "v1/ConfigMap"
#~ msgstr ""
#~ "\n"
@@ -754,7 +754,7 @@ msgstr "kubectl kontrolliert den Kubernetes-Cluster-Manager"
#~ "\n"
#~ "\t\t# Wende die Konfiguration im manifest.yaml an und lösche alle "
#~ "ConfigMaps, die nicht in der Datei sind.\n"
#~ "\t\tkubectl apply --prune -f manifest.yaml --all --prune-whitelist=core/"
#~ "\t\tkubectl apply --prune -f manifest.yaml --all --prune-allowlist=core/"
#~ "v1/ConfigMap"
#, c-format

View File

@@ -260,7 +260,7 @@ msgid ""
"\n"
"\t\t# Apply the configuration in manifest.yaml and delete all the other "
"config maps that are not in the file\n"
"\t\tkubectl apply --prune -f manifest.yaml --all --prune-whitelist=core/v1/"
"\t\tkubectl apply --prune -f manifest.yaml --all --prune-allowlist=core/v1/"
"ConfigMap"
msgstr ""
"\n"
@@ -282,7 +282,7 @@ msgstr ""
"\n"
"\t\t# Apply the configuration in manifest.yaml and delete all the other "
"config maps that are not in the file\n"
"\t\tkubectl apply --prune -f manifest.yaml --all --prune-whitelist=core/v1/"
"\t\tkubectl apply --prune -f manifest.yaml --all --prune-allowlist=core/v1/"
"ConfigMap"
#: staging/src/k8s.io/kubectl/pkg/cmd/autoscale/autoscale.go:48

View File

@@ -260,7 +260,7 @@ msgid ""
"\n"
"\t\t# Apply the configuration in manifest.yaml and delete all the other "
"config maps that are not in the file\n"
"\t\tkubectl apply --prune -f manifest.yaml --all --prune-whitelist=core/v1/"
"\t\tkubectl apply --prune -f manifest.yaml --all --prune-allowlist=core/v1/"
"ConfigMap"
msgstr ""
"\n"
@@ -282,7 +282,7 @@ msgstr ""
"\n"
"\t\t# Apply the configuration in manifest.yaml and delete all the other "
"config maps that are not in the file\n"
"\t\tkubectl apply --prune -f manifest.yaml --all --prune-whitelist=core/v1/"
"\t\tkubectl apply --prune -f manifest.yaml --all --prune-allowlist=core/v1/"
"ConfigMap"
#: staging/src/k8s.io/kubectl/pkg/cmd/autoscale/autoscale.go:48

View File

@@ -815,7 +815,7 @@ msgstr "Kubectl controlla il gestore cluster di Kubernetes"
#~ "\n"
#~ "\t\t# Apply the configuration in manifest.yaml and delete all the other "
#~ "configmaps that are not in the file.\n"
#~ "\t\tkubectl apply --prune -f manifest.yaml --all --prune-whitelist=core/"
#~ "\t\tkubectl apply --prune -f manifest.yaml --all --prune-allowlist=core/"
#~ "v1/ConfigMap"
#~ msgstr ""
#~ "\n"
@@ -833,7 +833,7 @@ msgstr "Kubectl controlla il gestore cluster di Kubernetes"
#~ "\n"
#~ "\t\t# Applica la configurazione manifest.yaml ed elimina tutti gli altri "
#~ "configmaps non presenti nel file.\n"
#~ "\t\tkubectl apply --prune -f manifest.yaml --all --prune-whitelist=core/"
#~ "\t\tkubectl apply --prune -f manifest.yaml --all --prune-allowlist=core/"
#~ "v1/ConfigMap"
#, c-format

View File

@@ -432,7 +432,7 @@ msgstr "Create a service account with the specified name"
# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/config/delete_cluster.go#L38
#: staging/src/k8s.io/kubectl/pkg/cmd/config/delete_cluster.go:42
msgid "Delete the specified cluster from the kubeconfig"
msgstr "指定したコンテキストをkubeconfigから削除する"
msgstr "指定したクラスターをkubeconfigから削除する"
# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/config/delete_context.go#L38
#: staging/src/k8s.io/kubectl/pkg/cmd/config/delete_context.go:42
@@ -891,7 +891,7 @@ msgstr "kubectl controls the Kubernetes cluster manager"
#~ "\n"
#~ "\t\t# Apply the configuration in manifest.yaml and delete all the other "
#~ "configmaps that are not in the file.\n"
#~ "\t\tkubectl apply --prune -f manifest.yaml --all --prune-whitelist=core/"
#~ "\t\tkubectl apply --prune -f manifest.yaml --all --prune-allowlist=core/"
#~ "v1/ConfigMap"
#~ msgstr ""
#~ "\n"
@@ -909,7 +909,7 @@ msgstr "kubectl controls the Kubernetes cluster manager"
#~ "\n"
#~ "\t\t# Apply the configuration in manifest.yaml and delete all the other "
#~ "configmaps that are not in the file.\n"
#~ "\t\tkubectl apply --prune -f manifest.yaml --all --prune-whitelist=core/"
#~ "\t\tkubectl apply --prune -f manifest.yaml --all --prune-allowlist=core/"
#~ "v1/ConfigMap"
#, c-format

View File

@@ -814,7 +814,7 @@ msgstr "kubectl controla o gerenciador de cluster do Kubernetes"
#~ "\n"
#~ "\t\t# Apply the configuration in manifest.yaml and delete all the other "
#~ "configmaps that are not in the file.\n"
#~ "\t\tkubectl apply --prune -f manifest.yaml --all --prune-whitelist=core/"
#~ "\t\tkubectl apply --prune -f manifest.yaml --all --prune-allowlist=core/"
#~ "v1/ConfigMap"
#~ msgstr ""
#~ "\n"
@@ -832,7 +832,7 @@ msgstr "kubectl controla o gerenciador de cluster do Kubernetes"
#~ "\n"
#~ "\t\t# Aplica a configuração do manifest.yaml e remove todos os outros "
#~ "configmaps que não estão no arquivo.\n"
#~ "\t\tkubectl apply —prune -f manifest.yaml —all —prune-whitelist=core/v1/"
#~ "\t\tkubectl apply —prune -f manifest.yaml —all —prune-allowlist=core/v1/"
#~ "ConfigMap"
#, c-format

View File

@@ -854,7 +854,7 @@ msgstr "kubectl 控制 Kubernetes 集群管理器"
#~ "\n"
#~ "\t\t# Apply the configuration in manifest.yaml and delete all the other "
#~ "configmaps that are not in the file.\n"
#~ "\t\tkubectl apply --prune -f manifest.yaml --all --prune-whitelist=core/v1/"
#~ "\t\tkubectl apply --prune -f manifest.yaml --all --prune-allowlist=core/v1/"
#~ "ConfigMap"
#~ msgstr ""
#~ "\n"
@@ -870,7 +870,7 @@ msgstr "kubectl 控制 Kubernetes 集群管理器"
#~ "\t\tkubectl apply --prune -f manifest.yaml -l app=nginx\n"
#~ "\n"
#~ "\t\t# 应用 manifest.yaml 的配置并删除所有不在这个文件中的 ConfigMaps。\n"
#~ "\t\tkubectl apply --prune -f manifest.yaml --all --prune-whitelist=core/v1/"
#~ "\t\tkubectl apply --prune -f manifest.yaml --all --prune-allowlist=core/v1/"
#~ "ConfigMap"
#, c-format

View File

@@ -18,4 +18,4 @@ limitations under the License.
// from a Kubernetes server and then indexing the type definitions.
// The openapi spec contains the object model definitions and extensions metadata
// such as the patchStrategy and patchMergeKey for creating patches.
package openapi // k8s.io/kubectl/pkg/util/openapi
package openapi // import "k8s.io/kubectl/pkg/util/openapi"