e2e: refactor cluster setup in env #1941
Open
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
|
@parikshithb do we an issue for this? if not create an link it here. |
nirs
reviewed
Mar 18, 2025
This change improves structure and reduces code duplication for c1 and c2 by refactoring the New function in env by adding separate helper functions: - `setupHub` to initialize the hub cluster. - `setupManagedClusters` to initialize managed clusters (c1 and c2). Signed-off-by: Parikshith <[email protected]>
parikshithb
force-pushed
the
e2e_refa_env
branch
from
52dfc34 to
6daf3f9
Compare
nirs
reviewed
Mar 21, 2025
| env.Hub.Name = defaultHubClusterName | ||
| log.Infof("Cluster \"hub\" name not set, using default name %q", defaultHubClusterName) | ||
| if err := setupHub(&env.Hub, config.Clusters["hub"], defaultHubClusterName, log); err != nil { | ||
| return nil, fmt.Errorf("failed to setup hub cluster \"hub\": %w", err) |
There was a problem hiding this comment.
Can we create the error inside setupHub? It has the context we add here. The context this function can add is "failed to create env".
If we add the context in setupXXX functions, we don't need to repeat it here like we do for the managed clusters.
|
|
||
| func setupHub( | ||
| cluster *types.Cluster, clusterConfig types.ClusterConfig, | ||
| defaultName string, log *zap.SugaredLogger, |
There was a problem hiding this comment.
If we cannot fit the arguments in one line, use one line per argument. Your editor probably provide this formatting option.
| if err != nil { | ||
| return nil, fmt.Errorf("failed to create clients for c1 cluster: %w", err) | ||
| return fmt.Errorf("failed to create client for hub cluster: %w", err) |
There was a problem hiding this comment.
This error can come from setupClient, here can can the context of this function ("failed to setup hub").
| } | ||
|
|
||
| env.C1.Kubeconfig = config.Clusters["c1"].Kubeconfig | ||
| cluster.Kubeconfig = clusterConfig.Kubeconfig |
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.
This change improves structure and reduces code duplication for c1 and c2 by refactoring the New function in env by adding separate helper functions:
setupHubto initialize the hub cluster.setupManagedClustersto initialize managed clusters (c1 and c2).Fixes #1950