diff --git a/README.rst b/README.rst index d09b0a39..3f6e107c 100644 --- a/README.rst +++ b/README.rst @@ -26,7 +26,7 @@ for details. -.. |Dataverse badge| image:: https://img.shields.io/badge/Dataverse-v4.16-important.svg +.. |Dataverse badge| image:: https://img.shields.io/badge/Dataverse-v4.17-important.svg :target: https://dataverse.org .. |Validation badge| image:: https://jenkins.dataverse.org/job/dataverse-k8s/job/Kubeval%20Linting/job/master/badge/icon?subject=kubeval&status=valid&color=purple :target: https://jenkins.dataverse.org/blue/organizations/jenkins/dataverse-k8s%2FKubeval%20Linting/activity?branch=master diff --git a/dataverse b/dataverse index ee874a62..51739f61 160000 --- a/dataverse +++ b/dataverse @@ -1 +1 @@ -Subproject commit ee874a6224af616fd5db20789f0fcb7521238cbf +Subproject commit 51739f61fedfd4f8cc1e3d547b45eb5ff0801c25 diff --git a/docs/conf.py b/docs/conf.py index 20cece3e..2e48b74e 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -25,7 +25,7 @@ author = u'Oliver Bertuch' # The short X.Y version -version = u'4.16' +version = u'4.17' # The full version, including alpha/beta/rc tags release = version diff --git a/docs/images/build.rst b/docs/images/build.rst index 686efa06..718cb29a 100644 --- a/docs/images/build.rst +++ b/docs/images/build.rst @@ -19,8 +19,8 @@ Simple with Docker (or Podman) after cloning the project and accessing the sourc .. code-block:: shell - docker build -t iqss/dataverse-k8s:4.16 -f docker/dataverse-k8s/glassfish/Dockerfile . - docker build -t iqss/solr-k8s:4.16 docker/solr-k8s + docker build -t iqss/dataverse-k8s:4.17 -f docker/dataverse-k8s/glassfish/Dockerfile . + docker build -t iqss/solr-k8s:4.17 docker/solr-k8s *Please remember to change the tag above as appropriate. You should be* diff --git a/docs/images/dataverse-k8s.md b/docs/images/dataverse-k8s.md index 6b6fb0d7..944a9a01 100644 --- a/docs/images/dataverse-k8s.md +++ b/docs/images/dataverse-k8s.md @@ -1,6 +1,6 @@ # Image "dataverse-k8s" -[![Upstream](https://img.shields.io/badge/Dataverse-v4.16-important.svg)](https://github.com/IQSS/dataverse/releases/v4.16) +[![Upstream](https://img.shields.io/badge/Dataverse-v4.17-important.svg)](https://github.com/IQSS/dataverse/releases/v4.17) [![Hub](https://img.shields.io/static/v1.svg?label=image&message=dataverse-k8s&logo=docker)](https://hub.docker.com/r/iqss/dataverse-k8s) ![Pulls](https://img.shields.io/docker/pulls/iqss/dataverse-k8s) [![RTD](https://img.shields.io/readthedocs/dataverse-k8s)](https://dataverse-k8s.readthedocs.io) @@ -17,11 +17,11 @@ like [Docker](https://docker.io) or [podman](https://podman.io). - `latest`: master branch based build ([`Dockerfile`](https://github.com/IQSS/dataverse-kubernetes/blob/master/docker/dataverse-k8s/glassfish/Dockerfile)) - `build-cache`: a maven cache image to speedup dev builds, refreshed every night based on latest upstream `develop`. ([`Dockerfile`](https://github.com/IQSS/dataverse-kubernetes/blob/master/docker/dataverse-k8s/build-cache/Dockerfile), [`Jenkinsfile`](https://github.com/IQSS/dataverse-kubernetes/blob/master/docker/dataverse-k8s/build-cache/Jenkinsfile)) -- `4.16`, ..., `4.15.1`, ..., `4.11`: stable (tagged) releases +- `4.17`, ..., `4.15.1`, ..., `4.11`: stable (tagged) releases - Using [upstream release schema](https://github.com/IQSS/dataverse/releases/) down to `4.11`. - See also [list on Docker Hub](https://hub.docker.com/r/iqss/dataverse-k8s/tags?page=1&ordering=last_updated&name=4.) for releases - - Last stable tag ([`Dockerfile`](https://github.com/IQSS/dataverse-kubernetes/blob/v4.16/docker/dataverse-k8s/glassfish/Dockerfile)) + - Last stable tag ([`Dockerfile`](https://github.com/IQSS/dataverse-kubernetes/blob/v4.17/docker/dataverse-k8s/glassfish/Dockerfile)) ## Quick reference diff --git a/docs/images/solr-k8s.md b/docs/images/solr-k8s.md index f6f7fc2b..210e1c9b 100644 --- a/docs/images/solr-k8s.md +++ b/docs/images/solr-k8s.md @@ -1,6 +1,6 @@ # Image "solr-k8s" -[![Upstream](https://img.shields.io/badge/Dataverse-v4.16-important.svg)](https://github.com/IQSS/dataverse/releases/v4.16) +[![Upstream](https://img.shields.io/badge/Dataverse-v4.17-important.svg)](https://github.com/IQSS/dataverse/releases/v4.17) [![Hub](https://img.shields.io/static/v1.svg?label=image&message=solr-k8s&logo=docker)](https://hub.docker.com/r/iqss/solr-k8s) [![Solr](https://img.shields.io/static/v1.svg?label=upstream&message=7.3.1&logo=docker)](https://hub.docker.com/_/solr) ![Pulls](https://img.shields.io/docker/pulls/iqss/solr-k8s) @@ -10,7 +10,7 @@ This container image includes a dependency service to run [Dataverse](https://dataverse.org), a Java EE based web application for research data management, on a container platform. It is derived from [upstream Solr images](https://hub.docker.com/_/solr), [using the -required version](http://guides.dataverse.org/en/4.16/installation/prerequisites.html#solr). +required version](http://guides.dataverse.org/en/4.17/installation/prerequisites.html#solr). It is primarily targeted to be used in production on [Kubernetes](https://kubernetes.io), but if you follow the same conventions, you should be able to use it with other tools @@ -19,11 +19,11 @@ like [Docker](https://docker.io) or [podman](https://podman.io). ## Supported tags - `latest`: master branch based build ([`Dockerfile`](https://github.com/IQSS/dataverse-kubernetes/blob/master/docker/dataverse-k8s/glassfish/Dockerfile)) -- `4.16`, ..., `4.15.1`, ..., `4.11`: stable (tagged) releases +- `4.17`, ..., `4.15.1`, ..., `4.11`: stable (tagged) releases - Using [upstream release schema](https://github.com/IQSS/dataverse/releases/) down to `4.11`. - See also [list on Docker Hub](https://hub.docker.com/r/iqss/dataverse-k8s/tags?page=1&ordering=last_updated&name=4.) for releases - - Last stable tag ([`Dockerfile`](https://github.com/IQSS/dataverse-kubernetes/blob/v4.16/docker/solr-k8s/Dockerfile)) + - Last stable tag ([`Dockerfile`](https://github.com/IQSS/dataverse-kubernetes/blob/v4.17/docker/solr-k8s/Dockerfile)) ## Quick reference @@ -55,7 +55,7 @@ to this user on any volumes used for the below directories. Please read the detailed docs about Solr schema provisioning: - [Upstream: updating Solr schema](http://guides.dataverse.org/en/4.17/admin/metadatacustomization.html#updating-the-solr-schema). - - [Kubernetes `Job`s for Search Index](https://dataverse-k8s.rtfd.io/en/4.16/day2/job-index.html) + - [Kubernetes `Job`s for Search Index](https://dataverse-k8s.rtfd.io/en/4.17/day2/job-index.html) - **/scripts**
A collection of scripts for init containers and sidecars. See guide for more information on those scripts. Also available as `$SCRIPT_DIR`. diff --git a/k8s/dataverse/deployment.yaml b/k8s/dataverse/deployment.yaml index c26915d1..b042c38c 100644 --- a/k8s/dataverse/deployment.yaml +++ b/k8s/dataverse/deployment.yaml @@ -5,7 +5,7 @@ metadata: name: dataverse labels: app.kubernetes.io/name: dataverse - app.kubernetes.io/version: "4.16" + app.kubernetes.io/version: "4.17" app.kubernetes.io/component: appserver app.kubernetes.io/part-of: dataverse app.kubernetes.io/managed-by: kubectl diff --git a/k8s/dataverse/kustomization.yaml b/k8s/dataverse/kustomization.yaml index 8340dc5a..0147bfab 100644 --- a/k8s/dataverse/kustomization.yaml +++ b/k8s/dataverse/kustomization.yaml @@ -9,4 +9,4 @@ resources: images: - name: iqss/dataverse-k8s - newTag: "4.16" + newTag: "4.17" diff --git a/k8s/kustomization.yaml b/k8s/kustomization.yaml index 54483018..e74aca34 100644 --- a/k8s/kustomization.yaml +++ b/k8s/kustomization.yaml @@ -7,6 +7,6 @@ bases: images: - name: iqss/dataverse-k8s - newTag: "4.16" + newTag: "4.17" - name: iqss/solr-k8s - newTag: "4.16" + newTag: "4.17" diff --git a/k8s/solr/deployment.yaml b/k8s/solr/deployment.yaml index 6e7c39ee..8af9d4f3 100644 --- a/k8s/solr/deployment.yaml +++ b/k8s/solr/deployment.yaml @@ -5,7 +5,7 @@ metadata: name: solr labels: app.kubernetes.io/name: solr - app.kubernetes.io/version: "4.16" + app.kubernetes.io/version: "4.17" app.kubernetes.io/component: searchindex app.kubernetes.io/part-of: dataverse app.kubernetes.io/managed-by: kubectl diff --git a/k8s/solr/kustomization.yaml b/k8s/solr/kustomization.yaml index c0a67821..0725d66a 100644 --- a/k8s/solr/kustomization.yaml +++ b/k8s/solr/kustomization.yaml @@ -8,4 +8,4 @@ resources: images: - name: iqss/solr-k8s - newTag: "4.16" + newTag: "4.17" diff --git a/prepare-release.sh b/prepare-release.sh index 3de5e20a..102a08bb 100755 --- a/prepare-release.sh +++ b/prepare-release.sh @@ -12,7 +12,7 @@ CURRENT=`echo "${2:-$(git describe --tag --abbrev=0)}" | tr -d "v"` NEW=`echo ${1:-${CURRENT}} | tr -d "v"` # find all relevant files and replace inline with sed -find ./*.md ./*.yaml ./docs ./k8s ./docker -type f \ +find ./*.rst ./*.yaml ./docs ./k8s ./docker -type f \ -not -path "./docs/release-notes/*" \ -not -iname "*.svg" \ -exec sed -i -e "s#${CURRENT}#${NEW}#g" {} \;