Release 2.4.1 (#117)

.github/workflows/ci-cd.yaml

@@ -146,59 +146,3 @@ jobs:
           make
           osc ar
           osc commit -m "GitHub Actions automated update to reference ${{ github.sha }}"
-
-  obs-commit-scripts:
-    needs: [test-helm-charts]
-    runs-on: ubuntu-20.04
-    if: github.ref == 'refs/heads/main' || github.event_name == 'release'
-    container:
-      image: ghcr.io/trento-project/continuous-delivery:main
-      env:
-        DEST_FOLDER: "/tmp/osc_project"
-        FOLDER: packaging/suse
-      options: -u 0:0
-    strategy:
-      matrix:
-        packages: ["trento-server-installer"]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - uses: actions-ecosystem/action-get-latest-tag@v1
-        id: latest-tag
-        with:
-          semver_only: true
-          initial_version: 0.0.1
-      - name: Configure OSC
-        run: |
-          mkdir -p $HOME/.config/osc
-          cp /home/osc/.config/osc/oscrc $HOME/.config/osc
-          /scripts/init_osc_creds.sh
-      - name: Prepare _service file with version details
-        run: |
-          git config --global --add safe.directory /__w/helm-charts/helm-charts
-          VERSION=$(./hack/get_version_from_git.sh)
-          PACKAGE_FOLDER=$FOLDER/${{ matrix.packages }}
-          sed -i 's~%%REVISION%%~${{ github.sha }}~' $PACKAGE_FOLDER/_service && \
-          sed -i 's~%%VERSION%%~'"${VERSION}"'~' $PACKAGE_FOLDER/_service
-      - name: Prepare OBS package
-        run: |
-          PACKAGE_FOLDER=$FOLDER/${{ matrix.packages }}
-          osc checkout $OBS_PROJECT ${{ matrix.packages }} -o $DEST_FOLDER
-          cp $PACKAGE_FOLDER/_service $DEST_FOLDER
-          cp $PACKAGE_FOLDER/${{ matrix.packages }}.spec $DEST_FOLDER
-          rm $DEST_FOLDER/*.tar.gz
-          pushd $DEST_FOLDER
-          osc service manualrun
-      - name: Prepare .changes file
-        if: github.event_name == 'release'
-        run: |
-          CHANGES_FILE=${{ matrix.packages }}.changes
-          TAG=${{ steps.latest-tag.outputs.tag }}
-          hack/gh_release_to_obs_changeset.py ${{ github.repository }} -a shap-staff@suse.de -t $TAG -f $DEST_FOLDER/$CHANGES_FILE
-      - name: Commit on OBS
-        run: |
-          pushd $DEST_FOLDER
-          osc ar
-          osc commit -m "GitHub Actions automated update to reference ${{ github.sha }}"

charts/trento-server/Chart.yaml

@@ -1,13 +1,13 @@
 # SPDX-License-Identifier: Apache-2.0
-#!BuildTag: trento/trento-server:2.4.0
-#!BuildTag: trento/trento-server:2.4.0-build%RELEASE%
+#!BuildTag: trento/trento-server:2.4.1
+#!BuildTag: trento/trento-server:2.4.1-build%RELEASE%
 apiVersion: v2
 name: trento-server
 description: The trento server chart contains all the components necessary to run a Trento server.
 type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates
-version: 2.4.0
+version: 2.4.1
 
 dependencies:
   - name: trento-web

charts/trento-server/charts/trento-wanda/Chart.yaml

@@ -15,4 +15,4 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.3.1-dev4
+version: 1.4.0

charts/trento-server/charts/trento-wanda/values.yaml

@@ -20,7 +20,19 @@ replicaCount: 1
 image:
   repository: ghcr.io/trento-project/trento-wanda
   pullPolicy: IfNotPresent
-  tag: 1.3.0
+  tag: 1.4.0
+
+postgresql:
+  image:
+    registry: registry.suse.com
+    repository: suse/postgres
+    tag: "14"
+
+checks:
+  image:
+    repository: ghcr.io/trento-project/checks
+    pullPolicy: IfNotPresent
+    tag: 1.0.0
 
 secretKeyBase: ""
 imagePullSecrets: []

charts/trento-server/charts/trento-web/values.yaml

@@ -73,6 +73,12 @@ image:
   pullPolicy: IfNotPresent
   tag: 2.4.0
 
+postgresql:
+  image:
+    registry: registry.suse.com
+    repository: suse/postgres
+    tag: "14"
+
 secretKeyBase: ""
 imagePullSecrets: []
 nameOverride: ""

charts/trento-server/values.yaml

@@ -22,25 +22,10 @@ global:
 trento-web:
   nameOverride: web
   enabled: true
-  postgresql:
-    image:
-      registry: registry.suse.com
-      repository: suse/postgres
-      tag: "14"
 
 trento-wanda:
   nameOverride: wanda
   enabled: true
-  postgresql:
-    image:
-      registry: registry.suse.com
-      repository: suse/postgres
-      tag: "14"
-  checks:
-    image:
-      repository: ghcr.io/trento-project/checks
-      pullPolicy: IfNotPresent
-      tag: 1.0.0
 
 postgresql:
   enabled: true

docs/trento-server.md

@@ -1,20 +1,17 @@
 # Trento Server Helm Chart
 
-# Installation
+## Installation
 
-## Requirements
+### Requirements
 
 The _Trento Server_ is intended to run in many ways, depending on users' already existing infrastructure, but it's designed to be cloud-native and OS agnostic.
 As such, our default installation method provisions a minimal, single node, [K3S] Kubernetes cluster to run its various components in Linux containers.
 The suggested physical resources for running all the _Trento Server_ components are 2GB of RAM and 2 CPU cores.
 The _Trento Server_ needs to reach the target infrastructure.
 
-## Quick-Start installation
+### Quick-start installation
 
-Installation scripts are provided to automatically install and update the latest version of Trento.
-Please follow the instructions in the given order.
-
-### Trento Server installation
+An installation script is provided to quickly get you started by automatically provisioning, installing and updating the latest version of Trento.
 
 The script installs a single node K3s cluster and uses the [trento-server Helm chart](../charts/trento-server)
 to bootstrap a complete Trento server component.
@@ -37,13 +34,13 @@ _Note: if a Trento server is already installed in the host, it will be updated._
 
 Please refer to the [Helm chart](#helm-chart) section for more information about the Helm chart.
 
-## Manual installation
+### Manual installation
 
-## Helm chart
+#### Helm chart
 
 The [charts/trento-server](charts/trento-server) directory contains the Helm chart for installing Trento Server in a Kubernetes cluster.
 
-### Install K3S
+#### Install K3S
 
 If installing as root:
 
@@ -65,7 +62,7 @@ export KUBECONFIG=/etc/rancher/k3s/k3s.yaml
 
 Please refer to the [K3S official documentation](https://rancher.com/docs/k3s/latest/en/installation/) for more information about the installation.
 
-### Install Helm and chart dependencies
+#### Install Helm and chart dependencies
 
 Install Helm:
 
@@ -75,7 +72,7 @@ curl https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bas
 
 Please refer to the [Helm official documentation](https://helm.sh/docs/intro/install/) for more information about the installation.
 
-### Install the Trento Server Helm chart
+#### Install Trento Server
 
 Add third-party Helm repositories:
 
@@ -107,7 +104,7 @@ _Note: be sure to replace trento.example.com with a valid hostname that points t
 
 Now you can connect to the web server via `http://localhost` and point the agents to the cluster IP address.
 
-### Other Helm chart usage examples:
+#### Other Helm chart usage examples
 
 Use a different container image (e.g. the `rolling` one):
 

scripts/install-server.sh

@@ -4,7 +4,7 @@ set -e
 
 readonly ARGS=("$@")
 readonly PROGNAME="./install-server.sh"
-TRENTO_SERVER_CHART_VERSION=${TRENTO_SERVER_CHART_VERSION:-"2.4.0"}
+TRENTO_SERVER_CHART_VERSION=${TRENTO_SERVER_CHART_VERSION:-"2.4.1"}
 TRENTO_WEB_VERSION=${TRENTO_WEB_VERSION:-"2.4.0"}
 TRENTO_WANDA_VERSION=${TRENTO_WANDA_VERSION:-"1.4.0"}
 TRENTO_ROLLING_VERSION=${TRENTO_ROLLING_VERSION:-"rolling"}
@@ -148,14 +148,6 @@ cmdline() {
     return 0
 }
 
-function load_conf() {
-    if [ -f /etc/trento/installer.conf ]; then
-        echo "Loading installer configuration"
-        # shellcheck source=/dev/null
-        source /etc/trento/installer.conf
-    fi
-}
-
 function set_admin_password() {
     if [[ -z "$ADMIN_PASSWORD" ]]; then
         read -rsp "Please provide the password of the \"admin\" user (min 8 characters): " ADMIN_PASSWORD </dev/tty