diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5ab540cc..ac56827f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -539,6 +539,27 @@ release: - if: "$JOB_RELEASE_ENABLED != 'false' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH" when: "on_success" script: + - > + export RELEASE_VERSION=$(semantic-release --dry-run --branches $CI_COMMIT_REF_NAME --plugins + "@semantic-release/gitlab" | grep -oP "Published release [0-9]+\.[0-9]+\.[0-9]+ on" | + grep -oP "[0-9]+\.[0-9]+\.[0-9]+") + - | + if [ -z "${RELEASE_VERSION}" ]; then + echo "RELEASE_VERSION=$(git describe --tags --abbrev=0 | sed s@^v@@g )" + else + echo "RELEASE_VERSION=${RELEASE_VERSION}" + fi + - | + echo -e "\n[INFO] Writing data to helm value file..." + cat <helmfile/environments/default/global.generated.yaml + # SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS" + # SPDX-License-Identifier: Apache-2.0 + --- + global: + systemInformation: + releaseVersion: "v$(echo -E "$RELEASE_VERSION")" + ... + EOF - | cat << 'EOF' > ${CI_PROJECT_DIR}/.releaserc { @@ -557,7 +578,7 @@ release: "@semantic-release/release-notes-generator", "@semantic-release/changelog", ["@semantic-release/git", { - "assets": ["charts/**/Chart.yaml", "CHANGELOG.md", "charts/**/README.md"], + "assets": ["charts/**/Chart.yaml", "CHANGELOG.md", "charts/**/README.md", "helmfile/environments/default/global.generated.yaml"], "message": "chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}" }] ] diff --git a/helmfile/apps/univention-management-stack/values-stack-data-swp.gotmpl b/helmfile/apps/univention-management-stack/values-stack-data-swp.gotmpl index 3d9d646a..92bd00ca 100644 --- a/helmfile/apps/univention-management-stack/values-stack-data-swp.gotmpl +++ b/helmfile/apps/univention-management-stack/values-stack-data-swp.gotmpl @@ -5,6 +5,9 @@ SPDX-License-Identifier: Apache-2.0 --- stackDataSwp: udmApiPassword: {{ .Values.secrets.univentionManagementStack.ldapSecret | quote }} + systemInformation: + deployDate: "Deployed: {{ now | date "2006-01-02T15:04:05-0700" }}" + releaseVersion: "Release: {{ .Values.global.systemInformation.releaseVersion }}" stackDataContext: ldapSearchUsers: diff --git a/helmfile/environments/default/global.generated.yaml b/helmfile/environments/default/global.generated.yaml new file mode 100644 index 00000000..719e296a --- /dev/null +++ b/helmfile/environments/default/global.generated.yaml @@ -0,0 +1,7 @@ +# SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS" +# SPDX-License-Identifier: Apache-2.0 +--- +global: + systemInformation: + releaseVersion: "v0.5.73" +... diff --git a/helmfile/environments/default/images.yaml b/helmfile/environments/default/images.yaml index a368e403..e2de2e42 100644 --- a/helmfile/environments/default/images.yaml +++ b/helmfile/environments/default/images.yaml @@ -50,6 +50,8 @@ images: repository: "bmi/opendesk/components/supplier/nordeck/images/opendesk-element-web" tag: "1.8.2@sha256:0595292e824c039e9c088a845b3d49c6be93d46f9f99090783eb20cb1fc27227" # @supplier: "Element" + # @mirrorFilter: '^(\d+)\.(\d+)\.(\d+)$' + # @mirrorFrom: ['1', '8', '0'] freshclam: # renovate: # upstreamRegistry=docker.io @@ -573,7 +575,7 @@ images: # dependencyType=supplier registry: "registry.opencode.de" repository: "bmi/opendesk/components/supplier/univention/images-mirror/data-loader" - tag: "0.39.5@sha256:01370139fd682a20f42e7b9b7f269c5bb8e0f9a392e0119135c88abbf2c5616c" + tag: "0.41.5@sha256:9978e5eae3846e3c32effb2e602136d8855aaec287fb280a54b311defab2fbf3" # @supplier: "Univention" # @mirrorFilter: '^(\d+)\.(\d+)\.(\d+)$' # @mirrorFrom: ['0', '39', '5']