Skip to content

Commit 5d12f55

Browse files
author
Peng Zhou
committed
add comment out back
1 parent c9cf1d3 commit 5d12f55

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

pkg/k8sutil/haProxy.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ func (cc *ClusterContext) ReconcileHAProxy() result.ReconcileResult {
4141
if err != nil {
4242
if errors.IsNotFound(err) {
4343
logger.Info("HAProxy ConfigMap is not found, creating a new one")
44-
// if err := patch.DefaultAnnotator.SetLastAppliedAnnotation(configMapDef); err != nil {
45-
// logger.Error(err, "Failed to set last applied annotation for HAProxy ConfigMap")
46-
// }
44+
if err := patch.DefaultAnnotator.SetLastAppliedAnnotation(configMapDef); err != nil {
45+
logger.Error(err, "Failed to set last applied annotation for HAProxy ConfigMap")
46+
}
4747
err = cc.createConfigMapForCC(configMapDef)
4848
if err != nil {
4949
logger.Info("HAProxy configmap creation is failed")
@@ -55,9 +55,9 @@ func (cc *ClusterContext) ReconcileHAProxy() result.ReconcileResult {
5555
logger.Info("HAProxy Deployment creation is failed")
5656
return result.Error(err)
5757
}
58-
// if err := patch.DefaultAnnotator.SetLastAppliedAnnotation(haproxyServiceDef); err != nil {
59-
// logger.Error(err, "Failed to set last applied annotation for HAProxy Service")
60-
// }
58+
if err := patch.DefaultAnnotator.SetLastAppliedAnnotation(haproxyServiceDef); err != nil {
59+
logger.Error(err, "Failed to set last applied annotation for HAProxy Service")
60+
}
6161
err = cc.createHAProxyService(haproxyServiceDef)
6262
if err != nil {
6363
logger.Info("HAProxy Service creation is failed")
@@ -82,9 +82,9 @@ func (cc *ClusterContext) ReconcileHAProxy() result.ReconcileResult {
8282
if !patchDiff.IsEmpty() {
8383
logger.Info("MarkLogic HAProxy Config spec is different from previous spec, updating the HAProxy ConfigMap")
8484
configmap.Data = configMapDef.Data
85-
// if err := patch.DefaultAnnotator.SetLastAppliedAnnotation(configmap); err != nil {
86-
// logger.Error(err, "Failed to set last applied annotation for HAProxy ConfigMap")
87-
// }
85+
if err := patch.DefaultAnnotator.SetLastAppliedAnnotation(configmap); err != nil {
86+
logger.Error(err, "Failed to set last applied annotation for HAProxy ConfigMap")
87+
}
8888
err := cc.Client.Update(cc.Ctx, configmap)
8989
if err != nil {
9090
logger.Error(err, "Error updating MarkLogic HAProxy ConfigMap")

0 commit comments

Comments
 (0)