Skip to content

Commit 4a83a57

Browse files
turkenhturkenh
committed
Remove in-tree Vault implementation
Signed-off-by: Hasan Turken <[email protected]>
1 parent 3a49b12 commit 4a83a57

File tree

14 files changed

+0
-3024
lines changed

14 files changed

+0
-3024
lines changed

‎apis/common/v1/connection_details.go‎

Lines changed: 0 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,6 @@ const (
9393
// Secrets.
9494
SecretStoreKubernetes SecretStoreType = "Kubernetes"
9595

96-
// SecretStoreVault indicates that secret store type is Vault.
97-
SecretStoreVault SecretStoreType = "Vault"
98-
9996
// SecretStorePlugin indicates that secret store type is Plugin and will be used with external secret stores.
10097
SecretStorePlugin SecretStoreType = "Plugin"
10198
)
@@ -122,13 +119,6 @@ type SecretStoreConfig struct {
122119
// +optional
123120
Kubernetes *KubernetesSecretStoreConfig `json:"kubernetes,omitempty"`
124121

125-
// Vault configures a Vault secret store.
126-
// Deprecated: This API is scheduled to be removed in a future release.
127-
// Vault should be used as a plugin going forward. See
128-
// https://github.com/crossplane-contrib/ess-plugin-vault for more information.
129-
// +optional
130-
Vault *VaultSecretStoreConfig `json:"vault,omitempty"`
131-
132122
// Plugin configures External secret store as a plugin.
133123
// +optional
134124
Plugin *PluginStoreConfig `json:"plugin,omitempty"`
@@ -173,83 +163,3 @@ type KubernetesSecretStoreConfig struct {
173163
// TODO(turkenh): Support additional identities like
174164
// https://github.com/crossplane-contrib/provider-kubernetes/blob/4d722ef914e6964e80e190317daca9872ae98738/apis/v1alpha1/types.go#L34
175165
}
176-
177-
// VaultAuthMethod represent a Vault authentication method.
178-
// https://www.vaultproject.io/docs/auth
179-
type VaultAuthMethod string
180-
181-
const (
182-
// VaultAuthToken indicates that "Token Auth" will be used to
183-
// authenticate to Vault.
184-
// https://www.vaultproject.io/docs/auth/token
185-
VaultAuthToken VaultAuthMethod = "Token"
186-
)
187-
188-
// VaultAuthTokenConfig represents configuration for Vault Token Auth Method.
189-
// https://www.vaultproject.io/docs/auth/token
190-
type VaultAuthTokenConfig struct {
191-
// Source of the credentials.
192-
// +kubebuilder:validation:Enum=None;Secret;Environment;Filesystem
193-
Source CredentialsSource `json:"source"`
194-
195-
// CommonCredentialSelectors provides common selectors for extracting
196-
// credentials.
197-
CommonCredentialSelectors `json:",inline"`
198-
}
199-
200-
// VaultAuthConfig required to authenticate to a Vault API.
201-
type VaultAuthConfig struct {
202-
// Method configures which auth method will be used.
203-
Method VaultAuthMethod `json:"method"`
204-
// Token configures Token Auth for Vault.
205-
// +optional
206-
Token *VaultAuthTokenConfig `json:"token,omitempty"`
207-
}
208-
209-
// VaultCABundleConfig represents configuration for configuring a CA bundle.
210-
type VaultCABundleConfig struct {
211-
// Source of the credentials.
212-
// +kubebuilder:validation:Enum=None;Secret;Environment;Filesystem
213-
Source CredentialsSource `json:"source"`
214-
215-
// CommonCredentialSelectors provides common selectors for extracting
216-
// credentials.
217-
CommonCredentialSelectors `json:",inline"`
218-
}
219-
220-
// VaultKVVersion represent API version of the Vault KV engine
221-
// https://www.vaultproject.io/docs/secrets/kv
222-
type VaultKVVersion string
223-
224-
const (
225-
// VaultKVVersionV1 indicates that Secret API is KV Secrets Engine Version 1
226-
// https://www.vaultproject.io/docs/secrets/kv/kv-v1
227-
VaultKVVersionV1 VaultKVVersion = "v1"
228-
229-
// VaultKVVersionV2 indicates that Secret API is KV Secrets Engine Version 2
230-
// https://www.vaultproject.io/docs/secrets/kv/kv-v2
231-
VaultKVVersionV2 VaultKVVersion = "v2"
232-
)
233-
234-
// VaultSecretStoreConfig represents the required configuration for a Vault
235-
// secret store.
236-
type VaultSecretStoreConfig struct {
237-
// Server is the url of the Vault server, e.g. "https://vault.acme.org"
238-
Server string `json:"server"`
239-
240-
// MountPath is the mount path of the KV secrets engine.
241-
MountPath string `json:"mountPath"`
242-
243-
// Version of the KV Secrets engine of Vault.
244-
// https://www.vaultproject.io/docs/secrets/kv
245-
// +optional
246-
// +kubebuilder:default=v2
247-
Version *VaultKVVersion `json:"version,omitempty"`
248-
249-
// CABundle configures CA bundle for Vault Server.
250-
// +optional
251-
CABundle *VaultCABundleConfig `json:"caBundle,omitempty"`
252-
253-
// Auth configures an authentication method for Vault.
254-
Auth VaultAuthConfig `json:"auth"`
255-
}

‎apis/common/v1/zz_generated.deepcopy.go‎

Lines changed: 0 additions & 83 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎go.mod‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ require (
77
github.com/bufbuild/buf v1.25.1
88
github.com/go-logr/logr v1.2.4
99
github.com/google/go-cmp v0.5.9
10-
github.com/hashicorp/vault/api v1.9.2
1110
github.com/spf13/afero v1.9.5
1211
golang.org/x/time v0.3.0
1312
google.golang.org/grpc v1.57.0
@@ -29,7 +28,6 @@ require (
2928
github.com/bufbuild/connect-go v1.9.0 // indirect
3029
github.com/bufbuild/connect-opentelemetry-go v0.4.0 // indirect
3130
github.com/bufbuild/protocompile v0.6.0 // indirect
32-
github.com/cenkalti/backoff/v3 v3.0.0 // indirect
3331
github.com/cespare/xxhash/v2 v2.2.0 // indirect
3432
github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect
3533
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
@@ -46,7 +44,6 @@ require (
4644
github.com/felixge/fgprof v0.9.3 // indirect
4745
github.com/fsnotify/fsnotify v1.6.0 // indirect
4846
github.com/go-chi/chi/v5 v5.0.10 // indirect
49-
github.com/go-jose/go-jose/v3 v3.0.0 // indirect
5047
github.com/go-logr/stdr v1.2.2 // indirect
5148
github.com/go-openapi/jsonpointer v0.19.6 // indirect
5249
github.com/go-openapi/jsonreference v0.20.2 // indirect
@@ -61,15 +58,6 @@ require (
6158
github.com/google/gofuzz v1.2.0 // indirect
6259
github.com/google/pprof v0.0.0-20230705174524-200ffdc848b8 // indirect
6360
github.com/google/uuid v1.3.0 // indirect
64-
github.com/hashicorp/errwrap v1.1.0 // indirect
65-
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
66-
github.com/hashicorp/go-multierror v1.1.1 // indirect
67-
github.com/hashicorp/go-retryablehttp v0.7.1 // indirect
68-
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
69-
github.com/hashicorp/go-secure-stdlib/parseutil v0.1.6 // indirect
70-
github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
71-
github.com/hashicorp/go-sockaddr v1.0.2 // indirect
72-
github.com/hashicorp/hcl v1.0.0 // indirect
7361
github.com/imdario/mergo v0.3.16 // indirect
7462
github.com/inconshreveable/mousetrap v1.1.0 // indirect
7563
github.com/jdxcode/netrc v0.0.0-20221124155335-4616370d1a84 // indirect
@@ -82,7 +70,6 @@ require (
8270
github.com/mattn/go-isatty v0.0.17 // indirect
8371
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
8472
github.com/mitchellh/go-homedir v1.1.0 // indirect
85-
github.com/mitchellh/mapstructure v1.5.0 // indirect
8673
github.com/moby/term v0.5.0 // indirect
8774
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
8875
github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -99,7 +86,6 @@ require (
9986
github.com/prometheus/procfs v0.10.0 // indirect
10087
github.com/rs/cors v1.9.0 // indirect
10188
github.com/russross/blackfriday/v2 v2.1.0 // indirect
102-
github.com/ryanuber/go-glob v1.0.0 // indirect
10389
github.com/sirupsen/logrus v1.9.3 // indirect
10490
github.com/spf13/cobra v1.7.0 // indirect
10591
github.com/spf13/pflag v1.0.5 // indirect

0 commit comments

Comments
 (0)