awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-06 02:26:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Conditioning

Browse Source
This commit is contained in:
Daniel Hougaard
2024-06-13 03:05:22 +02:00
parent b94db5d674
commit a70043b80d
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
k8-operator/controllers/conditions.go
+2 -2
View File
@@ -40,7 +40,7 @@ func (r *InfisicalSecretReconciler) SetReadyToSyncSecretsConditions(ctx context.
return r.Client.Status().Update(ctx, infisicalSecret) return r.Client.Status().Update(ctx, infisicalSecret)
} }
func (r *InfisicalSecretReconciler) SetInfisicalTokenLoadCondition(ctx context.Context, infisicalSecret *v1alpha1.InfisicalSecret, errorToConditionOn error) { func (r *InfisicalSecretReconciler) SetInfisicalTokenLoadCondition(ctx context.Context, infisicalSecret *v1alpha1.InfisicalSecret, authStrategy AuthStrategyType, errorToConditionOn error) {
if infisicalSecret.Status.Conditions == nil { if infisicalSecret.Status.Conditions == nil {
infisicalSecret.Status.Conditions = []metav1.Condition{} infisicalSecret.Status.Conditions = []metav1.Condition{}
} }
@@ -50,7 +50,7 @@ func (r *InfisicalSecretReconciler) SetInfisicalTokenLoadCondition(ctx context.C
Type: "secrets.infisical.com/LoadedInfisicalToken", Type: "secrets.infisical.com/LoadedInfisicalToken",
Status: metav1.ConditionTrue, Status: metav1.ConditionTrue,
Reason: "OK", Reason: "OK",
Message: "Infisical controller has located the Infisical token in provided Kubernetes secret", Message: fmt.Sprintf("Infisical controller has loaded the Infisical token in provided Kubernetes secret, using %v authentication strategy", authStrategy),
}) })
} else { } else {
meta.SetStatusCondition(&infisicalSecret.Status.Conditions, metav1.Condition{ meta.SetStatusCondition(&infisicalSecret.Status.Conditions, metav1.Condition{
k8-operator/controllers/infisicalsecret_helper.go
+1 -1
View File
@@ -292,6 +292,7 @@ func (r *InfisicalSecretReconciler) ReconcileInfisicalSecret(ctx context.Context
if authDetails.authStrategy == "" { if authDetails.authStrategy == "" {
fmt.Println("ReconcileInfisicalSecret: No authentication strategy found. Attempting to authenticate") fmt.Println("ReconcileInfisicalSecret: No authentication strategy found. Attempting to authenticate")
details, err := r.HandleAuthentication(ctx, infisicalSecret, infisicalClient) details, err := r.HandleAuthentication(ctx, infisicalSecret, infisicalClient)
r.SetInfisicalTokenLoadCondition(ctx, &infisicalSecret, details.authStrategy, err)
if err != nil { if err != nil {
return fmt.Errorf("unable to authenticate [err=%s]", err) return fmt.Errorf("unable to authenticate [err=%s]", err)
@@ -325,7 +326,6 @@ func (r *InfisicalSecretReconciler) ReconcileInfisicalSecret(ctx context.Context
return fmt.Errorf("ReconcileInfisicalSecret: unable to get service account creds from kube secret [err=%s]", err) return fmt.Errorf("ReconcileInfisicalSecret: unable to get service account creds from kube secret [err=%s]", err)
} }
r.SetInfisicalTokenLoadCondition(ctx, &infisicalSecret, err)
if err != nil { if err != nil {
return fmt.Errorf("unable to load Infisical Token from the specified Kubernetes secret with error [%w]", err) return fmt.Errorf("unable to load Infisical Token from the specified Kubernetes secret with error [%w]", err)
} }