Add acceptance test for bug #810 and update how secret names are generated #1066
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…rated so the same app automation manifests will work across clusters
jrryjcksn
force-pushed
the
add-integration-test-for-multi-cluster-app-bug-810
branch
from
9268655
to
002c369
Compare
jpellizzari
approved these changes
Nov 12, 2021
| @@ -268,7 +268,7 @@ var _ = Describe("Add Gitlab", func() { | |||
| Expect(name).To(Equal("bar")) | |||
| Expect(url.String()).To(Equal("ssh://git@gitlab.com/foo/bar.git")) | |||
| Expect(branch).To(Equal("main")) | |||
| Expect(secretRef).To(Equal("wego-test-cluster-bar")) | |||
| Expect(secretRef).To(Equal("wego-gitlab-bar")) | |||
pkg/services/automation/generator.go
Outdated
| func CreateRepoSecretName(targetName string, gitSourceURL gitproviders.RepoURL) GeneratedSecretName { | ||
| return GeneratedSecretName(hashNameIfTooLong(fmt.Sprintf("wego-%s-%s", targetName, GenerateResourceName(gitSourceURL)))) | ||
| func CreateRepoSecretName(gitSourceURL gitproviders.RepoURL) GeneratedSecretName { | ||
| return GeneratedSecretName(hashNameIfTooLong(fmt.Sprintf("wego-%s-%s", string(gitSourceURL.Provider()), replaceUnderscores(gitSourceURL.RepositoryName())))) |
There was a problem hiding this comment.
💡 This is getting a little tough to read. Can we break this up with some variable names to demystify it a bit:
Suggested change
| return GeneratedSecretName(hashNameIfTooLong(fmt.Sprintf("wego-%s-%s", string(gitSourceURL.Provider()), replaceUnderscores(gitSourceURL.RepositoryName())))) | |
| provder := gitSourceURL.Provider() | |
| cleanRepoName := replaceUnderscores(gitSourceURL.RepositoryName()) | |
| baseName := fmt.Sprintf("wego-%s-%s", provider, cleanRepoName) | |
| nameOrHash := hashNameIfTooLong(baseName) | |
| return GeneratedSecretName(nameOrHash) |
Not terribly elegant but it might make it easier to understand what's happening.
jrryjcksn
deleted the
add-integration-test-for-multi-cluster-app-bug-810
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes: #810
What changed?
In the past, we attempted to remove deploy keys that were no longer being used so we included the cluster name in the deploy key name (allowing the deploy key for a single cluster to be removed while leaving others intact). We no longer remove deploy keys and all generated deploy keys have the same name:
wego-deploy-key. The name genericizing (generification?) process was never extended to the secret names themselves, however, which still included cluster names. This caused no problems until we started trying to deploy an application into multiple clusters from the same repository. Initial testing of the multi-cluster scenario used two applications in the same repository (one with path./and one with another path). This worked because the applications did not share automation manifests. With a single application, though, we only have one copy of each automation manifest and aGitRepositorymanifest for a private repository contains a name reference to the secret. If the secret name includes the cluster name, deployment to one of the clusters will fail as theGitRepositorymanifest will have one or the other secret name. This PR removes the cluster name from a generated secret name.Why?
To allow a single application to be deployed to multiple clusters from a common source repository.
How did you test it?
Manual tests and new acceptance test
Release notes
No, since we don't currently claim to support multi-cluster
Documentation Changes
No, since we don't discuss the secrets in the current documentation.