Skip to content

Commit 372988c

Browse files
nroeskecesmarvin
authored andcommitted
Merge branch 'release/v1.1.0'
2 parents 2087425 + 764480e commit 372988c

File tree

6 files changed

+43
-18
lines changed

6 files changed

+43
-18
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased]
88

9+
## [v1.1.0] - 2025-11-11
10+
### Changed
11+
- [#18] Allow global property at root level. With this change, other charts can use this chart as a dependency.
12+
- [#19] Update components to the newest versions
13+
914
## [v1.0.0] - 2025-11-07
1015
### Changed
1116
- [#22] update component operator dependency

Jenkinsfile

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,25 +94,39 @@ node('docker') {
9494
stage('Deploy ecosystem-core') {
9595
withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: 'harborhelmchartpush', usernameVariable: 'HARBOR_USERNAME', passwordVariable: 'HARBOR_PASSWORD']]) {
9696
k3d.helm("registry login ${registryUrl} --username '${HARBOR_USERNAME}' --password '${HARBOR_PASSWORD}'")
97-
k3d.helm("install k8s-component-operator-crd oci://registry.cloudogu.com/k8s/k8s-component-operator-crd --version 1.10.0")
97+
k3d.helm("install k8s-component-operator-crd oci://registry.cloudogu.com/k8s/k8s-component-operator-crd --version 1.13.0")
9898
k3d.helm("registry logout ${registryUrl}")
9999

100100
k3d.assignExternalIP()
101101
k3d.kubectl("--namespace default create configmap global-config --from-literal=config.yaml='fqdn: ${k3d.@externalIP}'")
102102

103-
k3d.helm("install ${repositoryName} ${helmChartDir}")
103+
k3d.helm("install ${repositoryName} ${helmChartDir} " +
104+
"--set monitoring.components.k8s-prometheus.valuesObject.kube-prometheus-stack.nodeExporter.enabled=false " +
105+
"--set backup.components.k8s-snapshot-controller.disabled=false --set backup.components.k8s-snapshot-controller-crd.disabled=false " +
106+
"--set-json='monitoring.components.k8s-promtail.valuesObject.promtail.config.clients=[{\"url\": \"http://k8s-loki-gateway.default.svc.cluster.local/loki/api/v1/push\", \"basic_auth\": {\"username\": \"\${LOKI_USERNAME}\", \"password\": \"\${LOKI_PASSWORD}\"}}]'")
104107
}
105108
}
106109

107110
stage('Test ecosystem-core') {
108111
// Labels we wait for
109112
def labels = [
110113
"app.kubernetes.io/name=k8s-component-operator",
114+
"k8s.cloudogu.com/component.name=k8s-minio",
115+
"k8s.cloudogu.com/component.name=k8s-loki",
116+
"k8s.cloudogu.com/component.name=k8s-snapshot-controller",
117+
"k8s.cloudogu.com/component.name=k8s-velero",
118+
"k8s.cloudogu.com/component.name=k8s-ces-control",
119+
"k8s.cloudogu.com/component.name=k8s-promtail",
120+
"k8s.cloudogu.com/component.name=k8s-alloy",
111121
"k8s.cloudogu.com/component.name=k8s-dogu-operator",
112122
"k8s.cloudogu.com/component.name=k8s-service-discovery",
113123
"k8s.cloudogu.com/component.name=k8s-blueprint-operator",
114124
"k8s.cloudogu.com/component.name=k8s-ces-gateway",
115-
"k8s.cloudogu.com/component.name=k8s-ces-assets"
125+
"k8s.cloudogu.com/component.name=k8s-ces-assets",
126+
"k8s.cloudogu.com/component.name=k8s-debug-mode-operator",
127+
"k8s.cloudogu.com/component.name=k8s-backup-operator",
128+
"k8s.cloudogu.com/component.name=k8s-prometheus",
129+
"k8s.cloudogu.com/component.name=k8s-support-archive-operator"
116130
]
117131

118132
// Timeout (same for all, adjust as needed)

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
ARTIFACT_ID=ecosystem-core
33
ARTIFACT_ID_DEFAULT_CONFIG=${ARTIFACT_ID}-default-config
44

5-
VERSION=1.0.0
5+
VERSION=1.1.0
66
GOTAG?=1.25.1
77

88
ADDITIONAL_CLEAN=clean_charts

k8s/helm/component-patch-tpl.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v1
22
values:
33
images:
44
componentOperator: cloudogu/k8s-component-operator:1.12.0
5-
defaultConfig: cloudogu/ecosystem-core-default-config:1.0.0
5+
defaultConfig: cloudogu/ecosystem-core-default-config:1.1.0
66
kubectl: docker.io/alpine/kubectl:1.34.0
77
patches:
88
values.yaml:

k8s/helm/values.schema.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
}
5353
},
5454
"properties": {
55+
"global": { "type": "object" },
5556
"skipPreconditionValidation": {
5657
"type": "boolean",
5758
"description": "Skip validation of preconditions. This is useful for local development or in ArgoCD contexts. Default: false."

k8s/helm/values.yaml

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,44 +20,49 @@ k8s-component-operator:
2020
enabled: true
2121
components:
2222
k8s-dogu-operator-crd:
23-
version: 2.9.0
23+
version: 2.10.0
2424
k8s-dogu-operator:
25-
version: 3.13.0
25+
version: 3.15.0
2626
k8s-service-discovery:
2727
version: 3.0.0
2828
k8s-blueprint-operator-crd:
29-
version: 1.3.0
29+
version: 3.1.0
3030
k8s-blueprint-operator:
31-
version: 2.7.0
31+
version: 3.0.0
3232
k8s-ces-gateway:
3333
version: 1.0.3
3434
k8s-ces-assets:
35-
version: 1.0.2
35+
version: 1.0.3
3636
k8s-ces-control:
37-
disabled: true
38-
version: 1.7.1
37+
version: 1.8.0
3938
k8s-debug-mode-operator-crd:
4039
version: 1.0.0
4140
k8s-debug-mode-operator:
4241
version: 1.0.0
4342
backup:
44-
enabled: false
43+
enabled: true
4544
components:
4645
k8s-backup-operator-crd:
47-
version: 1.6.0
46+
version: 1.7.0
4847
k8s-backup-operator:
49-
version: 1.6.0
48+
version: 2.0.0
5049
k8s-velero:
5150
version: 10.0.1-5
51+
k8s-snapshot-controller:
52+
version: 8.2.1-3
53+
disabled: true
54+
k8s-snapshot-controller-crd:
55+
version: 8.2.1-3
56+
disabled: true
5257
monitoring:
53-
enabled: false
58+
enabled: true
5459
components:
5560
k8s-prometheus:
5661
version: 75.3.5-3
5762
k8s-minio:
5863
version: 2025.6.13-2
5964
k8s-loki:
60-
version: 3.3.2-4
65+
version: 3.3.2-6
6166
k8s-promtail:
6267
version: 2.9.1-9
6368
k8s-alloy:
@@ -76,7 +81,7 @@ defaultConfig:
7681
image:
7782
registry: docker.io
7883
repository: cloudogu/ecosystem-core-default-config
79-
tag: 1.0.0
84+
tag: 1.1.0
8085
imagePullPolicy: IfNotPresent
8186
env:
8287
logLevel: info

0 commit comments

Comments
 (0)