Skip to content

Commit 4828ce4

Browse files
m1kolam1kola
committed
fixup! Add agent cert hash annotation to the STS
1 parent 499e740 commit 4828ce4

File tree

4 files changed

+13
-12
lines changed

4 files changed

+13
-12
lines changed

‎controllers/operator/mongodbmultireplicaset_controller.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -493,11 +493,11 @@ func (r *ReconcileMongoDbMultiReplicaSet) reconcileStatefulSets(ctx context.Cont
493493
return workflow.Failed(err)
494494
}
495495

496-
agentCertSecretName := mrs.GetSecurity().AgentClientCertificateSecretName(mrs.Name).Name
496+
agentCertSecretSelector := mrs.GetSecurity().AgentClientCertificateSecretName(mrs.Name).Name
497497

498498
// get cert hash of tls secret if it exists
499499
certHash := enterprisepem.ReadHashFromSecret(ctx, r.SecretClient, mrs.Namespace, mrsConfig.CertSecretName, "", log)
500-
agentCertHash := enterprisepem.ReadHashFromSecret(ctx, r.SecretClient, mrs.Namespace, agentCertSecretName, "", log)
500+
agentCertHash := enterprisepem.ReadHashFromSecret(ctx, r.SecretClient, mrs.Namespace, agentCertSecretSelector, "", log)
501501
internalCertHash := enterprisepem.ReadHashFromSecret(ctx, r.SecretClient, mrs.Namespace, mrsConfig.InternalClusterSecretName, "", log)
502502
log.Debugf("Creating StatefulSet %s with %d replicas in cluster: %s", mrs.MultiStatefulsetName(clusterNum), replicasThisReconciliation, item.ClusterName)
503503

