Skip to content

Commit 2f20368

Browse files
authored
correct namespace for mgmt secrets (nginx#7786)
1 parent 1341813 commit 2f20368

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

internal/k8s/controller.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -908,18 +908,18 @@ func (lbc *LoadBalancerController) updateAllConfigs() {
908908
// update special license secret in mgmtConfigParams
909909
if lbc.mgmtConfigMap != nil && lbc.isNginxPlus {
910910
if mgmtCfgParams.Secrets.License != "" {
911-
secret, err := lbc.client.CoreV1().Secrets(lbc.mgmtConfigMap.GetNamespace()).Get(context.TODO(), mgmtCfgParams.Secrets.License, meta_v1.GetOptions{})
911+
secret, err := lbc.client.CoreV1().Secrets(lbc.metadata.namespace).Get(context.TODO(), mgmtCfgParams.Secrets.License, meta_v1.GetOptions{})
912912
if err != nil {
913-
nl.Errorf(lbc.Logger, "secret %s/%s: %v", lbc.mgmtConfigMap.GetNamespace(), mgmtCfgParams.Secrets.License, err)
913+
nl.Errorf(lbc.Logger, "secret %s/%s: %v", lbc.metadata.namespace, mgmtCfgParams.Secrets.License, err)
914914
}
915915
lbc.specialSecrets.licenseSecret = fmt.Sprintf("%s/%s", secret.Namespace, secret.Name)
916916
lbc.handleSpecialSecretUpdate(secret, reloadNginx)
917917
}
918918
// update special CA secret in mgmtConfigParams
919919
if mgmtCfgParams.Secrets.TrustedCert != "" {
920-
secret, err := lbc.client.CoreV1().Secrets(lbc.mgmtConfigMap.GetNamespace()).Get(context.TODO(), mgmtCfgParams.Secrets.TrustedCert, meta_v1.GetOptions{})
920+
secret, err := lbc.client.CoreV1().Secrets(lbc.metadata.namespace).Get(context.TODO(), mgmtCfgParams.Secrets.TrustedCert, meta_v1.GetOptions{})
921921
if err != nil {
922-
nl.Errorf(lbc.Logger, "secret %s/%s: %v", lbc.mgmtConfigMap.GetNamespace(), mgmtCfgParams.Secrets.TrustedCert, err)
922+
nl.Errorf(lbc.Logger, "secret %s/%s: %v", lbc.metadata.namespace, mgmtCfgParams.Secrets.TrustedCert, err)
923923
}
924924
if _, hasCRL := secret.Data[configs.CACrlKey]; hasCRL {
925925
lbc.configurator.MgmtCfgParams.Secrets.TrustedCRL = secret.Name
@@ -929,9 +929,9 @@ func (lbc *LoadBalancerController) updateAllConfigs() {
929929
}
930930
// update special ClientAuth secret in mgmtConfigParams
931931
if mgmtCfgParams.Secrets.ClientAuth != "" {
932-
secret, err := lbc.client.CoreV1().Secrets(lbc.mgmtConfigMap.GetNamespace()).Get(context.TODO(), mgmtCfgParams.Secrets.ClientAuth, meta_v1.GetOptions{})
932+
secret, err := lbc.client.CoreV1().Secrets(lbc.metadata.namespace).Get(context.TODO(), mgmtCfgParams.Secrets.ClientAuth, meta_v1.GetOptions{})
933933
if err != nil {
934-
nl.Errorf(lbc.Logger, "secret %s/%s: %v", lbc.mgmtConfigMap.GetNamespace(), mgmtCfgParams.Secrets.ClientAuth, err)
934+
nl.Errorf(lbc.Logger, "secret %s/%s: %v", lbc.metadata.namespace, mgmtCfgParams.Secrets.ClientAuth, err)
935935
}
936936
lbc.specialSecrets.clientAuthSecret = fmt.Sprintf("%s/%s", secret.Namespace, secret.Name)
937937
lbc.handleSpecialSecretUpdate(secret, reloadNginx)

0 commit comments

Comments
 (0)