Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug 2058542: [release-4.10] Ignore logging credentials #80

Merged
merged 1 commit into from
Mar 1, 2022
Merged

Bug 2058542: [release-4.10] Ignore logging credentials #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions controllers/common-controller-utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ func createOrUpdateDestinationSecretsFromSource(ctx context.Context, rc client.C
logger := log.FromContext(ctx)
err := common.ValidateSourceSecret(sourceSecret)
if err != nil {
logger.Error(err, "Updating secrets failed. Invalid secret type.", "secret", sourceSecret)
logger.Error(err, "Updating secrets failed. Invalid secret type.", "secret", sourceSecret.Name, "namespace", sourceSecret.Namespace)
return err
}

Expand All @@ -44,18 +44,18 @@ func createOrUpdateDestinationSecretsFromSource(ctx context.Context, rc client.C

uniqueConnectedPeers, err := PeersConnectedToSecret(sourceSecret, mirrorPeers)
if err != nil {
logger.Error(err, "ConnectedPeers returned an error", "secret", sourceSecret, "mirrorpeers", mirrorPeers)
logger.Error(err, "ConnectedPeers returned an error", "secret", sourceSecret.Name, "namespace", sourceSecret.Namespace, "mirrorpeers", mirrorPeers)
return err
}
logger.V(2).Info("Listing all the Peers connected to the Source", "SourceSecret", sourceSecret, "#connected-peers", len(uniqueConnectedPeers))
logger.V(2).Info("Listing all the Peers connected to the Source", "SourceSecret", sourceSecret.Name, "namespace", sourceSecret.Namespace, "connected-peers-length", len(uniqueConnectedPeers))

// anyErr will have the last found error
var anyErr error
for _, eachConnectedPeer := range uniqueConnectedPeers {
namedPeerRef := NewNamedPeerRefWithSecretData(sourceSecret, eachConnectedPeer)
err := namedPeerRef.CreateOrUpdateDestinationSecret(ctx, rc)
if err != nil {
logger.Error(err, "Unable to update the destination secret", "PeerRef", eachConnectedPeer)
logger.Error(err, "Unable to update the destination secret", "secret", sourceSecret.Name, "namespace", sourceSecret.Namespace, "PeerRef", eachConnectedPeer)
anyErr = err
}
}
Expand All @@ -67,7 +67,7 @@ func processDestinationSecretUpdation(ctx context.Context, rc client.Client, des
logger := log.FromContext(ctx)
err := common.ValidateDestinationSecret(destSecret)
if err != nil {
logger.Error(err, "Destination secret validation failed", "secret", destSecret)
logger.Error(err, "Destination secret validation failed", "secret", destSecret.Name, "namespace", destSecret.Namespace)
return err
}
mirrorPeers, err := common.FetchAllMirrorPeers(ctx, rc)
Expand All @@ -77,7 +77,7 @@ func processDestinationSecretUpdation(ctx context.Context, rc client.Client, des
}
uniqueConnectedPeers, err := PeersConnectedToSecret(destSecret, mirrorPeers)
if err != nil {
logger.Error(err, "Failed to get the peers connected to the secret", "secret", destSecret)
logger.Error(err, "Failed to get the peers connected to the secret", "secret", destSecret.Name, "namespace", destSecret.Namespace)
return err
}
var connectedSource *corev1.Secret
Expand All @@ -89,7 +89,7 @@ func processDestinationSecretUpdation(ctx context.Context, rc client.Client, des
if k8serrors.IsNotFound(err) {
continue
}
logger.Error(err, "Unexpected error while finding the source secret", "peer-ref", eachConnectedPeer, "secret", destSecret)
logger.Error(err, "Unexpected error while finding the source secret", "peer-ref", eachConnectedPeer, "secret", destSecret.Name, "namespace", destSecret.Namespace)
return err
}
if common.IsSecretSource(&connectedSecret) {
Expand All @@ -99,7 +99,7 @@ func processDestinationSecretUpdation(ctx context.Context, rc client.Client, des
}

if connectedSource == nil {
logger.Error(nil, "No connected source found. Removing the dangling destination secret", "secret", destSecret)
logger.Error(nil, "No connected source found. Removing the dangling destination secret", "secret", destSecret.Name, "namespace", destSecret.Namespace)
err = rc.Delete(ctx, destSecret)
return err
}
Expand All @@ -119,7 +119,7 @@ func processDestinationSecretCleanup(ctx context.Context, rc client.Client) erro
err = processDestinationSecretUpdation(ctx, rc, &eachDSecret)
if err != nil {
anyError = err
logger.Error(err, "Failed to update destination secret", "secret", eachDSecret)
logger.Error(err, "Failed to update destination secret", "secret", eachDSecret.Name, "namespace", eachDSecret.Namespace)
}
}
return anyError
Expand Down Expand Up @@ -153,7 +153,7 @@ func createOrUpdateRamenS3Secret(ctx context.Context, rc client.Client, secret *
if err != nil {
if k8serrors.IsNotFound(err) {
// creating new s3 secret on ramen openshift-dr-system namespace
logger.Info("Creating a s3 secret", "secret", expectedSecret)
logger.Info("Creating a s3 secret", "secret", expectedSecret.Name, "namespace", expectedSecret.Namespace)
return rc.Create(ctx, &expectedSecret)
}
logger.Error(err, "unable to fetch the s3 secret", "secret", secret.Name, "namespace", ramenHubNamespace)
Expand Down Expand Up @@ -289,7 +289,7 @@ func createOrUpdateSecretsFromInternalSecret(ctx context.Context, rc client.Clie
logger := log.FromContext(ctx)

if err := common.ValidateInternalSecret(secret, common.InternalLabel); err != nil {
logger.Error(err, "Provided internal secret is not valid", "secret", secret)
logger.Error(err, "Provided internal secret is not valid", "secret", secret.Name, "namespace", secret.Namespace)
return err
}

Expand Down Expand Up @@ -348,7 +348,7 @@ func processDeletedSecrets(ctx context.Context, rc client.Client, req types.Name
// secrets of same name.
if sourceSecretPointer != nil {
err = errors.New("multiple source secrets detected")
logger.Error(err, "Cannot have more than one source secrets with the same name", "request", req, "source-secret", *sourceSecretPointer)
logger.Error(err, "Cannot have more than one source secrets with the same name", "request", req, "source-secret", sourceSecretPointer.Name, "namespace", sourceSecretPointer.Namespace)
return err
}
sourceSecretPointer = eachSecret.DeepCopy()
Expand All @@ -358,21 +358,21 @@ func processDeletedSecrets(ctx context.Context, rc client.Client, req types.Name
}
}

logger.V(2).Info("List of secrets with requested name", "secret-name", req.Name, "secretlist", sameNamedDestinationSecrets, "#secrets", len(sameNamedDestinationSecrets))
logger.V(2).Info("List of secrets with requested name", "secret-name", req.Name, "secret-length", len(sameNamedDestinationSecrets))

if sourceSecretPointer == nil {
// if there is neither source secret nor any other similarly named secrets,
// that means all 'req.Name'-ed secrets are cleaned up and nothing to be done
if len(sameNamedDestinationSecrets) == 0 {
return nil
}
logger.Info("A SOURCE secret deletion detected", "secret-name", req.Name)
logger.Info("A SOURCE secret deletion detected", "secret-name", req.Name, "namespace", req.Namespace)
var anyErr error
// if source secret is not present, remove all the destinations|GREENs
for _, eachDestSecret := range sameNamedDestinationSecrets {
err = rc.Delete(ctx, &eachDestSecret)
if err != nil {
logger.Error(err, "Deletion failed", "secret", eachDestSecret)
logger.Error(err, "Deletion failed", "secret", eachDestSecret.Name, "namespace", eachDestSecret.Namespace)
anyErr = err
}
}
Expand All @@ -382,13 +382,13 @@ func processDeletedSecrets(ctx context.Context, rc client.Client, req types.Name
return anyErr
}
} else {
logger.Info("A DESTINATION secret deletion detected", "secret-name", req.Name)
logger.Info("A DESTINATION secret deletion detected", "secret-name", req.Name, "namespace", req.Namespace)
// in this section, one of the destination is removed
// action: use the source secret pointed by 'sourceSecretPointer'
// and restore the missing destination secret
err = createOrUpdateDestinationSecretsFromSource(ctx, rc, sourceSecretPointer)
if err != nil {
logger.Error(err, "Unable to update the destination secret", "source-secret", sourceSecretPointer)
logger.Error(err, "Unable to update the destination secret", "source-secret", sourceSecretPointer.Name, "namespace", sourceSecretPointer.Namespace)
return err
}
}
Expand Down
2 changes: 1 addition & 1 deletion controllers/mirrorpeer_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ func processMirrorPeerSecretChanges(ctx context.Context, rc client.Client, mirro
}
err = createOrUpdateDestinationSecretsFromSource(ctx, rc, matchingSourceSecret, mirrorPeerObj)
if err != nil {
logger.Error(err, "Error while updating Destination secrets", "source-secret", *matchingSourceSecret)
logger.Error(err, "Error while updating Destination secrets", "source-secret", matchingSourceSecret.Name, "namespace", matchingSourceSecret.Namespace)
anyErr = err
}
}
Expand Down
8 changes: 4 additions & 4 deletions controllers/mirrorpeersecret_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,25 +68,25 @@ func mirrorPeerSecretReconcile(ctx context.Context, rc client.Client, req ctrl.R
}
if common.IsSecretSource(&peerSecret) {
if err := common.ValidateSourceSecret(&peerSecret); err != nil {
logger.Error(err, "Provided source secret is not valid", "secret", peerSecret)
logger.Error(err, "Provided source secret is not valid", "secret", peerSecret.Name, "namespace", peerSecret.Namespace)
return err
}
err = createOrUpdateDestinationSecretsFromSource(ctx, rc, &peerSecret)
if err != nil {
logger.Error(err, "Updating the destination secret failed", "secret", peerSecret)
logger.Error(err, "Updating the destination secret failed", "secret", peerSecret.Name, "namespace", peerSecret.Namespace)
return err
}
} else if common.IsSecretDestination(&peerSecret) {
// a destination secret updation happened
err = processDestinationSecretUpdation(ctx, rc, &peerSecret)
if err != nil {
logger.Error(err, "Restoring destination secret failed", "secret", peerSecret)
logger.Error(err, "Restoring destination secret failed", "secret", peerSecret.Name, "namespace", peerSecret.Namespace)
return err
}
} else if common.IsSecretInternal(&peerSecret) {
err = createOrUpdateSecretsFromInternalSecret(ctx, rc, &peerSecret, nil)
if err != nil {
logger.Error(err, "Updating the secret from internal secret is failed", "secret", peerSecret)
logger.Error(err, "Updating the secret from internal secret is failed", "secret", peerSecret.Name, "namespace", peerSecret.Namespace)
return err
}
}
Expand Down
6 changes: 2 additions & 4 deletions controllers/named-peerref-with-data.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ func (nPR *NamedPeerRefWithSecretData) CreateOrUpdateDestinationSecret(ctx conte
err = nPR.GetAssociatedSecret(ctx, rc, &currentDest)
if err != nil {
if k8serrors.IsNotFound(err) {
logger.Info("Creating destination secret", "secret", expectedDest)
logger.Info("Creating destination secret", "secret", expectedDest.Name, "namespace", expectedDest.Namespace)
return rc.Create(ctx, expectedDest)
}
logger.Error(err, "Unable to get the destination secret", "destination-ref", nPR.PeerRef)
Expand All @@ -122,9 +122,7 @@ func (nPR *NamedPeerRefWithSecretData) CreateOrUpdateDestinationSecret(ctx conte

// recieved a destination secret, now compare
if !reflect.DeepEqual(expectedDest.Data, currentDest.Data) {
logger.Info("Updating the destination secret",
"current-data", currentDest.Data,
"expected-data", expectedDest.Data)
logger.Info("Updating the destination secret", "secret", currentDest.Name, "namespace", currentDest.Namespace)
_, err := controllerutil.CreateOrUpdate(ctx, rc, &currentDest, func() error {
currentDest.Data = expectedDest.Data
return nil
Expand Down