Feature/151 use ecosystem core #152
Open
+252
−105
Conversation
This file contains hidden or 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
added 30 commits
October 30, 2025 09:28
added 21 commits
November 3, 2025 13:40
added 7 commits
November 10, 2025 09:47
kahoona77
reviewed
Nov 27, 2025
Contributor
kahoona77
left a comment
kahoona77
left a comment
There was a problem hiding this comment.
Nice work 💯
I have a few questions and suggestions.
And we should also Update the Readme.md on how to use the k3d-setup now
| * override component versions | ||
| */ | ||
| static void setComponentVersions(String dogu_op = VERSION_K8S_DOGU_OPERATOR, String dogu_op_crd = VERSION_K8S_DOGU_OPERATOR_CRD, String blue_op = VERSION_K8S_BLUEPRINT_OPERATOR, String blue_op_crd = VERSION_K8S_BLUEPRINT_OPERATOR_CRD) { | ||
| if (dogu_op != null) { |
Contributor
There was a problem hiding this comment.
can this be null, if the parameter has a default-value above?
|
|
||
| yqEvalYamlFile(K3D_VALUES_YAML_FILE, ".components.k8s-ces-control.disabled = true") | ||
|
|
||
| yqEvalYamlFile(K3D_VALUES_YAML_FILE, ".components.k8s-blueprint-operator.valuesObject.healthConfig.components.required = [{\\\"name\\\": \\\"k8s-dogu-operator\\\"}, {\\\"name\\\": \\\"k8s-service-discovery\\\"}]") |
Contributor
There was a problem hiding this comment.
Should no longer be needed
Suggested change
| yqEvalYamlFile(K3D_VALUES_YAML_FILE, ".components.k8s-blueprint-operator.valuesObject.healthConfig.components.required = [{\\\"name\\\": \\\"k8s-dogu-operator\\\"}, {\\\"name\\\": \\\"k8s-service-discovery\\\"}]") |
Comment on lines
314
to
324
| void configureSetupImage(String image) { | ||
| String hostKey = ".setup.image.registry" | ||
| String repositoryKey = ".setup.image.repository" | ||
| String tagKey = ".setup.image.tag" | ||
| def repositorySeparatorIndex = image.indexOf("/") | ||
| def tagSeparatorIndex = image.lastIndexOf(":") | ||
|
|
||
| appendToYamlFile(K3D_VALUES_YAML_FILE, hostKey, image.substring(0, repositorySeparatorIndex)) | ||
| appendToYamlFile(K3D_VALUES_YAML_FILE, repositoryKey, image.substring(repositorySeparatorIndex + 1, tagSeparatorIndex)) | ||
| appendToYamlFile(K3D_VALUES_YAML_FILE, tagKey, image.substring(tagSeparatorIndex + 1, image.length())) | ||
| } |
Comment on lines
326
to
337
| void configureComponentOperatorVersion(String operatorVersion, String crdVersion = operatorVersion, String namespace = "k8s") { | ||
| String componentOpKey = ".component_operator_chart" | ||
| String componentCRDKey = ".component_operator_crd_chart" | ||
|
|
||
|
|
||
| def builder = new StringBuilder(namespace) | ||
| String operatorValue = builder.append("/k8s-component-operator:").append(operatorVersion).toString() | ||
| appendToYamlFile(K3D_VALUES_YAML_FILE, componentOpKey, operatorValue) | ||
| builder.delete(0, builder.length()); | ||
| String crdValue = builder.append(namespace).append("/k8s-component-operator-crd:").append(crdVersion).toString() | ||
| appendToYamlFile(K3D_VALUES_YAML_FILE, componentCRDKey, crdValue) | ||
| } |
Contributor
There was a problem hiding this comment.
This will not work any-longer. The component-operator version is tied to the ecosystem-core Chart.
I think this function can be removed
Comment on lines
357
to
359
| void configureLogLevel(String loglevel) { | ||
| appendToYamlFile(K3D_VALUES_YAML_FILE, ".logLevel", loglevel) | ||
| } |
Contributor
There was a problem hiding this comment.
Suggested change
there is no option for the logLevel in the ecosystem-core Chart
|
|
||
| kubectl("apply -f ${K3D_BLUEPRINT_FILE} --namespace default") | ||
|
|
||
| script.echo "Wait for setup-finisher to be executed..." |
Contributor
There was a problem hiding this comment.
Suggested change
| script.echo "Wait for setup-finisher to be executed..." | |
| script.echo "Wait for blueprint to be ready..." |
Maybe also change the name if the function
Comment on lines
413
to
418
| * Installs the setup to the cluster. Creates an example setup.json with usermgt as dogu and executes the setup. | ||
| * After that the method will wait until the dogu-operator is ready. | ||
| * @param tag Tag of the setup e. g. "v0.6.0" | ||
| * @param timout Timeout in seconds for the setup process e. g. 300 | ||
| * @param interval Interval in seconds for querying the actual state of the setup e. g. 2 | ||
| */ |
Contributor
There was a problem hiding this comment.
This still mentions the setup. Should be ecosystem-core and blueprint
Comment on lines
+671
to
+673
| String tags = "{}"; | ||
| script.withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: this.backendCredentialsID, usernameVariable: 'TOKEN_ID', passwordVariable: 'TOKEN_SECRET']]) { | ||
| tags = this.sh.returnStdOut("curl https://registry.cloudogu.com/v2/${parts[0]}/tags/list -u ${script.env.TOKEN_ID}:${script.env.TOKEN_SECRET}").trim() |
Contributor
There was a problem hiding this comment.
Maybe put this part in a small function
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.
Use ecosystem-core values and blueprint.yaml to create cluster in k3d