From 27ba7705d16110c76fdc60a2c337c7a8824dbe48 Mon Sep 17 00:00:00 2001 From: Simon Li Date: Thu, 1 Feb 2024 20:19:22 +0000 Subject: [PATCH 1/5] Fix repo URL in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1582313..2cf0cde 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Kubernetes Helm charts for [OMERO](https://www.openmicroscopy.org/). Add the OMERO Helm chart repository: - helm repo add omero https://manics.github.io/kubernetes-omero/ + helm repo add omero https://www.manicstreetpreacher.co.uk/kubernetes-omero/ helm repo update Optionally create your OMERO.server and OMERO.web Helm configuration files. From a6870dba42b0e0abf4a23067761d3f324220a7cc Mon Sep 17 00:00:00 2001 From: Simon Li Date: Thu, 1 Feb 2024 20:22:51 +0000 Subject: [PATCH 2/5] Update pre-commit --- .pre-commit-config.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 1b5b40f..b229416 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/psf/black - rev: 23.7.0 + rev: 24.1.1 hooks: - id: black args: [--target-version=py36] @@ -9,10 +9,10 @@ repos: hooks: - id: beautysh - repo: https://github.com/gruntwork-io/pre-commit - rev: v0.1.22 + rev: v0.1.23 hooks: - id: helmlint - repo: https://github.com/pre-commit/mirrors-prettier - rev: v3.0.0 + rev: v3.1.0 hooks: - id: prettier From 7c427760ed6c3e232c9c9f4b31aa7ca9988c0cba Mon Sep 17 00:00:00 2001 From: Simon Li Date: Thu, 1 Feb 2024 20:21:06 +0000 Subject: [PATCH 3/5] Update GH action versions, and max k3s/helm --- .github/workflows/test_and_publish.yml | 39 ++++++++++++++++---------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/.github/workflows/test_and_publish.yml b/.github/workflows/test_and_publish.yml index ebf14eb..769cd7f 100644 --- a/.github/workflows/test_and_publish.yml +++ b/.github/workflows/test_and_publish.yml @@ -7,16 +7,16 @@ on: jobs: precommit: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 timeout-minutes: 2 name: Run pre-commit steps: - - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 - uses: pre-commit/action@v3.0.0 test_omero: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 timeout-minutes: 20 name: Test OMERO Helm charts strategy: @@ -25,16 +25,25 @@ jobs: include: - k3s-version: v1.21.0+k3s1 helm-version: v3.5.4 - - k3s-version: v1.27.3+k3s1 - helm-version: v3.12.0 + # v4 supports k3s 1.24+ + k3s-helm-version: v3 + - k3s-version: v1.29.1+k3s1 + helm-version: v3.14.0 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: # chartpress requires the full history fetch-depth: 0 - - id: k3s - uses: jupyterhub/action-k3s-helm@v3 + - uses: jupyterhub/action-k3s-helm@v3 + if: matrix.k3s-helm-version == 'v3' + with: + k3s-version: ${{ matrix.k3s-version }} + helm-version: ${{ matrix.helm-version }} + # This action should export KUBECONFIG + + - uses: jupyterhub/action-k3s-helm@v4 + if: matrix.k3s-helm-version != 'v3' with: k3s-version: ${{ matrix.k3s-version }} helm-version: ${{ matrix.helm-version }} @@ -54,7 +63,7 @@ jobs: # This job can be used as a required status for Pull Requests status: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 timeout-minutes: 2 name: Status needs: @@ -67,7 +76,7 @@ jobs: echo "test_omero: ${{ needs.test_omero.result }}" publish: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 permissions: contents: write name: Publish OMERO Helm charts @@ -76,12 +85,12 @@ jobs: - precommit - test_omero steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: # chartpress requires the full history fetch-depth: 0 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: "3.10" cache: pip @@ -89,12 +98,12 @@ jobs: - uses: azure/setup-helm@v3 with: - version: v3.5.4 + version: v3.14.0 - name: Install dependencies run: pip install -r dev-requirements.txt - - uses: docker/login-action@v2 + - uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} From 1f6fe9dcf7e2135de7fd56f6b06ffbeca791707f Mon Sep 17 00:00:00 2001 From: Simon Li Date: Mon, 2 Oct 2023 21:32:42 +0100 Subject: [PATCH 4/5] openmicroscopy/omero-server:5.6.10 Also set version once in Chart.yaml --- omero-server/Chart.yaml | 4 ++-- omero-server/templates/statefulset.yaml | 2 +- omero-server/values.yaml | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/omero-server/Chart.yaml b/omero-server/Chart.yaml index 49cb538..8a4ca77 100644 --- a/omero-server/Chart.yaml +++ b/omero-server/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 -appVersion: 5.6.8 +appVersion: 5.6.10 description: OMERO.server name: omero-server -version: 0.4.3 +version: 0.4.4 icon: https://www.openmicroscopy.org/img/logos/omero-logomark.svg diff --git a/omero-server/templates/statefulset.yaml b/omero-server/templates/statefulset.yaml index 044275c..098b0fd 100644 --- a/omero-server/templates/statefulset.yaml +++ b/omero-server/templates/statefulset.yaml @@ -31,7 +31,7 @@ spec: terminationGracePeriodSeconds: 300 containers: - name: {{ .Chart.Name }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" + image: "{{ .Values.image.repository }}:{{ default .Chart.AppVersion .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }} env: # In openmicroscopy/omero-server these CONFIG envvars have higher diff --git a/omero-server/values.yaml b/omero-server/values.yaml index 5287677..5b643d3 100644 --- a/omero-server/values.yaml +++ b/omero-server/values.yaml @@ -6,7 +6,8 @@ replicaCount: 1 image: repository: openmicroscopy/omero-server - tag: 5.6.8 + # Default .Chart.AppVersion + tag: pullPolicy: IfNotPresent nameOverride: "" From 88d32d5dba2b8b0bb90423e2038df33b80816419 Mon Sep 17 00:00:00 2001 From: Simon Li Date: Thu, 1 Feb 2024 20:29:30 +0000 Subject: [PATCH 5/5] openmicroscopy/omero-web-standalone:5.24.0 Also set version once in Chart.yaml --- omero-web/Chart.yaml | 4 ++-- omero-web/templates/deployment.yaml | 2 +- omero-web/values.yaml | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/omero-web/Chart.yaml b/omero-web/Chart.yaml index 2774c0c..3bebcb7 100644 --- a/omero-web/Chart.yaml +++ b/omero-web/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 -appVersion: 5.22.1 +appVersion: 5.24.0 description: OMERO.web name: omero-web -version: 0.4.3 +version: 0.4.4 icon: https://www.openmicroscopy.org/img/logos/omero-logomark.svg diff --git a/omero-web/templates/deployment.yaml b/omero-web/templates/deployment.yaml index bd228b2..38c14ae 100644 --- a/omero-web/templates/deployment.yaml +++ b/omero-web/templates/deployment.yaml @@ -28,7 +28,7 @@ spec: {{- end }} containers: - name: {{ .Chart.Name }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" + image: "{{ .Values.image.repository }}:{{ default .Chart.AppVersion .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }} ports: - name: http diff --git a/omero-web/values.yaml b/omero-web/values.yaml index 0b55286..94752b8 100644 --- a/omero-web/values.yaml +++ b/omero-web/values.yaml @@ -6,7 +6,8 @@ replicaCount: 1 image: repository: openmicroscopy/omero-web-standalone - tag: 5.22.1 + # Default .Chart.AppVersion + tag: pullPolicy: IfNotPresent nameOverride: ""