Skip to content

Commit

Permalink
Merge pull request crossplane#4503 from turkenh/bump-runtime-no-vault
Browse files Browse the repository at this point in the history 
Consume latest runtime without in tree Vault
  • Loading branch information
@turkenh
turkenh authored Aug 17, 2023
2 parents 3e8be64 + f9b6c8b commit a36b591
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 235 deletions.
140 changes: 0 additions & 140 deletions cluster/crds/secrets.crossplane.io_storeconfigs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,146 +151,6 @@ spec:
- Vault
- Plugin
type: string
vault:
description: 'Vault configures a Vault secret store. Deprecated: This
API is scheduled to be removed in a future release. Vault should
be used as a plugin going forward. See https://github.com/crossplane-contrib/ess-plugin-vault
for more information.'
properties:
auth:
description: Auth configures an authentication method for Vault.
properties:
method:
description: Method configures which auth method will be used.
type: string
token:
description: Token configures Token Auth for Vault.
properties:
env:
description: Env is a reference to an environment variable
that contains credentials that must be used to connect
to the provider.
properties:
name:
description: Name is the name of an environment variable.
type: string
required:
- name
type: object
fs:
description: Fs is a reference to a filesystem location
that contains credentials that must be used to connect
to the provider.
properties:
path:
description: Path is a filesystem path.
type: string
required:
- path
type: object
secretRef:
description: A SecretRef is a reference to a secret key
that contains the credentials that must be used to connect
to the provider.
properties:
key:
description: The key to select.
type: string
name:
description: Name of the secret.
type: string
namespace:
description: Namespace of the secret.
type: string
required:
- key
- name
- namespace
type: object
source:
description: Source of the credentials.
enum:
- None
- Secret
- Environment
- Filesystem
type: string
required:
- source
type: object
required:
- method
type: object
caBundle:
description: CABundle configures CA bundle for Vault Server.
properties:
env:
description: Env is a reference to an environment variable
that contains credentials that must be used to connect to
the provider.
properties:
name:
description: Name is the name of an environment variable.
type: string
required:
- name
type: object
fs:
description: Fs is a reference to a filesystem location that
contains credentials that must be used to connect to the
provider.
properties:
path:
description: Path is a filesystem path.
type: string
required:
- path
type: object
secretRef:
description: A SecretRef is a reference to a secret key that
contains the credentials that must be used to connect to
the provider.
properties:
key:
description: The key to select.
type: string
name:
description: Name of the secret.
type: string
namespace:
description: Namespace of the secret.
type: string
required:
- key
- name
- namespace
type: object
source:
description: Source of the credentials.
enum:
- None
- Secret
- Environment
- Filesystem
type: string
required:
- source
type: object
mountPath:
description: MountPath is the mount path of the KV secrets engine.
type: string
server:
description: Server is the url of the Vault server, e.g. "https://vault.acme.org"
type: string
version:
default: v2
description: Version of the KV Secrets engine of Vault. https://www.vaultproject.io/docs/secrets/kv
type: string
required:
- auth
- mountPath
- server
type: object
required:
- defaultScope
type: object
Expand Down
31 changes: 8 additions & 23 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
github.com/Masterminds/semver v1.5.0
github.com/alecthomas/kong v0.8.0
github.com/bufbuild/buf v1.26.1
github.com/crossplane/crossplane-runtime v1.13.0
github.com/crossplane/crossplane-runtime v1.14.0-rc.0.0.20230815060607-4f3cb3d9fd2b
github.com/google/go-cmp v0.5.9
github.com/google/go-containerregistry v0.16.1
github.com/google/go-containerregistry/pkg/authn/k8schain v0.0.0-20230617045147-2472cbbbf289
Expand All @@ -20,13 +20,13 @@ require (
google.golang.org/grpc v1.57.0
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0
google.golang.org/protobuf v1.31.0
k8s.io/api v0.27.3
k8s.io/apiextensions-apiserver v0.27.3
k8s.io/apimachinery v0.27.3
k8s.io/client-go v0.27.3
k8s.io/code-generator v0.27.3
k8s.io/api v0.27.4
k8s.io/apiextensions-apiserver v0.27.4
k8s.io/apimachinery v0.27.4
k8s.io/client-go v0.27.4
k8s.io/code-generator v0.27.4
k8s.io/utils v0.0.0-20230505201702-9f6742963106
sigs.k8s.io/controller-runtime v0.15.0
sigs.k8s.io/controller-runtime v0.15.1
sigs.k8s.io/controller-tools v0.12.1
sigs.k8s.io/e2e-framework v0.2.1-0.20230716064705-49e8554b536f
sigs.k8s.io/kind v0.20.0
Expand Down Expand Up @@ -66,7 +66,6 @@ require (
github.com/bufbuild/connect-go v1.9.0 // indirect
github.com/bufbuild/connect-opentelemetry-go v0.4.0 // indirect
github.com/bufbuild/protocompile v0.6.0 // indirect
github.com/cenkalti/backoff/v3 v3.0.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/chrismellard/docker-credential-acr-env v0.0.0-20230304212654-82a0ddb27589 // indirect
github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect
Expand All @@ -88,7 +87,6 @@ require (
github.com/felixge/fgprof v0.9.3 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/go-chi/chi/v5 v5.0.10 // indirect
github.com/go-jose/go-jose/v3 v3.0.0 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-logr/zapr v1.2.4 // indirect
Expand All @@ -106,17 +104,6 @@ require (
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/pprof v0.0.0-20230705174524-200ffdc848b8 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-hclog v1.0.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/go-retryablehttp v0.7.1 // indirect
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
github.com/hashicorp/go-secure-stdlib/parseutil v0.1.6 // indirect
github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
github.com/hashicorp/go-sockaddr v1.0.2 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/hashicorp/vault/api v1.9.2 // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jdxcode/netrc v0.0.0-20221124155335-4616370d1a84 // indirect
Expand All @@ -130,7 +117,6 @@ require (
github.com/mattn/go-isatty v0.0.17 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/moby/spdystream v0.2.0 // indirect
github.com/moby/term v0.5.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
Expand All @@ -147,7 +133,6 @@ require (
github.com/prometheus/procfs v0.10.0 // indirect
github.com/rs/cors v1.9.0 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/ryanuber/go-glob v1.0.0 // indirect
github.com/spf13/cobra v1.7.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/tetratelabs/wazero v1.3.1 // indirect
Expand Down Expand Up @@ -175,7 +160,7 @@ require (
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/component-base v0.27.3 // indirect
k8s.io/component-base v0.27.4 // indirect
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
k8s.io/klog/v2 v2.100.1
k8s.io/kube-openapi v0.0.0-20230525220651-2546d827e515 // indirect
Expand Down
Loading

0 comments on commit a36b591

Please sign in to comment.