@@ -41,15 +41,6 @@ const (
41
41
42
42
envQuayToken = "QUAY_TOKEN" // #nosec G101
43
43
44
- envSelfhostedPrefix = "SELFHOSTED"
45
- envSelfhostedUsername = "USERNAME"
46
- envSelfhostedPassword = "PASSWORD"
47
- envSelfhostedHost = "HOST"
48
- envSelfhostedBearer = "TOKEN" // #nosec G101
49
- envSelfhostedTokenPath = "TOKEN_PATH"
50
- envSelfhostedInsecure = "INSECURE"
51
- envSelfhostedCAPath = "CA_PATH"
52
-
53
44
// Used for kubernetes Credential Discovery
54
45
envKeychainServiceAccountName = "AUTH_SERVICE_ACCOUNT_NAME"
55
46
envKeychainNamespace = "AUTH_SERVICE_ACCOUNT_NAMESPACE"
@@ -59,16 +50,6 @@ const (
59
50
envKeychainRefreshDuration = "AUTH_REFRESH_DURATION"
60
51
)
61
52
62
- var (
63
- selfhostedHostReg = regexp .MustCompile ("^VERSION_CHECKER_SELFHOSTED_HOST_(.*)" )
64
- selfhostedUsernameReg = regexp .MustCompile ("^VERSION_CHECKER_SELFHOSTED_USERNAME_(.*)" )
65
- selfhostedPasswordReg = regexp .MustCompile ("^VERSION_CHECKER_SELFHOSTED_PASSWORD_(.*)" )
66
- selfhostedTokenPath = regexp .MustCompile ("^VERSION_CHECKER_SELFHOSTED_TOKEN_PATH_(.*)" )
67
- selfhostedTokenReg = regexp .MustCompile ("^VERSION_CHECKER_SELFHOSTED_TOKEN_(.*)" )
68
- selfhostedCAPath = regexp .MustCompile ("^VERSION_CHECKER_SELFHOSTED_CA_PATH_(.*)" )
69
- selfhostedInsecureReg = regexp .MustCompile ("^VERSION_CHECKER_SELFHOSTED_INSECURE_(.*)" )
70
- )
71
-
72
53
// Options is a struct to hold options for the version-checker.
73
54
type Options struct {
74
55
MetricsServingAddress string
@@ -84,8 +65,7 @@ type Options struct {
84
65
85
66
kubeConfigFlags * genericclioptions.ConfigFlags
86
67
87
- selfhosted selfhosted.Options
88
- Client client.Options
68
+ Client client.Options
89
69
}
90
70
91
71
type envMatcher struct {
@@ -358,6 +338,7 @@ func (o *Options) addAuthFlags(fs *pflag.FlagSet) {
358
338
"THIS IS NOT RECOMMENDED AND IS INTENDED FOR DEBUGGING (%s_%s_%s)" ,
359
339
envPrefix , envSelfhostedPrefix , envSelfhostedInsecure ,
360
340
))
341
+ fs .MarkDeprecated ("selfhosted-insecure" , "No longer supported, you MUST provide the CA Chain." )
361
342
}
362
343
363
344
func (o * Options ) complete () error {
0 commit comments