awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-08 05:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Change credentials -> credentialsRef

Browse Source
This commit is contained in:
Daniel Hougaard
2024-03-21 17:08:01 +01:00
parent caea055281
commit 0341c32da0
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/integrations/platforms/kubernetes.mdx
+3 -3
View File
@@ -77,7 +77,7 @@ spec:
projectSlug: <project-slug> projectSlug: <project-slug>
envSlug: <env-slug> # "dev", "staging", "prod", etc.. envSlug: <env-slug> # "dev", "staging", "prod", etc..
secretsPath: "<secrets-path>" # Root is "/" secretsPath: "<secrets-path>" # Root is "/"
credentials: credentialsRef:
secretName: universal-auth-credentials secretName: universal-auth-credentials
secretNamespace: default secretNamespace: default
@@ -142,7 +142,7 @@ Default re-sync interval is every 1 minute.
</Step> </Step>
<Step title="Add reference for the Kubernetes secret containing the identity credentials"> <Step title="Add reference for the Kubernetes secret containing the identity credentials">
Once the secret is created, add the `secretName` and `secretNamespace` of the secret that was just created under `authentication.universalAuth.credentials` field in the InfisicalSecret resource. Once the secret is created, add the `secretName` and `secretNamespace` of the secret that was just created under `authentication.universalAuth.credentialsRef` field in the InfisicalSecret resource.
</Step> </Step>
</Steps> </Steps>
@@ -165,7 +165,7 @@ Default re-sync interval is every 1 minute.
projectSlug: <project-slug> # <-- project slug projectSlug: <project-slug> # <-- project slug
envSlug: <env-slug> # "dev", "staging", "prod", etc.. envSlug: <env-slug> # "dev", "staging", "prod", etc..
secretsPath: "<secrets-path>" # Root is "/" secretsPath: "<secrets-path>" # Root is "/"
credentials: credentialsRef:
secretName: universal-auth-credentials # <-- name of the Kubernetes secret that stores our machine identity credentials secretName: universal-auth-credentials # <-- name of the Kubernetes secret that stores our machine identity credentials
secretNamespace: default # <-- namespace of the Kubernetes secret that stores our machine identity credentials secretNamespace: default # <-- namespace of the Kubernetes secret that stores our machine identity credentials
... ...
k8-operator/api/v1alpha1/infisicalsecret_types.go
+1 -1
View File
@@ -15,7 +15,7 @@ type Authentication struct {
type UniversalAuthDetails struct { type UniversalAuthDetails struct {
// +kubebuilder:validation:Required // +kubebuilder:validation:Required
Credentials KubeSecretReference `json:"credentials"` CredentialsRef KubeSecretReference `json:"credentialsRef"`
// +kubebuilder:validation:Required // +kubebuilder:validation:Required
SecretsScope MachineIdentityScopeInWorkspace `json:"secretsScope"` SecretsScope MachineIdentityScopeInWorkspace `json:"secretsScope"`
} }
k8-operator/api/v1alpha1/zz_generated.deepcopy.go
+1 -1
View File
@@ -239,7 +239,7 @@ func (in *ServiceTokenDetails) DeepCopy() *ServiceTokenDetails {
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *UniversalAuthDetails) DeepCopyInto(out *UniversalAuthDetails) { func (in *UniversalAuthDetails) DeepCopyInto(out *UniversalAuthDetails) {
*out = *in *out = *in
out.Credentials = in.Credentials out.CredentialsRef = in.CredentialsRef
out.SecretsScope = in.SecretsScope out.SecretsScope = in.SecretsScope
} }
k8-operator/config/crd/bases/secrets.infisical.com_infisicalsecrets.yaml
+2 -2
View File
@@ -92,7 +92,7 @@ spec:
type: object type: object
universalAuth: universalAuth:
properties: properties:
credentials: credentialsRef:
properties: properties:
secretName: secretName:
description: The name of the Kubernetes Secret description: The name of the Kubernetes Secret
@@ -119,7 +119,7 @@ spec:
- secretsPath - secretsPath
type: object type: object
required: required:
- credentials - credentialsRef
- secretsScope - secretsScope
type: object type: object
type: object type: object
k8-operator/config/samples/sample.yaml
+1 -1
View File
@@ -43,7 +43,7 @@ spec:
envSlug: <env-slug> # "dev", "staging", "prod", etc.. envSlug: <env-slug> # "dev", "staging", "prod", etc..
secretsPath: "<secrets-path>" # Root is "/" secretsPath: "<secrets-path>" # Root is "/"
credentials: credentialsRef:
secretName: universal-auth-credentials secretName: universal-auth-credentials
secretNamespace: default secretNamespace: default
k8-operator/controllers/infisicalsecret_helper.go
+2 -2
View File
@@ -117,8 +117,8 @@ func (r *InfisicalSecretReconciler) GetInfisicalTokenFromKubeSecret(ctx context.
func (r *InfisicalSecretReconciler) GetInfisicalUniversalAuthFromKubeSecret(ctx context.Context, infisicalSecret v1alpha1.InfisicalSecret) (machineIdentityDetails model.MachineIdentityDetails, err error) { func (r *InfisicalSecretReconciler) GetInfisicalUniversalAuthFromKubeSecret(ctx context.Context, infisicalSecret v1alpha1.InfisicalSecret) (machineIdentityDetails model.MachineIdentityDetails, err error) {
universalAuthCredsFromKubeSecret, err := r.GetKubeSecretByNamespacedName(ctx, types.NamespacedName{ universalAuthCredsFromKubeSecret, err := r.GetKubeSecretByNamespacedName(ctx, types.NamespacedName{
Namespace: infisicalSecret.Spec.Authentication.UniversalAuth.Credentials.SecretNamespace, Namespace: infisicalSecret.Spec.Authentication.UniversalAuth.CredentialsRef.SecretNamespace,
Name: infisicalSecret.Spec.Authentication.UniversalAuth.Credentials.SecretName, Name: infisicalSecret.Spec.Authentication.UniversalAuth.CredentialsRef.SecretName,
}) })
if errors.IsNotFound(err) { if errors.IsNotFound(err) {