Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GCP: Remove the deprecated google-json-key support #69354

Merged
merged 1 commit into from
Oct 13, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion cmd/genkubedocs/gen_kube_docs.go
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ func main() {
case "kubeadm":
// resets global flags created by kubelet or other commands e.g.
// --azure-container-registry-config from pkg/credentialprovider/azure
// --google-json-key from pkg/credentialprovider/gcp
// --version pkg/version/verflag
pflag.CommandLine = pflag.NewFlagSet(os.Args[0], pflag.ExitOnError)

Expand Down
1 change: 0 additions & 1 deletion cmd/kubeadm/app/kubeadm.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ func Run() error {
// We do not want these flags to show up in --help
// These MarkHidden calls must be after the lines above
pflag.CommandLine.MarkHidden("version")
pflag.CommandLine.MarkHidden("google-json-key")
pflag.CommandLine.MarkHidden("log-flush-frequency")
pflag.CommandLine.MarkHidden("alsologtostderr")
pflag.CommandLine.MarkHidden("log-backtrace-at")
Expand Down
3 changes: 0 additions & 3 deletions cmd/kubelet/app/options/globalflags.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,6 @@ func addCredentialProviderFlags(fs *pflag.FlagSet) {
global := pflag.CommandLine
local := pflag.NewFlagSet(os.Args[0], pflag.ExitOnError)

// Note this is deprecated in the library that provides it, so we just allow that deprecation
// notice to pass through our registration here.
pflagRegister(global, local, "google-json-key")
// TODO(#58034): This is not a static file, so it's not quite as straightforward as --google-json-key.
// We need to figure out how ACR users can dynamically provide pull credentials before we can deprecate this.
pflagRegister(global, local, "azure-container-registry-config")
Expand Down
10 changes: 1 addition & 9 deletions pkg/credentialprovider/gcp/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -10,27 +10,19 @@ go_library(
name = "go_default_library",
srcs = [
"doc.go",
"jwt.go",
"metadata.go",
],
importpath = "k8s.io/kubernetes/pkg/credentialprovider/gcp",
deps = [
"//pkg/credentialprovider:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/net:go_default_library",
"//vendor/github.com/golang/glog:go_default_library",
"//vendor/github.com/spf13/pflag:go_default_library",
"//vendor/golang.org/x/oauth2:go_default_library",
"//vendor/golang.org/x/oauth2/google:go_default_library",
"//vendor/golang.org/x/oauth2/jwt:go_default_library",
],
)

go_test(
name = "go_default_test",
srcs = [
"jwt_test.go",
"metadata_test.go",
],
srcs = ["metadata_test.go"],
embed = [":go_default_library"],
deps = [
"//pkg/credentialprovider:go_default_library",
Expand Down
120 changes: 0 additions & 120 deletions pkg/credentialprovider/gcp/jwt.go

This file was deleted.

127 changes: 0 additions & 127 deletions pkg/credentialprovider/gcp/jwt_test.go

This file was deleted.