mirror of
https://github.com/awatertrevi/infisical.git
synced 2026-10-02 22:25:44 +00:00
Make secret type field configurable
This commit is contained in:
@@ -41,6 +41,10 @@ type KubeSecretReference struct {
|
|||||||
// The name space where the Kubernetes Secret is located
|
// The name space where the Kubernetes Secret is located
|
||||||
// +kubebuilder:validation:Required
|
// +kubebuilder:validation:Required
|
||||||
SecretNamespace string `json:"secretNamespace"`
|
SecretNamespace string `json:"secretNamespace"`
|
||||||
|
|
||||||
|
// The Kubernetes Secret type. More info: https://kubernetes.io/docs/concepts/configuration/secret/#secret-types
|
||||||
|
// +kubebuilder:validation:Optional
|
||||||
|
SecretType string `json:"secretType"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// InfisicalSecretSpec defines the desired state of InfisicalSecret
|
// InfisicalSecretSpec defines the desired state of InfisicalSecret
|
||||||
|
|||||||
@@ -52,6 +52,9 @@ spec:
|
|||||||
description: The name space where the Kubernetes Secret
|
description: The name space where the Kubernetes Secret
|
||||||
is located
|
is located
|
||||||
type: string
|
type: string
|
||||||
|
secretType:
|
||||||
|
description: 'The Kubernetes Secret type. More info: https://kubernetes.io/docs/concepts/configuration/secret/#secret-types'
|
||||||
|
type: string
|
||||||
required:
|
required:
|
||||||
- secretName
|
- secretName
|
||||||
- secretNamespace
|
- secretNamespace
|
||||||
@@ -82,6 +85,9 @@ spec:
|
|||||||
description: The name space where the Kubernetes Secret
|
description: The name space where the Kubernetes Secret
|
||||||
is located
|
is located
|
||||||
type: string
|
type: string
|
||||||
|
secretType:
|
||||||
|
description: 'The Kubernetes Secret type. More info: https://kubernetes.io/docs/concepts/configuration/secret/#secret-types'
|
||||||
|
type: string
|
||||||
required:
|
required:
|
||||||
- secretName
|
- secretName
|
||||||
- secretNamespace
|
- secretNamespace
|
||||||
@@ -102,6 +108,9 @@ spec:
|
|||||||
secretNamespace:
|
secretNamespace:
|
||||||
description: The name space where the Kubernetes Secret is located
|
description: The name space where the Kubernetes Secret is located
|
||||||
type: string
|
type: string
|
||||||
|
secretType:
|
||||||
|
description: 'The Kubernetes Secret type. More info: https://kubernetes.io/docs/concepts/configuration/secret/#secret-types'
|
||||||
|
type: string
|
||||||
required:
|
required:
|
||||||
- secretName
|
- secretName
|
||||||
- secretNamespace
|
- secretNamespace
|
||||||
@@ -117,6 +126,9 @@ spec:
|
|||||||
secretNamespace:
|
secretNamespace:
|
||||||
description: The name space where the Kubernetes Secret is located
|
description: The name space where the Kubernetes Secret is located
|
||||||
type: string
|
type: string
|
||||||
|
secretType:
|
||||||
|
description: 'The Kubernetes Secret type. More info: https://kubernetes.io/docs/concepts/configuration/secret/#secret-types'
|
||||||
|
type: string
|
||||||
required:
|
required:
|
||||||
- secretName
|
- secretName
|
||||||
- secretNamespace
|
- secretNamespace
|
||||||
|
|||||||
@@ -36,6 +36,8 @@ func (r *InfisicalSecretReconciler) ReconcileDeploymentsWithManagedSecrets(ctx c
|
|||||||
var wg sync.WaitGroup
|
var wg sync.WaitGroup
|
||||||
// Iterate over the deployments and check if they use the managed secret
|
// Iterate over the deployments and check if they use the managed secret
|
||||||
for _, deployment := range listOfDeployments.Items {
|
for _, deployment := range listOfDeployments.Items {
|
||||||
|
// Adding bc of https://github.com/golang/go/issues/16520
|
||||||
|
deployment := deployment
|
||||||
if deployment.Annotations[AUTO_RELOAD_DEPLOYMENT_ANNOTATION] == "true" && r.IsDeploymentUsingManagedSecret(deployment, infisicalSecret) {
|
if deployment.Annotations[AUTO_RELOAD_DEPLOYMENT_ANNOTATION] == "true" && r.IsDeploymentUsingManagedSecret(deployment, infisicalSecret) {
|
||||||
// Start a goroutine to reconcile the deployment
|
// Start a goroutine to reconcile the deployment
|
||||||
wg.Add(1)
|
wg.Add(1)
|
||||||
|
|||||||
@@ -72,7 +72,6 @@ func (r *InfisicalSecretReconciler) GetInfisicalTokenFromKubeSecret(ctx context.
|
|||||||
// default to new secret ref structure
|
// default to new secret ref structure
|
||||||
secretName := infisicalSecret.Spec.Authentication.ServiceToken.ServiceTokenSecretReference.SecretName
|
secretName := infisicalSecret.Spec.Authentication.ServiceToken.ServiceTokenSecretReference.SecretName
|
||||||
secretNamespace := infisicalSecret.Spec.Authentication.ServiceToken.ServiceTokenSecretReference.SecretNamespace
|
secretNamespace := infisicalSecret.Spec.Authentication.ServiceToken.ServiceTokenSecretReference.SecretNamespace
|
||||||
|
|
||||||
// fall back to previous secret ref
|
// fall back to previous secret ref
|
||||||
if secretName == "" {
|
if secretName == "" {
|
||||||
secretName = infisicalSecret.Spec.TokenSecretReference.SecretName
|
secretName = infisicalSecret.Spec.TokenSecretReference.SecretName
|
||||||
@@ -129,6 +128,13 @@ func (r *InfisicalSecretReconciler) GetInfisicalServiceAccountCredentialsFromKub
|
|||||||
|
|
||||||
func (r *InfisicalSecretReconciler) CreateInfisicalManagedKubeSecret(ctx context.Context, infisicalSecret v1alpha1.InfisicalSecret, secretsFromAPI []model.SingleEnvironmentVariable, encryptedSecretsResponse api.GetEncryptedSecretsV3Response) error {
|
func (r *InfisicalSecretReconciler) CreateInfisicalManagedKubeSecret(ctx context.Context, infisicalSecret v1alpha1.InfisicalSecret, secretsFromAPI []model.SingleEnvironmentVariable, encryptedSecretsResponse api.GetEncryptedSecretsV3Response) error {
|
||||||
plainProcessedSecrets := make(map[string][]byte)
|
plainProcessedSecrets := make(map[string][]byte)
|
||||||
|
secretType := infisicalSecret.Spec.ManagedSecretReference.SecretType
|
||||||
|
|
||||||
|
// Set the default secret type to "Opaque" if not provided
|
||||||
|
if secretType == "" {
|
||||||
|
secretType = "Opaque"
|
||||||
|
}
|
||||||
|
|
||||||
for _, secret := range secretsFromAPI {
|
for _, secret := range secretsFromAPI {
|
||||||
plainProcessedSecrets[secret.Key] = []byte(secret.Value) // plain process
|
plainProcessedSecrets[secret.Key] = []byte(secret.Value) // plain process
|
||||||
}
|
}
|
||||||
@@ -142,7 +148,7 @@ func (r *InfisicalSecretReconciler) CreateInfisicalManagedKubeSecret(ctx context
|
|||||||
SECRET_VERSION_ANNOTATION: encryptedSecretsResponse.ETag,
|
SECRET_VERSION_ANNOTATION: encryptedSecretsResponse.ETag,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
Type: "Opaque",
|
Type: corev1.SecretType(secretType),
|
||||||
Data: plainProcessedSecrets,
|
Data: plainProcessedSecrets,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -151,7 +157,7 @@ func (r *InfisicalSecretReconciler) CreateInfisicalManagedKubeSecret(ctx context
|
|||||||
return fmt.Errorf("unable to create the managed Kubernetes secret : %w", err)
|
return fmt.Errorf("unable to create the managed Kubernetes secret : %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
fmt.Println("Successfully created a managed Kubernetes secret with your Infisical secrets")
|
fmt.Printf("Successfully created a managed Kubernetes secret with your Infisical secrets. Type: %s\n", secretType)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user