Rebase from main and fix conflicts

tum-gis · Apr 20, 2024 · a78285e · a78285e
2 parents 9d8f6fd + 637840e
commit a78285e
Show file tree

Hide file tree

Showing 34 changed files with 485 additions and 243 deletions.
diff --git a/.github/workflows/chart-releaser-beta.yml b/.github/workflows/chart-releaser-beta.yml
@@ -0,0 +1,43 @@
+name: Release Charts beta
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - 'release/**-alpha*'
+      - 'release/**-beta*'
+      - 'releases/**-alpha*'
+      - 'releases/**-beta*'
+    paths:
+      - charts/sddi-ckan/**
+
+jobs:
+  release-beta:
+    # depending on default permission settings for your org (contents being read-only or read-write for workloads), you will have to add permissions
+    # see: https://docs.github.com/en/actions/security-guides/automatic-token-authentication#modifying-the-permissions-for-the-github_token
+    permissions:
+      contents: write
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Configure Git
+        run: |
+          git config user.name "$GITHUB_ACTOR"
+          git config user.email "[email protected]"
+
+      - name: Install Helm
+        uses: azure/setup-helm@v3
+        with:
+          version: v3.14.1
+
+      - name: Run chart-releaser
+        uses: helm/[email protected]
+        with:
+          mark_as_latest: false
+          skip_existing: true
+        env:
+          CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/.github/workflows/chart-releaser.yml b/.github/workflows/chart-releaser.yml
@@ -6,6 +6,11 @@ on:
     branches:
       - main
       - release/**
+      - '!release/**-alpha*'
+      - '!release/**-beta*'
+      - releases/**
+      - '!releases/**-alpha*'
+      - '!releases/**-beta*'
     paths:
       - charts/sddi-ckan/**
 
@@ -18,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -30,9 +35,12 @@ jobs:
       - name: Install Helm
         uses: azure/setup-helm@v3
         with:
-          version: v3.12.3
+          version: v3.14.1
 
       - name: Run chart-releaser
-        uses: helm/[email protected]
+        uses: helm/[email protected]
+        with:
+          mark_as_latest: true
+          skip_existing: true
         env:
-          CR_TOKEN: "${{ secrets.GH_TOKEN }}"
+          CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/.gitignore b/.gitignore
@@ -129,6 +129,3 @@ scheduler.json
 # */charts
 requirements.lock
 Chart.lock
