From 0341c32da0e552a56542de094614c11a9e172ed8 Mon Sep 17 00:00:00 2001 From: Daniel Hougaard <62331820+DanielHougaard@users.noreply.github.com> Date: Tue, 19 Mar 2024 11:25:26 +0100 Subject: [PATCH] Fix: Change credentials -> credentialsRef --- docs/integrations/platforms/kubernetes.mdx | 6 +++--- k8-operator/api/v1alpha1/infisicalsecret_types.go | 2 +- k8-operator/api/v1alpha1/zz_generated.deepcopy.go | 2 +- .../crd/bases/secrets.infisical.com_infisicalsecrets.yaml | 4 ++-- k8-operator/config/samples/sample.yaml | 2 +- k8-operator/controllers/infisicalsecret_helper.go | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/integrations/platforms/kubernetes.mdx b/docs/integrations/platforms/kubernetes.mdx index 079830f99..29ca9c4ba 100644 --- a/docs/integrations/platforms/kubernetes.mdx +++ b/docs/integrations/platforms/kubernetes.mdx @@ -77,7 +77,7 @@ spec: projectSlug: envSlug: # "dev", "staging", "prod", etc.. secretsPath: "" # Root is "/" - credentials: + credentialsRef: secretName: universal-auth-credentials secretNamespace: default @@ -142,7 +142,7 @@ Default re-sync interval is every 1 minute. - 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. @@ -165,7 +165,7 @@ Default re-sync interval is every 1 minute. projectSlug: # <-- project slug envSlug: # "dev", "staging", "prod", etc.. secretsPath: "" # Root is "/" - credentials: + credentialsRef: 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 ... diff --git a/k8-operator/api/v1alpha1/infisicalsecret_types.go b/k8-operator/api/v1alpha1/infisicalsecret_types.go index bcf969740..c29761b06 100644 --- a/k8-operator/api/v1alpha1/infisicalsecret_types.go +++ b/k8-operator/api/v1alpha1/infisicalsecret_types.go @@ -15,7 +15,7 @@ type Authentication struct { type UniversalAuthDetails struct { // +kubebuilder:validation:Required - Credentials KubeSecretReference `json:"credentials"` + CredentialsRef KubeSecretReference `json:"credentialsRef"` // +kubebuilder:validation:Required SecretsScope MachineIdentityScopeInWorkspace `json:"secretsScope"` } diff --git a/k8-operator/api/v1alpha1/zz_generated.deepcopy.go b/k8-operator/api/v1alpha1/zz_generated.deepcopy.go index aa5cb1f51..23251a194 100644 --- a/k8-operator/api/v1alpha1/zz_generated.deepcopy.go +++ b/k8-operator/api/v1alpha1/zz_generated.deepcopy.go @@ -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. func (in *UniversalAuthDetails) DeepCopyInto(out *UniversalAuthDetails) { *out = *in - out.Credentials = in.Credentials + out.CredentialsRef = in.CredentialsRef out.SecretsScope = in.SecretsScope } diff --git a/k8-operator/config/crd/bases/secrets.infisical.com_infisicalsecrets.yaml b/k8-operator/config/crd/bases/secrets.infisical.com_infisicalsecrets.yaml index 5e24d943a..811eb9669 100644 --- a/k8-operator/config/crd/bases/secrets.infisical.com_infisicalsecrets.yaml +++ b/k8-operator/config/crd/bases/secrets.infisical.com_infisicalsecrets.yaml @@ -92,7 +92,7 @@ spec: type: object universalAuth: properties: - credentials: + credentialsRef: properties: secretName: description: The name of the Kubernetes Secret @@ -119,7 +119,7 @@ spec: - secretsPath type: object required: - - credentials + - credentialsRef - secretsScope type: object type: object diff --git a/k8-operator/config/samples/sample.yaml b/k8-operator/config/samples/sample.yaml index 17a804e99..3b6a92846 100644 --- a/k8-operator/config/samples/sample.yaml +++ b/k8-operator/config/samples/sample.yaml @@ -43,7 +43,7 @@ spec: envSlug: # "dev", "staging", "prod", etc.. secretsPath: "" # Root is "/" - credentials: + credentialsRef: secretName: universal-auth-credentials secretNamespace: default diff --git a/k8-operator/controllers/infisicalsecret_helper.go b/k8-operator/controllers/infisicalsecret_helper.go index c719a6ea3..dc77525a0 100644 --- a/k8-operator/controllers/infisicalsecret_helper.go +++ b/k8-operator/controllers/infisicalsecret_helper.go @@ -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) { universalAuthCredsFromKubeSecret, err := r.GetKubeSecretByNamespacedName(ctx, types.NamespacedName{ - Namespace: infisicalSecret.Spec.Authentication.UniversalAuth.Credentials.SecretNamespace, - Name: infisicalSecret.Spec.Authentication.UniversalAuth.Credentials.SecretName, + Namespace: infisicalSecret.Spec.Authentication.UniversalAuth.CredentialsRef.SecretNamespace, + Name: infisicalSecret.Spec.Authentication.UniversalAuth.CredentialsRef.SecretName, }) if errors.IsNotFound(err) {