Skip to content

Commit 351537a

Browse files
committed
Revert "add conflictsWith to provider schema (#2084)"
This reverts commit 550f2c1.
1 parent 00bdbcd commit 351537a

File tree

2 files changed

+28
-42
lines changed

2 files changed

+28
-42
lines changed

.changelog/2084.txt

Lines changed: 0 additions & 3 deletions
This file was deleted.

kubernetes/provider.go

Lines changed: 28 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -40,57 +40,46 @@ func Provider() *schema.Provider {
4040
p := &schema.Provider{
4141
Schema: map[string]*schema.Schema{
4242
"host": {
43-
Type: schema.TypeString,
44-
Optional: true,
45-
DefaultFunc: schema.EnvDefaultFunc("KUBE_HOST", nil),
46-
Description: "The hostname (in form of URI) of Kubernetes master.",
47-
ConflictsWith: []string{"config_path", "config_paths"},
43+
Type: schema.TypeString,
44+
Optional: true,
45+
DefaultFunc: schema.EnvDefaultFunc("KUBE_HOST", ""),
46+
Description: "The hostname (in form of URI) of Kubernetes master.",
4847
},
4948
"username": {
50-
Type: schema.TypeString,
51-
Optional: true,
52-
DefaultFunc: schema.EnvDefaultFunc("KUBE_USER", nil),
53-
Description: "The username to use for HTTP basic authentication when accessing the Kubernetes master endpoint.",
54-
ConflictsWith: []string{"config_path", "config_paths", "exec", "token", "client_certificate", "client_key"},
55-
RequiredWith: []string{"password", "host"},
49+
Type: schema.TypeString,
50+
Optional: true,
51+
DefaultFunc: schema.EnvDefaultFunc("KUBE_USER", ""),
52+
Description: "The username to use for HTTP basic authentication when accessing the Kubernetes master endpoint.",
5653
},
5754
"password": {
58-
Type: schema.TypeString,
59-
Optional: true,
60-
DefaultFunc: schema.EnvDefaultFunc("KUBE_PASSWORD", nil),
61-
Description: "The password to use for HTTP basic authentication when accessing the Kubernetes master endpoint.",
62-
ConflictsWith: []string{"config_path", "config_paths", "exec", "token", "client_certificate", "client_key"},
63-
RequiredWith: []string{"username", "host"},
55+
Type: schema.TypeString,
56+
Optional: true,
57+
DefaultFunc: schema.EnvDefaultFunc("KUBE_PASSWORD", ""),
58+
Description: "The password to use for HTTP basic authentication when accessing the Kubernetes master endpoint.",
6459
},
6560
"insecure": {
66-
Type: schema.TypeBool,
67-
Optional: true,
68-
DefaultFunc: schema.EnvDefaultFunc("KUBE_INSECURE", nil),
69-
Description: "Whether server should be accessed without verifying the TLS certificate.",
70-
ConflictsWith: []string{"cluster_ca_certificate"},
61+
Type: schema.TypeBool,
62+
Optional: true,
63+
DefaultFunc: schema.EnvDefaultFunc("KUBE_INSECURE", false),
64+
Description: "Whether server should be accessed without verifying the TLS certificate.",
7165
},
7266
"client_certificate": {
73-
Type: schema.TypeString,
74-
Optional: true,
75-
DefaultFunc: schema.EnvDefaultFunc("KUBE_CLIENT_CERT_DATA", nil),
76-
Description: "PEM-encoded client certificate for TLS authentication.",
77-
ConflictsWith: []string{"config_path", "config_paths", "username", "password"},
78-
RequiredWith: []string{"client_key"},
67+
Type: schema.TypeString,
68+
Optional: true,
69+
DefaultFunc: schema.EnvDefaultFunc("KUBE_CLIENT_CERT_DATA", ""),
70+
Description: "PEM-encoded client certificate for TLS authentication.",
7971
},
8072
"client_key": {
81-
Type: schema.TypeString,
82-
Optional: true,
83-
DefaultFunc: schema.EnvDefaultFunc("KUBE_CLIENT_KEY_DATA", nil),
84-
Description: "PEM-encoded client certificate key for TLS authentication.",
85-
ConflictsWith: []string{"config_path", "config_paths", "username", "password", "exec"},
86-
RequiredWith: []string{"client_certificate"},
73+
Type: schema.TypeString,
74+
Optional: true,
75+
DefaultFunc: schema.EnvDefaultFunc("KUBE_CLIENT_KEY_DATA", ""),
76+
Description: "PEM-encoded client certificate key for TLS authentication.",
8777
},
8878
"cluster_ca_certificate": {
89-
Type: schema.TypeString,
90-
Optional: true,
91-
DefaultFunc: schema.EnvDefaultFunc("KUBE_CLUSTER_CA_CERT_DATA", nil),
92-
Description: "PEM-encoded root certificates bundle for TLS authentication.",
93-
ConflictsWith: []string{"insecure"},
79+
Type: schema.TypeString,
80+
Optional: true,
81+
DefaultFunc: schema.EnvDefaultFunc("KUBE_CLUSTER_CA_CERT_DATA", ""),
82+
Description: "PEM-encoded root certificates bundle for TLS authentication.",
9483
},
9584
"config_paths": {
9685
Type: schema.TypeList,

0 commit comments

Comments
 (0)