-
-# VS-Code
-.vscode/
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/norwoodj/helm-docs
-    rev: v1.11.0
+    rev: v1.13.1
     hooks:
       - id: helm-docs
         args:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,7 +8,57 @@ Versions are prefixed with `sddi-ckan-` due to usage of
 [chart-releaser-action](https://github.com/helm/chart-releaser-action).
 For releases `< 1.0.0` minor version step indicate breaking changes.
 
-## [Unreleased]
+## [sddi-ckan-3.0.0] - 2024-03-22
+
+## Added
+
+- Allow setting CKAN `initContainers`, `extraInitContainers`, `volumes`, `extraVolumes`. tum-gis/sddi-ckan-k8s#32
+- Allow setting Solr `initContainers`, `extraInitContainers`. tum-gis/sddi-ckan-k8s#33
+- Basic example for OpenShift usage, see [here](examples/open-shift).
+
+### Changed
+
+- Revert 313c09c: Relax Solr security context for OpenShift compatibility. Fixing file permissions is now done using
+  an `initContainer`, that can be disabled for OpenShift compatibility. tum-gis/sddi-ckan-k8s#24, tum-gis/sddi-ckan-k8s#33
+- Upgrade Solr `8.11.2` -> `9.2.1`: **Warning**: The upgrade from 8.x to Solr 9.x introduces several major changes that you should be
+  aware of before upgrading. Make sure to thoroughly go though the
+  [docs for upgrading Solr](https://solr.apache.org/guide/solr/latest/upgrade-notes/solr-upgrade-notes.html#upgrading-to-9-x-from-8-x-releases)
+  for possible breaking changes or necessary manual migration steps.
+  - [Major changes in Solr9](https://solr.apache.org/guide/solr/latest/upgrade-notes/major-changes-in-solr-9.html)
+  - If upgrading from `v2.x.x` no action should be required.
+  - You should [Recrate the search index after upgrade](https://solr.apache.org/guide/solr/latest/upgrade-notes/major-changes-in-solr-9.html#reindexing-after-upgrade)
+    - See [`ckan search-index rebuild`](https://docs.ckan.org/en/latest/maintaining/cli.html#search-index-search-index-commands)
+- Upgrade Redis `7.0.8` -> `7.2.4`
+- Upgrade Postgresql/PostGIS `14-3.3` -> `14-3.4`
+
+### Fixed
+
+- CKAN ingress `pathType` warning
+
+## [sddi-ckan-2.0.0] - 2023-11-02
+
+This release updates the sddi-ckan Docker image to `v2.0.0` bringing several security improvements
+and some breaking changes too. Make sure to check the
+[CHANGELOG](https://github.com/tum-gis/ckan-docker/blob/2.0.0/CHANGELOG.md) for all details.
+
+[@klml](https://github.com/klml), [@eidottermihi](https://github.com/eidottermihi) made their first contributions!
+
+## Breaking
+
+- Removed default resource requirements/limits for all services. tum-gis/sddi-ckan-k8s#28, tum-gis/sddi-ckan-k8s#29
+
+## Added
+
+- Allow configuration of images used for init containers. tum-gis/sddi-ckan-k8s#24
+  - `ckan.initContainers.initdata.image`
+  - `ckan.initContainers.pgready.image`
+  - `datapusher.initContainers.pgready.image`
+
+### Changed
+
+- Relax Solr security context for OpenShift compatibility. tum-gis/sddi-ckan-k8s#24
+- Bump SDDI CKAN Image `1.2.0` --> `2.0.0`, see
+  [CHANGELOG](https://github.com/tum-gis/ckan-docker/blob/2.0.0/CHANGELOG.md) for more.
 
 ### Fixed
 
@@ -323,8 +373,10 @@ is displayed when navigating to the _Datasets_ view of CKAN.
 
 ### Known issues
 
-[Unreleased]: https://github.com/tum-gis/sddi-ckan-k8s/compare/sddi-ckan-1.2.2...HEAD
+[Unreleased]: https://github.com/tum-gis/sddi-ckan-k8s/compare/sddi-ckan-3.0.0...HEAD
 
+[sddi-ckan-3.0.0]: https://github.com/tum-gis/sddi-ckan-k8s/compare/sddi-ckan-2.0.0...sddi-ckan-3.0.0
+[sddi-ckan-2.0.0]: https://github.com/tum-gis/sddi-ckan-k8s/compare/sddi-ckan-1.2.2...sddi-ckan-2.0.0
 [sddi-ckan-1.2.2]: https://github.com/tum-gis/sddi-ckan-k8s/compare/sddi-ckan-1.2.1...sddi-ckan-1.2.2
 [sddi-ckan-1.2.1]: https://github.com/tum-gis/sddi-ckan-k8s/compare/sddi-ckan-1.2.0...sddi-ckan-1.2.1
 [sddi-ckan-1.2.0]: https://github.com/tum-gis/sddi-ckan-k8s/compare/sddi-ckan-1.1.7...sddi-ckan-1.2.0

diff --git a/NOTES.md b/NOTES.md
diff --git a/README.md b/README.md
@@ -54,8 +54,8 @@ The default username and password are: `admin: changeMe`.
 
 Instructions for *local* testing with e.g. `minikube` or `Docker Desktop` are available in the [examples](examples) section.
 
-> **Note:** To try out
-> `alpha`/`beta` [releases](https://github.com/tum-gis/sddi-ckan-k8s/releases),
+> [!TIP]
+> To try out `alpha`/`beta` [releases](https://github.com/tum-gis/sddi-ckan-k8s/releases),
 > add the [`--devel`](https://helm.sh/docs/helm/helm_install/#options)
 > option to the `helm install` command.
 
@@ -190,7 +190,7 @@ the repo root.
 
 ```shell
 docker run --rm -u $(id -u) --name helm-docs \
-    --volume "$PWD/sddi-ckan/charts:/helm-docs" \
+    --volume "$PWD/charts/sddi-ckan:/helm-docs" \
   jnorwood/helm-docs:latest
 ```
 

diff --git a/charts/sddi-ckan/Chart.yaml b/charts/sddi-ckan/Chart.yaml
@@ -10,8 +10,8 @@ sources:
   - https://www.asg.ed.tum.de/en/gis/projects/smart-district-data-infrastructure
   - https://github.com/tum-gis/ckan-docker
 
-version: 1.2.2
-appVersion: "1.2.0"
+version: 3.0.0
+appVersion: "2.0.0"
 kubeVersion: ">= 1.23.0-0"
 
 maintainers:
@@ -41,14 +41,19 @@ dependencies:
   - name: ingress-nginx
     alias: ingress-nginx
     condition: ingress-nginx.enabled
-    version: "~4.4.0"
+    version: "^4"
     repository: https://kubernetes.github.io/ingress-nginx
   - name: cert-manager
     alias: cert-manager
     condition: cert-manager.enabled
-    version: "~1.11.0"
+    version: "^1"
     repository: https://charts.jetstack.io
   - name: clamav
     condition: clamav.enabled
     version: "~2.8.0"
     repository: https://wiremind.github.io/wiremind-helm-charts
+  - name: common
+    repository: oci://registry-1.docker.io/bitnamicharts
+    tags:
+    - bitnami-common
+    version: 2.x.x
diff --git a/charts/sddi-ckan/README.md b/charts/sddi-ckan/README.md
@@ -1,6 +1,6 @@
 # sddi-ckan
 
-![Version: 1.2.2](https://img.shields.io/badge/Version-1.2.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.2.0](https://img.shields.io/badge/AppVersion-1.2.0-informational?style=flat-square)
+![Version: 3.0.0](https://img.shields.io/badge/Version-3.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.0](https://img.shields.io/badge/AppVersion-2.0.0-informational?style=flat-square)
 
 Helm Chart for a SDDI enabled CKAN catalog. See [CHANGELOG](https://github.com/tum-gis/sddi-ckan-k8s/blob/main/CHANGELOG.md) for changes.
 
@@ -33,6 +33,7 @@ Kubernetes: `>= 1.23.0-0`
 | https://charts.jetstack.io | cert-manager(cert-manager) | ~1.11.0 |
 | https://kubernetes.github.io/ingress-nginx | ingress-nginx(ingress-nginx) | ~4.4.0 |
 | https://wiremind.github.io/wiremind-helm-charts | clamav | ~2.8.0 |
+| oci://registry-1.docker.io/bitnamicharts | common | 2.x.x |
 
 ## Values
 
@@ -83,5 +84,3 @@ Kubernetes: `>= 1.23.0-0`
 | redis.enabled | bool | `true` | Enable/disable Redis instance. Disable, if an external Redis instance is used. |
 | solr.enabled | bool | `true` | Enable/disable Apache Solr instance. Disable, if an external Solr instance is used. |
 
-----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0)
diff --git a/charts/sddi-ckan/charts/certIssuer/README.md b/charts/sddi-ckan/charts/certIssuer/README.md
@@ -12,5 +12,3 @@ Namespace Issuers for CertManager.
 | enabled | bool | `true` | Enable/disable namespace [Issuers](https://cert-manager.io/docs/concepts/issuer/) for CertManager. |
 | issuerEmail | string | `"[email protected]"` | eMail address for registration with Let's Encrypt account. Note: This is overwritten by `global.ingress.certManager.issuerEmail`, if set. |
 
-----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0)
diff --git a/charts/sddi-ckan/charts/ckan/Chart.yaml b/charts/sddi-ckan/charts/ckan/Chart.yaml
@@ -9,8 +9,8 @@ sources:
   - https://github.com/tum-gis/ckan-docker
   - https://github.com/keitaroinc/docker-ckan
 
-version: 1.2.2
-appVersion: "1.2.0"
+version: 3.0.1
+appVersion: "2.0.0"
 
 maintainers:
   - email: [email protected]