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

Fix: Requested changes

Browse Source
This commit is contained in:
Daniel Hougaard
2024-03-21 19:53:21 +01:00
parent 08cfbf64e4
commit 02112ede07
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
k8-operator/controllers/infisicalsecret_helper.go
+5 -8
View File
@@ -40,6 +40,8 @@ var AuthStrategy = struct {
UNIVERSAL_MACHINE_IDENTITY: "UNIVERSAL_MACHINE_IDENTITY", UNIVERSAL_MACHINE_IDENTITY: "UNIVERSAL_MACHINE_IDENTITY",
} }
var machineIdentityTokenInstance *util.MachineIdentityToken
func (r *InfisicalSecretReconciler) GetInfisicalConfigMap(ctx context.Context) (configMap map[string]string, errToReturn error) { func (r *InfisicalSecretReconciler) GetInfisicalConfigMap(ctx context.Context) (configMap map[string]string, errToReturn error) {
// default key values // default key values
defaultConfigMapData := make(map[string]string) defaultConfigMapData := make(map[string]string)
@@ -291,16 +293,11 @@ func (r *InfisicalSecretReconciler) ReconcileInfisicalSecret(ctx context.Context
secretVersionBasedOnETag = managedKubeSecret.Annotations[SECRET_VERSION_ANNOTATION] secretVersionBasedOnETag = managedKubeSecret.Annotations[SECRET_VERSION_ANNOTATION]
} }
if authStrategy == AuthStrategy.UNIVERSAL_MACHINE_IDENTITY && util.MachineIdentityTokenInstance == nil { if authStrategy == AuthStrategy.UNIVERSAL_MACHINE_IDENTITY && machineIdentityTokenInstance == nil {
// Create new machine identity token instance // Create new machine identity token instance
util.MachineIdentityTokenInstance = util.NewMachineIdentityToken(infisicalMachineIdentityCreds.ClientId, infisicalMachineIdentityCreds.ClientSecret) machineIdentityTokenInstance = util.NewMachineIdentityToken(infisicalMachineIdentityCreds.ClientId, infisicalMachineIdentityCreds.ClientSecret)
} }
// TODO: Also save a timestamp of when the token expires, so we know when to refetch an access token
// if infisicalMachineIdentityCreds.ClientId != "" && infisicalMachineIdentityCreds.ClientSecret != "" {
// }
var plainTextSecretsFromApi []model.SingleEnvironmentVariable var plainTextSecretsFromApi []model.SingleEnvironmentVariable
var updateAttributes model.UpdateAttributes var updateAttributes model.UpdateAttributes
@@ -324,7 +321,7 @@ func (r *InfisicalSecretReconciler) ReconcileInfisicalSecret(ctx context.Context
fmt.Println("ReconcileInfisicalSecret: Fetched secrets via service token") fmt.Println("ReconcileInfisicalSecret: Fetched secrets via service token")
} else if authStrategy == AuthStrategy.UNIVERSAL_MACHINE_IDENTITY { // Machine Identity } else if authStrategy == AuthStrategy.UNIVERSAL_MACHINE_IDENTITY { // Machine Identity
accessToken, err := util.MachineIdentityTokenInstance.GetToken() accessToken, err := machineIdentityTokenInstance.GetToken()
if err != nil { if err != nil {
return fmt.Errorf("%s", "Waiting for access token to become available") return fmt.Errorf("%s", "Waiting for access token to become available")
k8-operator/packages/util/variables.go
-3
View File
@@ -1,3 +0,0 @@
package util
var MachineIdentityTokenInstance *MachineIdentityToken