Skip to content

Commit

Permalink
chore(release): Release v3.12.0 (#241)
Browse files Browse the repository at this point in the history
  • Loading branch information
MisterTimn authored Dec 12, 2023
2 parents 85070cc + 753bb6d commit 3ff7674
Show file tree
Hide file tree
Showing 38 changed files with 236 additions and 494 deletions.
21 changes: 21 additions & 0 deletions .github/workflows/PR-docs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Build docs

on:
pull_request:
branches:
- main
- next
paths:
- 'documentation/**/*'
- '.github/workflows/docs.yaml'
- '.github/workflows/PR-docs.yaml'

permissions:
contents: read
packages: write

jobs:
build-documentation:
uses: ./.github/workflows/docs.yaml
with:
release: false
3 changes: 3 additions & 0 deletions .github/workflows/PR-helm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ on:
paths:
- 'charts/**'

permissions:
contents: write

jobs:
lint-test:
uses: ./.github/workflows/helm.yaml
Expand Down
51 changes: 51 additions & 0 deletions .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
name: Build docs

on:
workflow_call:
inputs:
release:
description: Should a release be triggered.
required: false
type: boolean
default: false
version:
description: Version to be released
required: false
type: string

permissions:
contents: read
packages: write

env:
VERSION: ${{ inputs.version }}
registry: ghcr.io

jobs:
build:
name: Build docs
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Build
uses: Tiryoh/actions-mkdocs@v0
with:
mkdocs_version: 'latest'
requirements: 'documentation/requirements.txt'
configfile: 'documentation/mkdocs.yml'
- name: Move site to docker/
run: |
cp -R documentation/site documentation/docker/site
- name: Kaniko build
uses: aevea/action-kaniko@v0.10.0
if: ${{ inputs.release }}
with:
image: docs
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN}}
registry: ${{ env.registry }}
cache: true
cache_registry: aevea/cache
tag: ${{ inputs.version }}
path: documentation/docker/
28 changes: 7 additions & 21 deletions .github/workflows/helm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,17 @@ jobs:
- name: Set up Helm
uses: azure/setup-helm@v3.5
with:
version: v3.11.2
version: v3.13.2

# Python is required because `ct lint` runs Yamale (https://github.com/23andMe/Yamale) and
# yamllint (https://github.com/adrienverge/yamllint) which requires Python
- name: Set up Python
uses: actions/setup-python@v4.5.0
uses: actions/setup-python@v5
with:
python-version: 3.9
python-version: '3.10'

- name: Set up chart-testing
uses: helm/chart-testing-action@v2.4.0
with:
version: v3.7.1
uses: helm/chart-testing-action@v2.6.1

- name: Run chart-testing (list-changed)
id: list-changed
Expand All @@ -51,19 +49,7 @@ jobs:
if: steps.list-changed.outputs.changed == 'true'
run: ct lint --target-branch main --validate-maintainers=false --check-version-increment=false

# - name: Create kind cluster
# uses: helm/kind-action@v1.5.0
# if: steps.list-changed.outputs.changed == 'true'

# - name: Install promop and traefik CRDs
# run: |
# kubectl apply --server-side -f https://raw.githubusercontent.com/traefik/traefik/v2.9/docs/content/reference/dynamic-configuration/kubernetes-crd-definition-v1.yml
# kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.63.0/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
# kubectl apply --server-side -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.63.0/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml

# - name: Run chart-testing (install)
# if: steps.list-changed.outputs.changed == 'true'
# run: ct install --charts charts/obelisk --upgrade --target-branch main
# TODO: add dry-run and install tests with Kind

helm-release:
runs-on: ubuntu-latest
Expand All @@ -89,15 +75,15 @@ jobs:
- name: Install Helm
uses: azure/setup-helm@v3.5
with:
version: v3.11.2
version: v3.13.2

- name: Bump chart versions
run: |
charts/bump-version.sh $VERSION
charts/update-dependencies.sh
- name: Run chart-releaser
uses: helm/chart-releaser-action@v1.5.0
uses: helm/chart-releaser-action@v1.6.0
with:
charts_dir: charts/
env:
Expand Down
20 changes: 7 additions & 13 deletions .github/workflows/maven.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
token: ${{ secrets.GITHUB_TOKEN }}

- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'
Expand Down Expand Up @@ -87,23 +87,16 @@ jobs:
steps:

- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
token: ${{ secrets.GITHUB_TOKEN }}

- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'
cache: 'maven'

- name: Log in to ghcr.io
uses: docker/login-action@v2
with:
registry: ${{ env.registry }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build container images
run: |
mvn -B -ntp versions:set -DnewVersion=${VERSION} -DgenerateBackupPoms=false
Expand All @@ -119,15 +112,16 @@ jobs:
steps:
# Checkout the repo and pull in version changes.
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
token: ${{ secrets.GITHUB_TOKEN }}

- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'
cache: 'maven'

# We can only push maven packages once, so making sure we are able to push them all.
- name: Dry-run deploy
run: |
Expand Down
9 changes: 9 additions & 0 deletions .github/workflows/release-main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,15 @@ jobs:
version: ${{ needs.check-release.outputs.version }}
secrets: inherit

docs-release:
needs: check-release
if: ${{ needs.check-release.outputs.version }}
uses: ./.github/workflows/docs.yaml
with:
release: true
version: ${{ needs.check-release.outputs.version }}
secrets: inherit

helm-release:
needs:
- maven-release
Expand Down
11 changes: 11 additions & 0 deletions .github/workflows/release-next.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ on:
branches:
- next

permissions:
contents: read
packages: write

jobs:
# version:
# runs-on: ubuntu-latest
Expand Down Expand Up @@ -43,3 +47,10 @@ jobs:
with:
release_image: true
version: next

docs:
# needs: version
uses: ./.github/workflows/docs.yaml
with:
release: true
version: next
2 changes: 1 addition & 1 deletion charts/modules/int-dataset-streamer/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ replicaCount: 1

image:
name: int-dataset-streamer
repository: gitlab.ilabt.imec.be:4567/obelisk/packages
repository: ghcr.io/idlab-discover/obelisk
pullPolicy: IfNotPresent

imagePullSecrets: []
Expand Down
2 changes: 1 addition & 1 deletion charts/modules/int-sink-service/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ replicaCount: 1

image:
name: int-sink-service
repository: gitlab.ilabt.imec.be:4567/obelisk/packages
repository: ghcr.io/idlab-discover/obelisk
pullPolicy: IfNotPresent

containerPort: 8080
Expand Down
2 changes: 1 addition & 1 deletion charts/modules/int-stats-collector/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ replicaCount: 1

image:
name: int-stats-collector
repository: gitlab.ilabt.imec.be:4567/obelisk/packages
repository: ghcr.io/idlab-discover/obelisk
pullPolicy: IfNotPresent

containerPort: 8080
Expand Down
2 changes: 1 addition & 1 deletion charts/modules/pub-auth-service/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ replicaCount: 1

image:
name: pub-auth-service
repository: gitlab.ilabt.imec.be:4567/obelisk/packages
repository: ghcr.io/idlab-discover/obelisk
pullPolicy: IfNotPresent

containerPort: 8080
Expand Down
2 changes: 1 addition & 1 deletion charts/modules/pub-catalog-service/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ replicaCount: 1

image:
name: pub-catalog-service
repository: gitlab.ilabt.imec.be:4567/obelisk/packages
repository: ghcr.io/idlab-discover/obelisk
pullPolicy: IfNotPresent

containerPort: 8080
Expand Down
2 changes: 1 addition & 1 deletion charts/modules/pub-export-service/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ replicaCount: 1

image:
name: pub-export-service
repository: gitlab.ilabt.imec.be:4567/obelisk/packages
repository: ghcr.io/idlab-discover/obelisk
pullPolicy: IfNotPresent

imagePullSecrets: []
Expand Down
2 changes: 1 addition & 1 deletion charts/modules/pub-ingest-service/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ replicaCount: 1

image:
name: pub-ingest-service
repository: gitlab.ilabt.imec.be:4567/obelisk/packages
repository: ghcr.io/idlab-discover/obelisk
pullPolicy: IfNotPresent

imagePullSecrets: []
Expand Down
2 changes: 1 addition & 1 deletion charts/modules/pub-issue-service/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ replicaCount: 1

image:
name: pub-issue-service
repository: gitlab.ilabt.imec.be:4567/obelisk/packages
repository: ghcr.io/idlab-discover/obelisk
pullPolicy: IfNotPresent

imagePullSecrets: []
Expand Down
2 changes: 1 addition & 1 deletion charts/modules/pub-monitor-service/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ replicaCount: 1

image:
name: pub-monitor-service
repository: gitlab.ilabt.imec.be:4567/obelisk/packages
repository: ghcr.io/idlab-discover/obelisk
pullPolicy: IfNotPresent

imagePullSecrets: []
Expand Down
2 changes: 1 addition & 1 deletion charts/modules/pub-query-service/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ replicaCount: 1

image:
name: pub-query-service
repository: gitlab.ilabt.imec.be:4567/obelisk/packages
repository: ghcr.io/idlab-discover/obelisk
pullPolicy: IfNotPresent

imagePullSecrets: []
Expand Down
2 changes: 1 addition & 1 deletion charts/modules/pub-streaming-service/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ replicaCount: 1

image:
name: pub-streaming-service
repository: gitlab.ilabt.imec.be:4567/obelisk/packages
repository: ghcr.io/idlab-discover/obelisk
pullPolicy: IfNotPresent

imagePullSecrets: []
Expand Down
3 changes: 1 addition & 2 deletions charts/modules/web-apiconsole/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ replicaCount: 1

image:
name: web-apiconsole
tag: latest
repository: gitlab.ilabt.imec.be:4567/obelisk/packages
repository: ghcr.io/idlab-discover/obelisk
pullPolicy: IfNotPresent

imagePullSecrets: []
Expand Down
3 changes: 1 addition & 2 deletions charts/modules/web-catalog/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ replicaCount: 1

image:
name: web-catalog
tag: latest
repository: gitlab.ilabt.imec.be:4567/obelisk/packages
repository: ghcr.io/idlab-discover/obelisk
pullPolicy: IfNotPresent

imagePullSecrets: []
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
name: oblx-mkdocs
description: A Helm chart for deploying the Obelisk Documentation powered by mkdocs to Kubernetes.
name: obelisk-docs
description: A Helm chart for deploying the Obelisk Documentation.
type: application
version: 23.6.0
appversion: 23.6.0
appVersion: "23.6.0"
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ oblxConfig:
clientId: 0

image:
repository: gitlab.ilabt.imec.be:4567/obelisk/packages
name: mkdocs
repository: ghcr.io/idlab-discover/obelisk
name: docs
pullPolicy: IfNotPresent

# Set the imagePullSecret used to access the private Obelisk Container Registry (MUST BE AVAILABLE IN THE DEPLOYMENT NAMESPACE)
Expand Down
6 changes: 3 additions & 3 deletions charts/update-dependencies.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#!/bin/sh
cd "$(dirname "$0")" || exit
PARALLEL="$(nproc --ignore=1)"
find ./modules -maxdepth 2 -name Chart.yaml -printf "%h\0" | xargs -t -0 -n1 -P "$PARALLEL" helm dependency update --skip-refresh
find ./modules -maxdepth 2 -name Chart.yaml -exec dirname {} + | tr '\n' '\0' | xargs -t -0 -n1 -P "$PARALLEL" helm dependency update --skip-refresh

find . -maxdepth 2 -name Chart.yaml -printf "%h\0" | xargs -t -0 -n1 -P "$PARALLEL" helm dependency update --skip-refresh
find . -maxdepth 2 -name Chart.yaml -exec dirname {} + | tr '\n' '\0' | xargs -t -0 -n1 -P "$PARALLEL" helm dependency update --skip-refresh
Empty file added documentation/docker/site/test
Empty file.
Loading

0 comments on commit 3ff7674

Please sign in to comment.