mirror of
https://github.com/skoelle/kctl-tui.git
synced 2026-09-18 04:20:25 +00:00
fix: use correct ExternalSecret CRD name for force-sync annotation
The force-sync pre-filled the ExternalSecret object name with the Kubernetes secret name (e.g. job-apply-common-secrets), but the kubectl annotate command must target the ExternalSecret CRD object (e.g. job-apply). Added external_secret_name_template config option with fallback to k8s_secret_name_template.
This commit is contained in:
@@ -49,8 +49,9 @@ type panelModel struct {
|
||||
|
||||
deploymentName string
|
||||
|
||||
awsSecretName string // resolved via secret_name_template (namespace + env)
|
||||
k8sSecretName string // resolved via k8s_secret_name_template (namespace only)
|
||||
awsSecretName string // resolved via secret_name_template (namespace + env)
|
||||
k8sSecretName string // resolved via k8s_secret_name_template (namespace only)
|
||||
externalSecretName string // resolved via external_secret_name_template (namespace only)
|
||||
awsValues map[string]string
|
||||
k8sValues map[string]string
|
||||
diffEntries []kctl.SecretDiffEntry
|
||||
@@ -316,6 +317,7 @@ func (m *panelModel) afterAWSLogin(execErr error) (tea.Model, tea.Cmd) {
|
||||
func (m *panelModel) startSecretsFlow() (tea.Model, tea.Cmd) {
|
||||
m.awsSecretName = m.cfg.ResolveSecretName(m.ns, m.currentEnv)
|
||||
m.k8sSecretName = m.cfg.ResolveK8sSecretName(m.ns)
|
||||
m.externalSecretName = m.cfg.ResolveExternalSecretName(m.ns)
|
||||
|
||||
raw, err := kubeexec.GetAWSSecretString(m.awsSecretName, m.cfg.AWSRegion)
|
||||
if err != nil {
|
||||
@@ -462,7 +464,7 @@ func (m *panelModel) fromForceSyncConfirm() (tea.Model, tea.Cmd) {
|
||||
return m, nil
|
||||
}
|
||||
m.step = stepExternalSecretName
|
||||
m.input.SetValue(m.k8sSecretName)
|
||||
m.input.SetValue(m.externalSecretName)
|
||||
m.input.Placeholder = "ExternalSecret object name"
|
||||
return m, nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user