Feature/151 use ecosystem core #152
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,6 +1,7 @@ | ||||||
| package com.cloudogu.ces.cesbuildlib | ||||||
|
|
||||||
| import com.cloudbees.groovy.cps.NonCPS | ||||||
| import groovy.json.JsonSlurper | ||||||
|
|
||||||
| class K3d { | ||||||
| /** | ||||||
|
|
@@ -12,10 +13,17 @@ class K3d { | |||||
| */ | ||||||
| private static String K3D_VERSION = "5.6.0" | ||||||
| private static String K3D_LOG_FILENAME = "k8sLogs" | ||||||
| private static String K3D_VALUES_YAML_FILE = "k3d_values.yaml" | ||||||
| private static String K3D_BLUEPRINT_FILE = "k3d_blueprint.yaml" | ||||||
| private static String YQ_VERSION = "4.40.5" | ||||||
|
|
||||||
| private static String VERSION_ECOSYSTEM_CORE = "1.2.0" | ||||||
| private static String VERSION_K8s_COMPONENT_OPERATOR_CRD = "1.10.1" | ||||||
| private static String VERSION_K8S_DOGU_OPERATOR = "3.15.0" | ||||||
| private static String VERSION_K8S_DOGU_OPERATOR_CRD = "2.10.0" | ||||||
| private static String VERSION_K8S_BLUEPRINT_OPERATOR = "3.0.2" | ||||||
| private static String VERSION_K8S_BLUEPRINT_OPERATOR_CRD = "3.1.0" | ||||||
|
|
||||||
| private String clusterName | ||||||
| private script | ||||||
| private String path | ||||||
|
|
@@ -36,14 +44,14 @@ class K3d { | |||||
| adminGroup : "CesAdministrators", | ||||||
| dependencies : ["official/ldap", | ||||||
| "official/cas", | ||||||
| "official/postfix", | ||||||
| "official/usermgt"], | ||||||
| defaultDogu : "", | ||||||
| additionalDependencies : [], | ||||||
| registryConfig : "", | ||||||
| registryConfigEncrypted: "", | ||||||
| "enableBackup" : false, | ||||||
| "enableMonitoring" : false | ||||||
| ] | ||||||
|
|
||||||
| String getRegistryName() { | ||||||
|
|
@@ -254,15 +262,53 @@ class K3d { | |||||
| } | ||||||
| } | ||||||
|
|
||||||
| /** | ||||||
| * 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) { | ||||||
| VERSION_K8S_DOGU_OPERATOR = dogu_op | ||||||
| } | ||||||
| if (dogu_op_crd != null) { | ||||||
| VERSION_K8S_DOGU_OPERATOR_CRD = dogu_op_crd | ||||||
| } | ||||||
| if (blue_op != null) { | ||||||
| VERSION_K8S_BLUEPRINT_OPERATOR = blue_op | ||||||
| } | ||||||
| if (blue_op_crd != null) { | ||||||
| VERSION_K8S_BLUEPRINT_OPERATOR_CRD = blue_op_crd | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| void configureEcosystemCoreValues(config = [:]) { | ||||||
| // Merge default config with the one passed as parameter | ||||||
| config = defaultSetupConfig << config | ||||||
|
|
||||||
| yqEvalYamlFile(K3D_VALUES_YAML_FILE, ".defaultConfig.env.waitTimeoutMinutes = 5") | ||||||
| appendToYamlFile(K3D_VALUES_YAML_FILE, ".components.k8s-dogu-operator-crd.version", VERSION_K8S_DOGU_OPERATOR_CRD) | ||||||
| appendToYamlFile(K3D_VALUES_YAML_FILE, ".components.k8s-dogu-operator.version", VERSION_K8S_DOGU_OPERATOR) | ||||||
|
|
||||||
| appendToYamlFile(K3D_VALUES_YAML_FILE, ".components.k8s-blueprint-operator-crd.version", VERSION_K8S_BLUEPRINT_OPERATOR_CRD) | ||||||
| appendToYamlFile(K3D_VALUES_YAML_FILE, ".components.k8s-blueprint-operator.version", VERSION_K8S_BLUEPRINT_OPERATOR) | ||||||
|
|
||||||
| 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
|
||||||
|
|
||||||
|
|
||||||
| appendToYamlFile(K3D_VALUES_YAML_FILE, ".components.k8s-service-discovery.valuesObject.loadBalancerService.internalTrafficPolicy", "Cluster") | ||||||
| appendToYamlFile(K3D_VALUES_YAML_FILE, ".components.k8s-service-discovery.valuesObject.loadBalancerService.externalTrafficPolicy", "Cluster") | ||||||
|
|
||||||
| yqEvalYamlFile(K3D_VALUES_YAML_FILE, ".backup.enabled = ${config.enableBackup}") | ||||||
| yqEvalYamlFile(K3D_VALUES_YAML_FILE, ".monitoring.enabled = ${config.enableMonitoring}") | ||||||
|
|
||||||
| script.echo "configuring ecosystem core..." | ||||||
| writeBlueprintYaml(config) | ||||||
| } | ||||||
|
|
||||||
| @Deprecated | ||||||
| void configureSetupJson(config = [:]) { | ||||||
| configureEcosystemCoreValues(config) | ||||||
| } | ||||||
|
|
||||||
| void configureSetupImage(String image) { | ||||||
|
|
@@ -320,22 +366,30 @@ class K3d { | |||||
| helm("registry login ${registryUrl} --username '${script.env.HARBOR_USERNAME}' --password '${script.env.HARBOR_PASSWORD}'") | ||||||
| } | ||||||
|
|
||||||
| // install crd first | ||||||
| helm("install k8s-component-operator-crd oci://${registryUrl}/${registryNamespace}/k8s-component-operator-crd --version ${VERSION_K8s_COMPONENT_OPERATOR_CRD} --namespace default") | ||||||
|
|
||||||
| kubectl("--namespace default create configmap global-config --from-literal=config.yaml='fqdn: ${externalIP}'") | ||||||
|
|
||||||
| helm("install -f ${K3D_VALUES_YAML_FILE} ecosystem-core oci://${registryUrl}/${registryNamespace}/ecosystem-core --version ${VERSION_ECOSYSTEM_CORE} --namespace default --timeout 15m") | ||||||
|
|
||||||
| script.echo "Wait for blueprint-operator to be ready..." | ||||||
| waitForDeploymentRollout("k8s-blueprint-operator-controller-manager", timeout, interval) | ||||||
|
|
||||||
| 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
Maybe also change the name if the function |
||||||
| waitForSetupToFinish(timeout, interval) | ||||||
|
|
||||||
| script.echo "Wait for dogus to be ready..." | ||||||
| waitForDogusToBeRolledOut(timeout, interval) | ||||||
|
|
||||||
| helm("registry logout ${registryUrl}") | ||||||
| } | ||||||
|
|
||||||
| void waitForDogusToBeRolledOut(Integer timeout, Integer interval) { | ||||||
| String dogus = kubectl("get dogus --template '{{range .items}}{{.metadata.name}}{{\"\\n\"}}{{end}}'", true) | ||||||
| String[] doguList = dogus.trim().split("\n") | ||||||
| for (String dogu : doguList) { | ||||||
| script.echo "Wait for $dogu to be rolled out..." | ||||||
| waitForDeploymentRollout(dogu, timeout, interval) | ||||||
|
|
@@ -345,13 +399,14 @@ class K3d { | |||||
| void waitForSetupToFinish(Integer timeout, Integer interval) { | ||||||
| for (int i = 0; i < timeout / interval; i++) { | ||||||
| script.sh("sleep ${interval}s") | ||||||
| String blueprintReady = kubectl("get blueprint -n=default blueprint-ces-module -o jsonpath='{.status.conditions[?(@.type==\"EcosystemHealthy\")].status}{\" \"}{.status.conditions[?(@.type==\"Completed\")].status}'", true) | ||||||
| script.echo blueprintReady | ||||||
| if (blueprintReady == "True True") { | ||||||
| return | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| this.script.error "failed to wait for ecosystem-core setup to finish: timeout" | ||||||
| } | ||||||
|
|
||||||
| /** | ||||||
|
|
@@ -363,7 +418,7 @@ class K3d { | |||||
| */ | ||||||
| void setup(String tag, config = [:], Integer timout = 300, Integer interval = 5) { | ||||||
| assignExternalIP() | ||||||
| configureEcosystemCoreValues(config) | ||||||
| installAndTriggerSetup(tag, timout, interval) | ||||||
| } | ||||||
|
|
||||||
|
|
@@ -606,66 +661,90 @@ data: | |||||
| return [registryIp, registryPort] | ||||||
| } | ||||||
|
|
||||||
| String formatDependencies(List<String> deps) { | ||||||
| String formatted = "" | ||||||
| for (int i = 0; i < deps.size(); i++) { | ||||||
| String[] parts = deps[i].split(":") | ||||||
| String version; | ||||||
| // "latest" needs to be replaced with actual last version | ||||||
| if (parts.length != 2 || parts[1] == "latest") { | ||||||
| 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() | ||||||
|
Comment on lines
+671
to
+673
Contributor
There was a problem hiding this comment. Maybe put this part in a small function |
||||||
| } | ||||||
| def obj = new JsonSlurper().parseText(tags) | ||||||
| version = obj.tags.max { t -> parseTag("${t}") } | ||||||
| } else { | ||||||
| version = parts[1] | ||||||
| } | ||||||
| formatted += " - name: ${parts[0]}\n" + | ||||||
| " version: ${version}" | ||||||
| if ((i + 1) < deps.size()) { | ||||||
| formatted += '\n' | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| return formatted | ||||||
| } | ||||||
|
|
||||||
| private String parseTag(String tag) { | ||||||
| def m = (tag =~ /^(\d+)(?:\.(\d+))?(?:\.(\d+))?(?:-(\d+))?$/) | ||||||
| if (!m.matches()) { | ||||||
| // Fallback: set all to 0 to ingnore invalid tags | ||||||
| return "00000.00000.00000.00000" | ||||||
| } | ||||||
| def major = (m[0][1] ?: "0") as int | ||||||
| def minor = (m[0][2] ?: "0") as int | ||||||
| def patch = (m[0][3] ?: "0") as int | ||||||
| def build = (m[0][4] ?: "0") as int | ||||||
|
|
||||||
| // Zero-padding → lexicographically sortable | ||||||
| return sprintf("%05d.%05d.%05d.%05d", major, minor, patch, build) | ||||||
| } | ||||||
|
|
||||||
| private void writeBlueprintYaml(config) { | ||||||
| List<String> deps = config.dependencies + config.additionalDependencies | ||||||
| String formattedDeps = formatDependencies(deps) | ||||||
| script.writeFile file: K3D_BLUEPRINT_FILE, text: """ | ||||||
| apiVersion: k8s.cloudogu.com/v3 | ||||||
| kind: Blueprint | ||||||
| metadata: | ||||||
| labels: | ||||||
| app: ces | ||||||
| app.kubernetes.io/name: k8s-blueprint-lib | ||||||
| name: blueprint-ces-module | ||||||
| namespace: default | ||||||
| spec: | ||||||
| displayName: "Blueprint K3D CES-Module" | ||||||
| blueprint: | ||||||
| dogus: | ||||||
| ${formattedDeps} | ||||||
| config: | ||||||
| dogus: | ||||||
| ldap: | ||||||
| - key: admin_username | ||||||
| value: "${config.adminUsername}" | ||||||
| - key: admin_mail | ||||||
| value: "[email protected]" | ||||||
| - key: admin_member | ||||||
| value: "true" | ||||||
| - key: admin_password | ||||||
| value: "${config.adminPassword}" | ||||||
| global: | ||||||
| - key: fqdn | ||||||
| value: "${externalIP}" | ||||||
| - key: domain | ||||||
| value: "ces.local" | ||||||
| - key: certificate/type | ||||||
| value: "selfsigned" | ||||||
| - key: k8s/use_internal_ip | ||||||
| value: "false" | ||||||
| - key: internalIp | ||||||
| value: "" | ||||||
| - key: admin_group | ||||||
| value: "${config.adminGroup}" | ||||||
| """ | ||||||
| } | ||||||
|
|
||||||
| /** | ||||||
| * Collects all necessary resources and log information used to identify problems with our kubernetes cluster. | ||||||
|
|
@@ -677,7 +756,9 @@ data: | |||||
| script.deleteDir() | ||||||
| } | ||||||
| script.sh("rm -rf ${K3D_LOG_FILENAME}.zip".toString()) | ||||||
| script.archiveArtifacts(artifacts: K3D_BLUEPRINT_FILE) | ||||||
| script.sh("rm -rf ${K3D_BLUEPRINT_FILE}".toString()) | ||||||
| script.archiveArtifacts(artifacts: K3D_VALUES_YAML_FILE) | ||||||
| script.sh("rm -rf ${K3D_VALUES_YAML_FILE}".toString()) | ||||||
|
|
||||||
| collectResourcesSummaries() | ||||||
|
|
||||||
Oops, something went wrong.
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 was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can this be null, if the parameter has a default-value above?