allow custom user renovate configs, in config maps, #372
+412
−171
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
rcerven
changed the title
rcerven
force-pushed
the
renovatecustomconfig
branch
from
bd6ce32
to
1e6cad7
Compare
there can be one global one for all components, and also custom config for specific components we are also now creating renovate config in json format STONEBLD-2916 Signed-off-by: Robert Cerven <[email protected]>
rcerven
force-pushed
the
renovatecustomconfig
branch
from
1e6cad7
to
160da4d
Compare
rcerven
changed the title
tnevrlka
reviewed
Nov 15, 2024
Comment on lines
394
to
396
| randomStr1 := RandomString(5) | ||
| randomStr2 := RandomString(10) | ||
| randomStr3 := RandomString(10) |
There was a problem hiding this comment.
Would it be possible to use more descriptive names for these variables?
Comment on lines
+412
to
+422
| if globalConfigString != "" || componentConfigString != "" { | ||
| if componentConfigString != "" { | ||
| configString = componentConfigString | ||
| configType = componentConfigType | ||
| log.Info("will use custom renovate config for component", "name", componentConfigName, "type", configType) | ||
| } else { | ||
| configString = globalConfigString | ||
| configType = globalConfigType | ||
| log.Info("will use custom global renovate config", "name", GlobalRenovateConfigName, "type", configType) | ||
| } | ||
|
|
There was a problem hiding this comment.
Suggested change
| if globalConfigString != "" || componentConfigString != "" { | |
| if componentConfigString != "" { | |
| configString = componentConfigString | |
| configType = componentConfigType | |
| log.Info("will use custom renovate config for component", "name", componentConfigName, "type", configType) | |
| } else { | |
| configString = globalConfigString | |
| configType = globalConfigType | |
| log.Info("will use custom global renovate config", "name", GlobalRenovateConfigName, "type", configType) | |
| } | |
| if componentConfigString != "" { | |
| configString = componentConfigString | |
| configType = componentConfigType | |
| log.Info("will use custom renovate config for component", "name", componentConfigName, "type", configType) | |
| } else if globalConfigString != "" { | |
| configString = globalConfigString | |
| configType = globalConfigType | |
| log.Info("will use custom global renovate config", "name", GlobalRenovateConfigName, "type", configType) |
| matchStrings = append(matchStrings, buildResult.BuiltImageRepository+"(:.*)?@(?<currentDigest>sha256:[a-f0-9]+)") | ||
| matchPackageNames = append(matchPackageNames, buildResult.BuiltImageRepository) | ||
|
|
||
| for _, drepositiry := range buildResult.DistributionRepositories { |
There was a problem hiding this comment.
typo: drepositiry -> drepository
| @@ -245,6 +240,8 @@ var _ = Describe("Component nudge controller", func() { | |||
|
|
|||
| renovatePipelines := getRenovatePipelineRunList() | |||
| Expect(len(renovatePipelines)).Should(Equal(1)) | |||
| renovateCommand := strings.Join(renovatePipelines[0].Spec.PipelineSpec.Tasks[0].TaskSpec.Steps[0].Command, ";") | |||
| Expect(strings.Contains(renovateCommand, `'username':'image_repo_username'`)).Should(BeTrue()) | |||
There was a problem hiding this comment.
fyi there are Gomega matchers like HaveLen() and replacements for strings like ContainSubstring() and HaveSuffix() which make the Expects a bit easier to read
Expect(renovateCommand).To(ContainSubstring(\'username':'image_repo_username'\`))
Comment on lines
+457
to
+465
| customConfigName := fmt.Sprintf("nudging-renovate-config-%s", Operator1) | ||
| customConfigMapName1 := types.NamespacedName{Namespace: UserNamespace, Name: customConfigName} | ||
| customConfigString := `{"username":"componentconfiguserjs"}` | ||
| customConfigMapData := map[string]string{ConfigKeyJs: customConfigString} | ||
| createCustomRenovateConfigMap(customConfigMapName1, customConfigMapData) | ||
| customConfigName = fmt.Sprintf("nudging-renovate-config-%s", Operator2) | ||
| customConfigMapName2 := types.NamespacedName{Namespace: UserNamespace, Name: customConfigName} | ||
| createCustomRenovateConfigMap(customConfigMapName2, customConfigMapData) | ||
| customConfigType := "js" |
There was a problem hiding this comment.
The test setups are a bit hard to read. Could you separate the ConfigMaps by linebreaks?
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.
there can be one global one for all components, and also custom config for specific components
we are also now creating renovate config in json format
STONEBLD-2916
Checklist:
make testpasses