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

feat: updated changes by review feedback

Browse Source
This commit is contained in:
=
2024-12-05 14:20:05 +05:30
parent 269f851cbf
commit fcbedfaf1b
3 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
k8-operator/controllers/infisicalsecret_helper.go
+14 -19
View File
@@ -227,11 +227,6 @@ func (r *InfisicalSecretReconciler) GetInfisicalServiceAccountCredentialsFromKub
return model.ServiceAccountDetails{AccessKey: string(accessKeyFromSecret), PrivateKey: string(privateKeyFromSecret), PublicKey: string(publicKeyFromSecret)}, nil return model.ServiceAccountDetails{AccessKey: string(accessKeyFromSecret), PrivateKey: string(privateKeyFromSecret), PublicKey: string(publicKeyFromSecret)}, nil
} }
type TemplateSecret struct {
Value string `json:"value"`
SecretPath string `json:"secretPath"`
}
func (r *InfisicalSecretReconciler) CreateInfisicalManagedKubeSecret(ctx context.Context, infisicalSecret v1alpha1.InfisicalSecret, secretsFromAPI []model.SingleEnvironmentVariable, ETag string) error { func (r *InfisicalSecretReconciler) CreateInfisicalManagedKubeSecret(ctx context.Context, infisicalSecret v1alpha1.InfisicalSecret, secretsFromAPI []model.SingleEnvironmentVariable, ETag string) error {
plainProcessedSecrets := make(map[string][]byte) plainProcessedSecrets := make(map[string][]byte)
secretType := infisicalSecret.Spec.ManagedSecretReference.SecretType secretType := infisicalSecret.Spec.ManagedSecretReference.SecretType
@@ -244,26 +239,26 @@ func (r *InfisicalSecretReconciler) CreateInfisicalManagedKubeSecret(ctx context
} }
if managedTemplateData != nil { if managedTemplateData != nil {
secretKeyValue := make(map[string]TemplateSecret) secretKeyValue := make(map[string]model.SecretTemplateOptions)
for _, secret := range secretsFromAPI { for _, secret := range secretsFromAPI {
secretKeyValue[secret.Key] = TemplateSecret{ secretKeyValue[secret.Key] = model.SecretTemplateOptions{
Value: secret.Value, Value: secret.Value,
SecretPath: secret.SecretPath, SecretPath: secret.SecretPath,
} }
} }
for tmplKey, userTmpl := range managedTemplateData.Data { for templateKey, userTemplate := range managedTemplateData.Data {
tmpl, err := template.New("secret-templates").Parse(userTmpl) tmpl, err := template.New("secret-templates").Parse(userTemplate)
if err != nil { if err != nil {
return fmt.Errorf("Unable to compile template: %s", tmplKey, err) return fmt.Errorf("Unable to compile template: %s", templateKey, err)
} }
buf := bytes.NewBuffer(nil) buf := bytes.NewBuffer(nil)
err = tmpl.Execute(buf, secretKeyValue) err = tmpl.Execute(buf, secretKeyValue)
if err != nil { if err != nil {
return fmt.Errorf("Unable to execute template: %s", tmplKey, err) return fmt.Errorf("Unable to execute template: %s", templateKey, err)
} }
plainProcessedSecrets[tmplKey] = buf.Bytes() plainProcessedSecrets[templateKey] = buf.Bytes()
} }
} }
@@ -330,26 +325,26 @@ func (r *InfisicalSecretReconciler) UpdateInfisicalManagedKubeSecret(ctx context
} }
if managedTemplateData != nil { if managedTemplateData != nil {
secretKeyValue := make(map[string]TemplateSecret) secretKeyValue := make(map[string]model.SecretTemplateOptions)
for _, secret := range secretsFromAPI { for _, secret := range secretsFromAPI {
secretKeyValue[secret.Key] = TemplateSecret{ secretKeyValue[secret.Key] = model.SecretTemplateOptions{
Value: secret.Value, Value: secret.Value,
SecretPath: secret.SecretPath, SecretPath: secret.SecretPath,
} }
} }
for tmplKey, userTmpl := range managedTemplateData.Data { for templateKey, userTemplate := range managedTemplateData.Data {
tmpl, err := template.New("secret-templates").Parse(userTmpl) tmpl, err := template.New("secret-templates").Parse(userTemplate)
if err != nil { if err != nil {
return fmt.Errorf("Unable to compile template: %s", tmplKey, err) return fmt.Errorf("Unable to compile template: %s", templateKey, err)
} }
buf := bytes.NewBuffer(nil) buf := bytes.NewBuffer(nil)
err = tmpl.Execute(buf, secretKeyValue) err = tmpl.Execute(buf, secretKeyValue)
if err != nil { if err != nil {
return fmt.Errorf("Unable to execute template: %s", tmplKey, err) return fmt.Errorf("Unable to execute template: %s", templateKey, err)
} }
plainProcessedSecrets[tmplKey] = buf.Bytes() plainProcessedSecrets[templateKey] = buf.Bytes()
} }
} }
k8-operator/main.go
+1 -1
View File
@@ -36,7 +36,7 @@ func main() {
var metricsAddr string var metricsAddr string
var enableLeaderElection bool var enableLeaderElection bool
var probeAddr string var probeAddr string
flag.StringVar(&metricsAddr, "metrics-bind-address", ":8082", "The address the metric endpoint binds to.") flag.StringVar(&metricsAddr, "metrics-bind-address", ":8080", "The address the metric endpoint binds to.")
flag.StringVar(&probeAddr, "health-probe-bind-address", ":8081", "The address the probe endpoint binds to.") flag.StringVar(&probeAddr, "health-probe-bind-address", ":8081", "The address the probe endpoint binds to.")
flag.BoolVar(&enableLeaderElection, "leader-elect", false, flag.BoolVar(&enableLeaderElection, "leader-elect", false,
"Enable leader election for controller manager. "+ "Enable leader election for controller manager. "+
k8-operator/packages/model/model.go
+6 -1
View File
@@ -21,5 +21,10 @@ type SingleEnvironmentVariable struct {
Value string `json:"value"` Value string `json:"value"`
SecretPath string `json:"secretPath"` SecretPath string `json:"secretPath"`
Type string `json:"type"` Type string `json:"type"`
ID string `json:"_id"` ID string `json:"id"`
}
type SecretTemplateOptions struct {
Value string `json:"value"`
SecretPath string `json:"secretPath"`
} }