From 7f5e8fa9ce014cd0d7d22ca6bd452df8cc03588e Mon Sep 17 00:00:00 2001 From: Gabi Davar Date: Wed, 25 Sep 2024 10:45:07 +0300 Subject: [PATCH] Make CRD categories useful (#3929) * Make CRD categories useful * one category for all ES objects. * one only for generators * add missing controller label on CRDs * fix UUID description (was referring to password) Signed-off-by: Gabi Davar * missing update Signed-off-by: Gabi Davar --------- Signed-off-by: Gabi Davar --- .../v1alpha1/externalsecret_types.go | 2 +- .../v1alpha1/pushsecret_types.go | 3 +- .../v1alpha1/secretstore_types.go | 4 +- .../v1beta1/clusterexternalsecret_types.go | 2 +- .../v1beta1/externalsecret_types.go | 2 +- .../v1beta1/secretstore_types.go | 4 +- apis/generators/v1alpha1/generator_acr.go | 2 +- apis/generators/v1alpha1/generator_ecr.go | 2 +- apis/generators/v1alpha1/generator_fake.go | 2 +- apis/generators/v1alpha1/generator_gcr.go | 2 +- apis/generators/v1alpha1/generator_github.go | 2 +- .../generators/v1alpha1/generator_password.go | 2 +- apis/generators/v1alpha1/generator_uuid.go | 7 ++- apis/generators/v1alpha1/generator_vault.go | 2 +- apis/generators/v1alpha1/generator_webhook.go | 2 +- ...nal-secrets.io_clusterexternalsecrets.yaml | 2 +- ...ternal-secrets.io_clustersecretstores.yaml | 2 +- .../external-secrets.io_externalsecrets.yaml | 2 +- .../external-secrets.io_pushsecrets.yaml | 4 +- .../external-secrets.io_secretstores.yaml | 2 +- ...s.external-secrets.io_acraccesstokens.yaml | 3 +- ...nal-secrets.io_ecrauthorizationtokens.yaml | 3 +- .../generators.external-secrets.io_fakes.yaml | 3 +- ...s.external-secrets.io_gcraccesstokens.yaml | 3 +- ...xternal-secrets.io_githubaccesstokens.yaml | 3 +- ...erators.external-secrets.io_passwords.yaml | 3 +- .../generators.external-secrets.io_uuids.yaml | 10 ++-- ...ternal-secrets.io_vaultdynamicsecrets.yaml | 3 +- ...nerators.external-secrets.io_webhooks.yaml | 3 +- .../tests/__snapshot__/crds_test.yaml.snap | 43 ++++++++++++++++- deploy/crds/bundle.yaml | 46 +++++++++++-------- 31 files changed, 117 insertions(+), 58 deletions(-) diff --git a/apis/externalsecrets/v1alpha1/externalsecret_types.go b/apis/externalsecrets/v1alpha1/externalsecret_types.go index b277741d1..b6979619f 100644 --- a/apis/externalsecrets/v1alpha1/externalsecret_types.go +++ b/apis/externalsecrets/v1alpha1/externalsecret_types.go @@ -235,7 +235,7 @@ type ExternalSecretStatus struct { // ExternalSecret is the Schema for the external-secrets API. // +kubebuilder:subresource:status // +kubebuilder:deprecatedversion -// +kubebuilder:resource:scope=Namespaced,categories={externalsecrets},shortName=es +// +kubebuilder:resource:scope=Namespaced,categories={external-secrets},shortName=es // +kubebuilder:printcolumn:name="Store",type=string,JSONPath=`.spec.secretStoreRef.name` // +kubebuilder:printcolumn:name="Refresh Interval",type=string,JSONPath=`.spec.refreshInterval` // +kubebuilder:printcolumn:name="Status",type=string,JSONPath=`.status.conditions[?(@.type=="Ready")].reason` diff --git a/apis/externalsecrets/v1alpha1/pushsecret_types.go b/apis/externalsecrets/v1alpha1/pushsecret_types.go index 3fc221620..3f85a311c 100644 --- a/apis/externalsecrets/v1alpha1/pushsecret_types.go +++ b/apis/externalsecrets/v1alpha1/pushsecret_types.go @@ -198,7 +198,8 @@ type PushSecretStatus struct { // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp" // +kubebuilder:printcolumn:name="Status",type=string,JSONPath=`.status.conditions[?(@.type=="Ready")].reason` // +kubebuilder:subresource:status -// +kubebuilder:resource:scope=Namespaced,categories={pushsecrets} +// +kubebuilder:metadata:labels="external-secrets.io/component=controller" +// +kubebuilder:resource:scope=Namespaced,categories={external-secrets} type PushSecret struct { metav1.TypeMeta `json:",inline"` diff --git a/apis/externalsecrets/v1alpha1/secretstore_types.go b/apis/externalsecrets/v1alpha1/secretstore_types.go index d53944944..c04f2ea25 100644 --- a/apis/externalsecrets/v1alpha1/secretstore_types.go +++ b/apis/externalsecrets/v1alpha1/secretstore_types.go @@ -136,7 +136,7 @@ type SecretStoreStatus struct { // +kubebuilder:printcolumn:name="Status",type=string,JSONPath=`.status.conditions[?(@.type=="Ready")].reason` // +kubebuilder:subresource:status // +kubebuilder:deprecatedversion -// +kubebuilder:resource:scope=Namespaced,categories={externalsecrets},shortName=ss +// +kubebuilder:resource:scope=Namespaced,categories={external-secrets},shortName=ss type SecretStore struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` @@ -161,7 +161,7 @@ type SecretStoreList struct { // +kubebuilder:printcolumn:name="Status",type=string,JSONPath=`.status.conditions[?(@.type=="Ready")].reason` // +kubebuilder:deprecatedversion // +kubebuilder:subresource:status -// +kubebuilder:resource:scope=Cluster,categories={externalsecrets},shortName=css +// +kubebuilder:resource:scope=Cluster,categories={external-secrets},shortName=css type ClusterSecretStore struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` diff --git a/apis/externalsecrets/v1beta1/clusterexternalsecret_types.go b/apis/externalsecrets/v1beta1/clusterexternalsecret_types.go index 31a4207f1..81c962ff3 100644 --- a/apis/externalsecrets/v1beta1/clusterexternalsecret_types.go +++ b/apis/externalsecrets/v1beta1/clusterexternalsecret_types.go @@ -100,7 +100,7 @@ type ClusterExternalSecretStatus struct { // +kubebuilder:object:root=true // +kubebuilder:storageversion -// +kubebuilder:resource:scope=Cluster,categories={externalsecrets},shortName=ces +// +kubebuilder:resource:scope=Cluster,categories={external-secrets},shortName=ces // +kubebuilder:subresource:status // +kubebuilder:metadata:labels="external-secrets.io/component=controller" // +kubebuilder:printcolumn:name="Store",type=string,JSONPath=`.spec.externalSecretSpec.secretStoreRef.name` diff --git a/apis/externalsecrets/v1beta1/externalsecret_types.go b/apis/externalsecrets/v1beta1/externalsecret_types.go index 50e43941f..416c8a7da 100644 --- a/apis/externalsecrets/v1beta1/externalsecret_types.go +++ b/apis/externalsecrets/v1beta1/externalsecret_types.go @@ -454,7 +454,7 @@ type ExternalSecretStatus struct { // ExternalSecret is the Schema for the external-secrets API. // +kubebuilder:subresource:status // +kubebuilder:metadata:labels="external-secrets.io/component=controller" -// +kubebuilder:resource:scope=Namespaced,categories={externalsecrets},shortName=es +// +kubebuilder:resource:scope=Namespaced,categories={external-secrets},shortName=es // +kubebuilder:printcolumn:name="Store",type=string,JSONPath=`.spec.secretStoreRef.name` // +kubebuilder:printcolumn:name="Refresh Interval",type=string,JSONPath=`.spec.refreshInterval` // +kubebuilder:printcolumn:name="Status",type=string,JSONPath=`.status.conditions[?(@.type=="Ready")].reason` diff --git a/apis/externalsecrets/v1beta1/secretstore_types.go b/apis/externalsecrets/v1beta1/secretstore_types.go index c9fd73be7..eacb9a653 100644 --- a/apis/externalsecrets/v1beta1/secretstore_types.go +++ b/apis/externalsecrets/v1beta1/secretstore_types.go @@ -280,7 +280,7 @@ type SecretStoreStatus struct { // +kubebuilder:printcolumn:name="Ready",type=string,JSONPath=`.status.conditions[?(@.type=="Ready")].status` // +kubebuilder:subresource:status // +kubebuilder:metadata:labels="external-secrets.io/component=controller" -// +kubebuilder:resource:scope=Namespaced,categories={externalsecrets},shortName=ss +// +kubebuilder:resource:scope=Namespaced,categories={external-secrets},shortName=ss type SecretStore struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` @@ -308,7 +308,7 @@ type SecretStoreList struct { // +kubebuilder:printcolumn:name="Ready",type=string,JSONPath=`.status.conditions[?(@.type=="Ready")].status` // +kubebuilder:subresource:status // +kubebuilder:metadata:labels="external-secrets.io/component=controller" -// +kubebuilder:resource:scope=Cluster,categories={externalsecrets},shortName=css +// +kubebuilder:resource:scope=Cluster,categories={external-secrets},shortName=css type ClusterSecretStore struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` diff --git a/apis/generators/v1alpha1/generator_acr.go b/apis/generators/v1alpha1/generator_acr.go index 744992968..c1b19d368 100644 --- a/apis/generators/v1alpha1/generator_acr.go +++ b/apis/generators/v1alpha1/generator_acr.go @@ -105,7 +105,7 @@ type AzureACRServicePrincipalAuthSecretRef struct { // +kubebuilder:storageversion // +kubebuilder:subresource:status // +kubebuilder:metadata:labels="external-secrets.io/component=controller" -// +kubebuilder:resource:scope=Namespaced,categories={acraccesstoken},shortName=acraccesstoken +// +kubebuilder:resource:scope=Namespaced,categories={external-secrets, external-secrets-generators},shortName=acraccesstoken type ACRAccessToken struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` diff --git a/apis/generators/v1alpha1/generator_ecr.go b/apis/generators/v1alpha1/generator_ecr.go index 0d828594d..30e2fbe74 100644 --- a/apis/generators/v1alpha1/generator_ecr.go +++ b/apis/generators/v1alpha1/generator_ecr.go @@ -75,7 +75,7 @@ type AWSJWTAuth struct { // +kubebuilder:storageversion // +kubebuilder:subresource:status // +kubebuilder:metadata:labels="external-secrets.io/component=controller" -// +kubebuilder:resource:scope=Namespaced,categories={ecrauthorizationtoken},shortName=ecrauthorizationtoken +// +kubebuilder:resource:scope=Namespaced,categories={external-secrets, external-secrets-generators},shortName=ecrauthorizationtoken type ECRAuthorizationToken struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` diff --git a/apis/generators/v1alpha1/generator_fake.go b/apis/generators/v1alpha1/generator_fake.go index 0c0b060a8..d62bbd5f4 100644 --- a/apis/generators/v1alpha1/generator_fake.go +++ b/apis/generators/v1alpha1/generator_fake.go @@ -36,7 +36,7 @@ type FakeSpec struct { // +kubebuilder:storageversion // +kubebuilder:subresource:status // +kubebuilder:metadata:labels="external-secrets.io/component=controller" -// +kubebuilder:resource:scope=Namespaced,categories={fake},shortName=fake +// +kubebuilder:resource:scope=Namespaced,categories={external-secrets, external-secrets-generators},shortName=fake type Fake struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` diff --git a/apis/generators/v1alpha1/generator_gcr.go b/apis/generators/v1alpha1/generator_gcr.go index af4050379..08c675713 100644 --- a/apis/generators/v1alpha1/generator_gcr.go +++ b/apis/generators/v1alpha1/generator_gcr.go @@ -53,7 +53,7 @@ type GCPWorkloadIdentity struct { // +kubebuilder:storageversion // +kubebuilder:subresource:status // +kubebuilder:metadata:labels="external-secrets.io/component=controller" -// +kubebuilder:resource:scope=Namespaced,categories={gcraccesstoken},shortName=gcraccesstoken +// +kubebuilder:resource:scope=Namespaced,categories={external-secrets, external-secrets-generators},shortName=gcraccesstoken type GCRAccessToken struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` diff --git a/apis/generators/v1alpha1/generator_github.go b/apis/generators/v1alpha1/generator_github.go index 7737797e8..e8a35c326 100644 --- a/apis/generators/v1alpha1/generator_github.go +++ b/apis/generators/v1alpha1/generator_github.go @@ -42,7 +42,7 @@ type GithubSecretRef struct { // +kubebuilder:storageversion // +kubebuilder:subresource:status // +kubebuilder:metadata:labels="external-secrets.io/component=controller" -// +kubebuilder:resource:scope=Namespaced,categories={githubaccesstoken},shortName=githubaccesstoken +// +kubebuilder:resource:scope=Namespaced,categories={external-secrets, external-secrets-generators},shortName=githubaccesstoken type GithubAccessToken struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` diff --git a/apis/generators/v1alpha1/generator_password.go b/apis/generators/v1alpha1/generator_password.go index 717d0a117..1eff0be8c 100644 --- a/apis/generators/v1alpha1/generator_password.go +++ b/apis/generators/v1alpha1/generator_password.go @@ -53,7 +53,7 @@ type PasswordSpec struct { // +kubebuilder:storageversion // +kubebuilder:subresource:status // +kubebuilder:metadata:labels="external-secrets.io/component=controller" -// +kubebuilder:resource:scope=Namespaced,categories={password},shortName=password +// +kubebuilder:resource:scope=Namespaced,categories={external-secrets, external-secrets-generators},shortName=password type Password struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` diff --git a/apis/generators/v1alpha1/generator_uuid.go b/apis/generators/v1alpha1/generator_uuid.go index d9d5973cb..5059d84cb 100644 --- a/apis/generators/v1alpha1/generator_uuid.go +++ b/apis/generators/v1alpha1/generator_uuid.go @@ -21,13 +21,12 @@ import ( // UUIDSpec controls the behavior of the uuid generator. type UUIDSpec struct{} -// Password generates a random password based on the -// configuration parameters in spec. -// You can specify the length, characterset and other attributes. +// UUID generates a version 1 UUID (e56657e3-764f-11ef-a397-65231a88c216). // +kubebuilder:object:root=true // +kubebuilder:storageversion // +kubebuilder:subresource:status -// +kubebuilder:resource:scope=Namespaced,categories={password},shortName=uuids +// +kubebuilder:metadata:labels="external-secrets.io/component=controller" +// +kubebuilder:resource:scope=Namespaced,categories={external-secrets, external-secrets-generators},shortName=uuids type UUID struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` diff --git a/apis/generators/v1alpha1/generator_vault.go b/apis/generators/v1alpha1/generator_vault.go index 24bc599ae..220e94d39 100644 --- a/apis/generators/v1alpha1/generator_vault.go +++ b/apis/generators/v1alpha1/generator_vault.go @@ -60,7 +60,7 @@ const ( // +kubebuilder:storageversion // +kubebuilder:subresource:status // +kubebuilder:metadata:labels="external-secrets.io/component=controller" -// +kubebuilder:resource:scope=Namespaced,categories={vaultdynamicsecret},shortName=vaultdynamicsecret +// +kubebuilder:resource:scope=Namespaced,categories={external-secrets, external-secrets-generators},shortName=vaultdynamicsecret type VaultDynamicSecret struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` diff --git a/apis/generators/v1alpha1/generator_webhook.go b/apis/generators/v1alpha1/generator_webhook.go index 723711d20..dc52e8195 100644 --- a/apis/generators/v1alpha1/generator_webhook.go +++ b/apis/generators/v1alpha1/generator_webhook.go @@ -113,7 +113,7 @@ type SecretKeySelector struct { // +kubebuilder:storageversion // +kubebuilder:subresource:status // +kubebuilder:metadata:labels="external-secrets.io/component=controller" -// +kubebuilder:resource:scope=Namespaced,categories={webhook},shortName=webhookl +// +kubebuilder:resource:scope=Namespaced,categories={external-secrets, external-secrets-generators},shortName=webhookl type Webhook struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` diff --git a/config/crds/bases/external-secrets.io_clusterexternalsecrets.yaml b/config/crds/bases/external-secrets.io_clusterexternalsecrets.yaml index c38d5a747..8b94527f6 100644 --- a/config/crds/bases/external-secrets.io_clusterexternalsecrets.yaml +++ b/config/crds/bases/external-secrets.io_clusterexternalsecrets.yaml @@ -10,7 +10,7 @@ spec: group: external-secrets.io names: categories: - - externalsecrets + - external-secrets kind: ClusterExternalSecret listKind: ClusterExternalSecretList plural: clusterexternalsecrets diff --git a/config/crds/bases/external-secrets.io_clustersecretstores.yaml b/config/crds/bases/external-secrets.io_clustersecretstores.yaml index 724a772f1..a12ccbc16 100644 --- a/config/crds/bases/external-secrets.io_clustersecretstores.yaml +++ b/config/crds/bases/external-secrets.io_clustersecretstores.yaml @@ -10,7 +10,7 @@ spec: group: external-secrets.io names: categories: - - externalsecrets + - external-secrets kind: ClusterSecretStore listKind: ClusterSecretStoreList plural: clustersecretstores diff --git a/config/crds/bases/external-secrets.io_externalsecrets.yaml b/config/crds/bases/external-secrets.io_externalsecrets.yaml index ddb24969b..5b2212fad 100644 --- a/config/crds/bases/external-secrets.io_externalsecrets.yaml +++ b/config/crds/bases/external-secrets.io_externalsecrets.yaml @@ -10,7 +10,7 @@ spec: group: external-secrets.io names: categories: - - externalsecrets + - external-secrets kind: ExternalSecret listKind: ExternalSecretList plural: externalsecrets diff --git a/config/crds/bases/external-secrets.io_pushsecrets.yaml b/config/crds/bases/external-secrets.io_pushsecrets.yaml index 16494411c..0322bfae5 100644 --- a/config/crds/bases/external-secrets.io_pushsecrets.yaml +++ b/config/crds/bases/external-secrets.io_pushsecrets.yaml @@ -3,12 +3,14 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.3 + labels: + external-secrets.io/component: controller name: pushsecrets.external-secrets.io spec: group: external-secrets.io names: categories: - - pushsecrets + - external-secrets kind: PushSecret listKind: PushSecretList plural: pushsecrets diff --git a/config/crds/bases/external-secrets.io_secretstores.yaml b/config/crds/bases/external-secrets.io_secretstores.yaml index 5e6c873f9..41e2e55d8 100644 --- a/config/crds/bases/external-secrets.io_secretstores.yaml +++ b/config/crds/bases/external-secrets.io_secretstores.yaml @@ -10,7 +10,7 @@ spec: group: external-secrets.io names: categories: - - externalsecrets + - external-secrets kind: SecretStore listKind: SecretStoreList plural: secretstores diff --git a/config/crds/bases/generators.external-secrets.io_acraccesstokens.yaml b/config/crds/bases/generators.external-secrets.io_acraccesstokens.yaml index 9d6b4a98c..925aa1639 100644 --- a/config/crds/bases/generators.external-secrets.io_acraccesstokens.yaml +++ b/config/crds/bases/generators.external-secrets.io_acraccesstokens.yaml @@ -10,7 +10,8 @@ spec: group: generators.external-secrets.io names: categories: - - acraccesstoken + - external-secrets + - external-secrets-generators kind: ACRAccessToken listKind: ACRAccessTokenList plural: acraccesstokens diff --git a/config/crds/bases/generators.external-secrets.io_ecrauthorizationtokens.yaml b/config/crds/bases/generators.external-secrets.io_ecrauthorizationtokens.yaml index 7953bdcac..367d2adf6 100644 --- a/config/crds/bases/generators.external-secrets.io_ecrauthorizationtokens.yaml +++ b/config/crds/bases/generators.external-secrets.io_ecrauthorizationtokens.yaml @@ -10,7 +10,8 @@ spec: group: generators.external-secrets.io names: categories: - - ecrauthorizationtoken + - external-secrets + - external-secrets-generators kind: ECRAuthorizationToken listKind: ECRAuthorizationTokenList plural: ecrauthorizationtokens diff --git a/config/crds/bases/generators.external-secrets.io_fakes.yaml b/config/crds/bases/generators.external-secrets.io_fakes.yaml index 6896c2576..407d27761 100644 --- a/config/crds/bases/generators.external-secrets.io_fakes.yaml +++ b/config/crds/bases/generators.external-secrets.io_fakes.yaml @@ -10,7 +10,8 @@ spec: group: generators.external-secrets.io names: categories: - - fake + - external-secrets + - external-secrets-generators kind: Fake listKind: FakeList plural: fakes diff --git a/config/crds/bases/generators.external-secrets.io_gcraccesstokens.yaml b/config/crds/bases/generators.external-secrets.io_gcraccesstokens.yaml index 828ffce07..6eb90d119 100644 --- a/config/crds/bases/generators.external-secrets.io_gcraccesstokens.yaml +++ b/config/crds/bases/generators.external-secrets.io_gcraccesstokens.yaml @@ -10,7 +10,8 @@ spec: group: generators.external-secrets.io names: categories: - - gcraccesstoken + - external-secrets + - external-secrets-generators kind: GCRAccessToken listKind: GCRAccessTokenList plural: gcraccesstokens diff --git a/config/crds/bases/generators.external-secrets.io_githubaccesstokens.yaml b/config/crds/bases/generators.external-secrets.io_githubaccesstokens.yaml index 537cf323e..5045f809a 100644 --- a/config/crds/bases/generators.external-secrets.io_githubaccesstokens.yaml +++ b/config/crds/bases/generators.external-secrets.io_githubaccesstokens.yaml @@ -10,7 +10,8 @@ spec: group: generators.external-secrets.io names: categories: - - githubaccesstoken + - external-secrets + - external-secrets-generators kind: GithubAccessToken listKind: GithubAccessTokenList plural: githubaccesstokens diff --git a/config/crds/bases/generators.external-secrets.io_passwords.yaml b/config/crds/bases/generators.external-secrets.io_passwords.yaml index 23a1b10bc..8ffddf578 100644 --- a/config/crds/bases/generators.external-secrets.io_passwords.yaml +++ b/config/crds/bases/generators.external-secrets.io_passwords.yaml @@ -10,7 +10,8 @@ spec: group: generators.external-secrets.io names: categories: - - password + - external-secrets + - external-secrets-generators kind: Password listKind: PasswordList plural: passwords diff --git a/config/crds/bases/generators.external-secrets.io_uuids.yaml b/config/crds/bases/generators.external-secrets.io_uuids.yaml index fd3705731..a101dbe66 100644 --- a/config/crds/bases/generators.external-secrets.io_uuids.yaml +++ b/config/crds/bases/generators.external-secrets.io_uuids.yaml @@ -3,12 +3,15 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.3 + labels: + external-secrets.io/component: controller name: uuids.generators.external-secrets.io spec: group: generators.external-secrets.io names: categories: - - password + - external-secrets + - external-secrets-generators kind: UUID listKind: UUIDList plural: uuids @@ -20,10 +23,7 @@ spec: - name: v1alpha1 schema: openAPIV3Schema: - description: |- - Password generates a random password based on the - configuration parameters in spec. - You can specify the length, characterset and other attributes. + description: UUID generates a version 1 UUID (e56657e3-764f-11ef-a397-65231a88c216). properties: apiVersion: description: |- diff --git a/config/crds/bases/generators.external-secrets.io_vaultdynamicsecrets.yaml b/config/crds/bases/generators.external-secrets.io_vaultdynamicsecrets.yaml index ea9d1adcf..ff0c9c61d 100644 --- a/config/crds/bases/generators.external-secrets.io_vaultdynamicsecrets.yaml +++ b/config/crds/bases/generators.external-secrets.io_vaultdynamicsecrets.yaml @@ -10,7 +10,8 @@ spec: group: generators.external-secrets.io names: categories: - - vaultdynamicsecret + - external-secrets + - external-secrets-generators kind: VaultDynamicSecret listKind: VaultDynamicSecretList plural: vaultdynamicsecrets diff --git a/config/crds/bases/generators.external-secrets.io_webhooks.yaml b/config/crds/bases/generators.external-secrets.io_webhooks.yaml index b9d602847..c26d364b5 100644 --- a/config/crds/bases/generators.external-secrets.io_webhooks.yaml +++ b/config/crds/bases/generators.external-secrets.io_webhooks.yaml @@ -10,7 +10,8 @@ spec: group: generators.external-secrets.io names: categories: - - webhook + - external-secrets + - external-secrets-generators kind: Webhook listKind: WebhookList plural: webhooks diff --git a/deploy/charts/external-secrets/tests/__snapshot__/crds_test.yaml.snap b/deploy/charts/external-secrets/tests/__snapshot__/crds_test.yaml.snap index dffcf49e2..5a9c74784 100644 --- a/deploy/charts/external-secrets/tests/__snapshot__/crds_test.yaml.snap +++ b/deploy/charts/external-secrets/tests/__snapshot__/crds_test.yaml.snap @@ -22,7 +22,7 @@ should match snapshot of default values: group: external-secrets.io names: categories: - - externalsecrets + - external-secrets kind: SecretStore listKind: SecretStoreList plural: secretstores @@ -3518,6 +3518,41 @@ should match snapshot of default values: - database - host type: object + previder: + description: Previder configures this store to sync secrets using the Previder provider + properties: + auth: + description: PreviderAuth contains a secretRef for credentials. + properties: + secretRef: + description: PreviderAuthSecretRef holds secret references for Previder Vault credentials. + properties: + accessToken: + description: The AccessToken is used for authentication + properties: + key: + description: |- + The key of the entry in the Secret resource's `data` field to be used. Some instances of this field may be + defaulted, in others it may be required. + type: string + name: + description: The name of the Secret resource being referred to. + type: string + namespace: + description: |- + Namespace of the resource being referred to. Ignored if referent is not cluster-scoped. cluster-scoped defaults + to the namespace of the referent. + type: string + type: object + required: + - accessToken + type: object + type: object + baseUri: + type: string + required: + - auth + type: object pulumi: description: Pulumi configures this store to sync secrets using the Pulumi provider properties: @@ -3543,7 +3578,7 @@ should match snapshot of default values: type: object type: object apiUrl: - default: https://api.pulumi.com/api/preview + default: https://api.pulumi.com/api/esc description: APIURL is the URL of the Pulumi API. type: string environment: @@ -3558,10 +3593,14 @@ should match snapshot of default values: Organization are a space to collaborate on shared projects and stacks. To create a new organization, visit https://app.pulumi.com/ and click "New Organization". type: string + project: + description: Project is the name of the Pulumi ESC project the environment belongs to. + type: string required: - accessToken - environment - organization + - project type: object scaleway: description: Scaleway diff --git a/deploy/crds/bundle.yaml b/deploy/crds/bundle.yaml index e72f9acc5..e4fb22963 100644 --- a/deploy/crds/bundle.yaml +++ b/deploy/crds/bundle.yaml @@ -10,7 +10,7 @@ spec: group: external-secrets.io names: categories: - - externalsecrets + - external-secrets kind: ClusterExternalSecret listKind: ClusterExternalSecretList plural: clusterexternalsecrets @@ -667,7 +667,7 @@ spec: group: external-secrets.io names: categories: - - externalsecrets + - external-secrets kind: ClusterSecretStore listKind: ClusterSecretStoreList plural: clustersecretstores @@ -5298,7 +5298,7 @@ spec: group: external-secrets.io names: categories: - - externalsecrets + - external-secrets kind: ExternalSecret listKind: ExternalSecretList plural: externalsecrets @@ -6102,12 +6102,14 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.3 + labels: + external-secrets.io/component: controller name: pushsecrets.external-secrets.io spec: group: external-secrets.io names: categories: - - pushsecrets + - external-secrets kind: PushSecret listKind: PushSecretList plural: pushsecrets @@ -6486,7 +6488,7 @@ spec: group: external-secrets.io names: categories: - - externalsecrets + - external-secrets kind: SecretStore listKind: SecretStoreList plural: secretstores @@ -11117,7 +11119,8 @@ spec: group: generators.external-secrets.io names: categories: - - acraccesstoken + - external-secrets + - external-secrets-generators kind: ACRAccessToken listKind: ACRAccessTokenList plural: acraccesstokens @@ -11311,7 +11314,8 @@ spec: group: generators.external-secrets.io names: categories: - - ecrauthorizationtoken + - external-secrets + - external-secrets-generators kind: ECRAuthorizationToken listKind: ECRAuthorizationTokenList plural: ecrauthorizationtokens @@ -11479,7 +11483,8 @@ spec: group: generators.external-secrets.io names: categories: - - fake + - external-secrets + - external-secrets-generators kind: Fake listKind: FakeList plural: fakes @@ -11556,7 +11561,8 @@ spec: group: generators.external-secrets.io names: categories: - - gcraccesstoken + - external-secrets + - external-secrets-generators kind: GCRAccessToken listKind: GCRAccessTokenList plural: gcraccesstokens @@ -11685,7 +11691,8 @@ spec: group: generators.external-secrets.io names: categories: - - githubaccesstoken + - external-secrets + - external-secrets-generators kind: GithubAccessToken listKind: GithubAccessTokenList plural: githubaccesstokens @@ -11788,7 +11795,8 @@ spec: group: generators.external-secrets.io names: categories: - - password + - external-secrets + - external-secrets-generators kind: Password listKind: PasswordList plural: passwords @@ -11880,12 +11888,15 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.16.3 + labels: + external-secrets.io/component: controller name: uuids.generators.external-secrets.io spec: group: generators.external-secrets.io names: categories: - - password + - external-secrets + - external-secrets-generators kind: UUID listKind: UUIDList plural: uuids @@ -11897,10 +11908,7 @@ spec: - name: v1alpha1 schema: openAPIV3Schema: - description: |- - Password generates a random password based on the - configuration parameters in spec. - You can specify the length, characterset and other attributes. + description: UUID generates a version 1 UUID (e56657e3-764f-11ef-a397-65231a88c216). properties: apiVersion: description: |- @@ -11950,7 +11958,8 @@ spec: group: generators.external-secrets.io names: categories: - - vaultdynamicsecret + - external-secrets + - external-secrets-generators kind: VaultDynamicSecret listKind: VaultDynamicSecretList plural: vaultdynamicsecrets @@ -12648,7 +12657,8 @@ spec: group: generators.external-secrets.io names: categories: - - webhook + - external-secrets + - external-secrets-generators kind: Webhook listKind: WebhookList plural: webhooks