@@ -761,8 +761,8 @@ func (r *ReconcileMongoDbMultiReplicaSet) updateOmDeploymentRs(ctx context.Conte
761761

762762
caFilePath := fmt.Sprintf("%s/ca-pem", util.TLSCaMountPath)
763763

764-
agentCertSecretName := mrs.GetSecurity().AgentClientCertificateSecretName(mrs.GetName())
765-
status, additionalReconciliationRequired := r.updateOmAuthentication(ctx, conn, rs.GetProcessNames(), &mrs, agentCertSecretName, caFilePath, internalClusterCertPath, isRecovering, log)
764+
agentCertSecretSelector := mrs.GetSecurity().AgentClientCertificateSecretName(mrs.GetName())
765+
status, additionalReconciliationRequired := r.updateOmAuthentication(ctx, conn, rs.GetProcessNames(), &mrs, agentCertSecretSelector, caFilePath, internalClusterCertPath, isRecovering, log)
766766
if !status.IsOK() && !isRecovering {
767767
return xerrors.Errorf("failed to enable Authentication for MongoDB Multi Replicaset")
768768
}

‎controllers/operator/mongodbreplicaset_controller.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,8 @@ func (r *ReconcileMongoDbReplicaSet) Reconcile(ctx context.Context, request reco
200200

201201
tlsCertHash := enterprisepem.ReadHashFromSecret(ctx, r.SecretClient, rs.Namespace, rsCertsConfig.CertSecretName, databaseSecretPath, log)
202202
internalClusterCertHash := enterprisepem.ReadHashFromSecret(ctx, r.SecretClient, rs.Namespace, rsCertsConfig.InternalClusterSecretName, databaseSecretPath, log)
203-
agentCertSecretName := rs.GetSecurity().AgentClientCertificateSecretName(rs.Name).Name
204-
agentCertHash := enterprisepem.ReadHashFromSecret(ctx, r.SecretClient, rs.Namespace, agentCertSecretName, databaseSecretPath, log)
203+
agentCertSecretSelector := rs.GetSecurity().AgentClientCertificateSecretName(rs.Name)
204+
agentCertHash := enterprisepem.ReadHashFromSecret(ctx, r.SecretClient, rs.Namespace, agentCertSecretSelector.Name, databaseSecretPath, log)
205205

206206
rsConfig := construct.ReplicaSetOptions(
207207
PodEnvVars(newPodVars(conn, projectConfig, rs.Spec.LogLevel)),
@@ -236,7 +236,7 @@ func (r *ReconcileMongoDbReplicaSet) Reconcile(ctx context.Context, request reco
236236
}
237237
}
238238

239-
agentCertSecretSelector := rs.GetSecurity().AgentClientCertificateSecretName(rs.Name)
239+
// TODO: copy maybe?
240240
agentCertSecretSelector.Name += certs.OperatorGeneratedCertSuffix
241241

242242
internalClusterCertPath := ""

‎controllers/operator/mongodbshardedcluster_controller.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1950,6 +1950,7 @@ func (r *ShardedClusterReconcileHelper) publishDeployment(ctx context.Context, c
19501950

19511951
logDiffOfProcessNames(opts.processNames, healthyProcessesToWaitForReadyState, log.With("ctx", "updateOmAuthentication"))
19521952

1953+
// TODO: Check if opts.agentCertSecretSelector is correct here. It is non-pem suffixed secret name.
19531954
workflowStatus, additionalReconciliationRequired := r.commonController.updateOmAuthentication(ctx, conn, healthyProcessesToWaitForReadyState, sc, opts.agentCertSecretSelector, opts.caFilePath, "", isRecovering, log)
19541955
if !workflowStatus.IsOK() {
19551956
if !isRecovering {
@@ -2280,7 +2281,7 @@ func (r *ShardedClusterReconcileHelper) getConfigServerOptions(ctx context.Conte
22802281
PodEnvVars(opts.podEnvVars),
22812282
CurrentAgentAuthMechanism(opts.currentAgentAuthMode),
22822283
CertificateHash(enterprisepem.ReadHashFromSecret(ctx, r.commonController.SecretClient, sc.Namespace, certSecretName, databaseSecretPath, log)),
2283-
AgentCertificateHash(enterprisepem.ReadHashFromSecret(ctx, r.commonController.SecretClient, sc.Namespace, opts.agentCertSecretName, databaseSecretPath, log)),
2284+
AgentCertificateHash(enterprisepem.ReadHashFromSecret(ctx, r.commonController.SecretClient, sc.Namespace, opts.agentCertSecretSelector.Name, databaseSecretPath, log)),
22842285
InternalClusterHash(enterprisepem.ReadHashFromSecret(ctx, r.commonController.SecretClient, sc.Namespace, internalClusterSecretName, databaseSecretPath, log)),
22852286
PrometheusTLSCertHash(opts.prometheusCertHash),
22862287
WithVaultConfig(vaultConfig),
@@ -2312,7 +2313,7 @@ func (r *ShardedClusterReconcileHelper) getMongosOptions(ctx context.Context, sc
23122313
PodEnvVars(opts.podEnvVars),
23132314
CurrentAgentAuthMechanism(opts.currentAgentAuthMode),
23142315
CertificateHash(enterprisepem.ReadHashFromSecret(ctx, r.commonController.SecretClient, sc.Namespace, certSecretName, vaultConfig.DatabaseSecretPath, log)),
2315-
AgentCertificateHash(enterprisepem.ReadHashFromSecret(ctx, r.commonController.SecretClient, sc.Namespace, opts.agentCertSecretName, vaultConfig.DatabaseSecretPath, log)),
2316+
AgentCertificateHash(enterprisepem.ReadHashFromSecret(ctx, r.commonController.SecretClient, sc.Namespace, opts.agentCertSecretSelector.Name, vaultConfig.DatabaseSecretPath, log)),
23162317
InternalClusterHash(enterprisepem.ReadHashFromSecret(ctx, r.commonController.SecretClient, sc.Namespace, internalClusterSecretName, vaultConfig.DatabaseSecretPath, log)),
23172318
PrometheusTLSCertHash(opts.prometheusCertHash),
23182319
WithVaultConfig(vaultConfig),
@@ -2343,7 +2344,7 @@ func (r *ShardedClusterReconcileHelper) getShardOptions(ctx context.Context, sc
23432344
PodEnvVars(opts.podEnvVars),
23442345
CurrentAgentAuthMechanism(opts.currentAgentAuthMode),
23452346
CertificateHash(enterprisepem.ReadHashFromSecret(ctx, r.commonController.SecretClient, sc.Namespace, certSecretName, databaseSecretPath, log)),
2346-
AgentCertificateHash(enterprisepem.ReadHashFromSecret(ctx, r.commonController.SecretClient, sc.Namespace, opts.agentCertSecretName, databaseSecretPath, log)),
2347+
AgentCertificateHash(enterprisepem.ReadHashFromSecret(ctx, r.commonController.SecretClient, sc.Namespace, opts.agentCertSecretSelector.Name, databaseSecretPath, log)),
23472348
InternalClusterHash(enterprisepem.ReadHashFromSecret(ctx, r.commonController.SecretClient, sc.Namespace, internalClusterSecretName, databaseSecretPath, log)),
23482349
PrometheusTLSCertHash(opts.prometheusCertHash),
23492350
WithVaultConfig(vaultConfig),

‎controllers/operator/mongodbstandalone_controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,11 +243,11 @@ func (r *ReconcileMongoDbStandalone) Reconcile(ctx context.Context, request reco
243243
}
244244
}
245245

246-
agentCertSecretName := s.GetSecurity().AgentClientCertificateSecretName(s.Name).Name
246+
agentCertSecretSelector := s.GetSecurity().AgentClientCertificateSecretName(s.Name).Name
247247

248248
standaloneOpts := construct.StandaloneOptions(
249249
CertificateHash(pem.ReadHashFromSecret(ctx, r.SecretClient, s.Namespace, standaloneCertSecretName, databaseSecretPath, log)),
250-
AgentCertificateHash(pem.ReadHashFromSecret(ctx, r.SecretClient, s.Namespace, agentCertSecretName, databaseSecretPath, log)),
250+
AgentCertificateHash(pem.ReadHashFromSecret(ctx, r.SecretClient, s.Namespace, agentCertSecretSelector, databaseSecretPath, log)),
251251
CurrentAgentAuthMechanism(currentAgentAuthMode),
252252
PodEnvVars(podVars),
253253
WithVaultConfig(vaultConfig),

0 commit comments

Comments
 (0)