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

Add nil check while fetching secrets in repository server CR #2102

Merged
merged 2 commits into from
Jun 13, 2023
Merged

Add nil check while fetching secrets in repository server CR #2102

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
502ba86
add nil check for secrets in repository server CR
kale-amruta Jun 13, 2023
35a30bd
Merge branch 'master' into AddSecretsCheck
kale-amruta Jun 13, 2023
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
18 changes: 11 additions & 7 deletions pkg/controllers/repositoryserver/secrets_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,27 +38,27 @@ func (h *RepoServerHandler) getSecretsFromCR(ctx context.Context) error {
// same namespace. This namespace field can be overriden when we start creating secrets using 'kanctl' utility
repositoryServer := h.RepositoryServer
h.Logger.Info("Fetching secrets from all the secret references in the CR")
storage, err := h.fetchSecret(ctx, repositoryServer.Spec.Storage.SecretRef)
storage, err := h.fetchSecret(ctx, &repositoryServer.Spec.Storage.SecretRef)
if err != nil {
return err
}
storageCredentials, err := h.fetchSecret(ctx, repositoryServer.Spec.Storage.CredentialSecretRef)
storageCredentials, err := h.fetchSecret(ctx, &repositoryServer.Spec.Storage.CredentialSecretRef)
if err != nil {
return err
}
repositoryPassword, err := h.fetchSecret(ctx, repositoryServer.Spec.Repository.PasswordSecretRef)
repositoryPassword, err := h.fetchSecret(ctx, &repositoryServer.Spec.Repository.PasswordSecretRef)
if err != nil {
return err
}
serverAdmin, err := h.fetchSecret(ctx, repositoryServer.Spec.Server.AdminSecretRef)
serverAdmin, err := h.fetchSecret(ctx, &repositoryServer.Spec.Server.AdminSecretRef)
if err != nil {
return err
}
serverTLS, err := h.fetchSecret(ctx, repositoryServer.Spec.Server.TLSSecretRef)
serverTLS, err := h.fetchSecret(ctx, &repositoryServer.Spec.Server.TLSSecretRef)
if err != nil {
return err
}
serverUserAccess, err := h.fetchSecret(ctx, repositoryServer.Spec.Server.UserAccess.UserAccessSecretRef)
serverUserAccess, err := h.fetchSecret(ctx, &repositoryServer.Spec.Server.UserAccess.UserAccessSecretRef)
if err != nil {
return err
}
Expand All @@ -74,7 +74,11 @@ func (h *RepoServerHandler) getSecretsFromCR(ctx context.Context) error {
return nil
}

func (h *RepoServerHandler) fetchSecret(ctx context.Context, ref corev1.SecretReference) (*corev1.Secret, error) {
func (h *RepoServerHandler) fetchSecret(ctx context.Context, ref *corev1.SecretReference) (*corev1.Secret, error) {
if ref == nil {
return nil, errors.New("repository server CR does not have a secret reference set")
}

h.Logger.Info(fmt.Sprintf("Fetching secret %s from namespace %s", ref.Name, ref.Namespace))
secret := corev1.Secret{}
err := h.Reconciler.Get(ctx, types.NamespacedName{Name: ref.Name, Namespace: ref.Namespace}, &secret)
Expand Down