Skip to content

Commit

Permalink
Merge pull request #3547 from magda-io/issue/3545
Browse files Browse the repository at this point in the history
#3545: Upgrade OpenSearch to v2.15.0 & #3551
  • Loading branch information
t83714 authored Jul 3, 2024
2 parents 174d72e + ba40f90 commit a65c675
Show file tree
Hide file tree
Showing 132 changed files with 339 additions and 326 deletions.
8 changes: 8 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# CHANGELOG

## v4.2.1

- #3551: Pagination Bar sometimes might generate `...` button with invalid page number

## v4.2.0

- #3545: Upgraded OpenSearch to v2.15.0

## v4.1.0

- #3487: Update to use ASGS 2021 and latest LGAs (2023) boundaries
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/internal-charts/admin-api/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
description: A Helm chart for Kubernetes
name: admin-api
version: 4.1.0
version: 4.2.1
kubeVersion: ">= 1.14.0-0"
annotations:
magdaModuleType: "core"
2 changes: 1 addition & 1 deletion deploy/helm/internal-charts/admin-api/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# admin-api

![Version: 4.1.0](https://img.shields.io/badge/Version-4.1.0-informational?style=flat-square)
![Version: 4.2.1](https://img.shields.io/badge/Version-4.2.1-informational?style=flat-square)

A Helm chart for Kubernetes

Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/internal-charts/apidocs-server/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
description: A Helm chart for Kubernetes
name: apidocs-server
version: 4.1.0
version: 4.2.1
kubeVersion: ">= 1.14.0-0"
annotations:
magdaModuleType: "core"
2 changes: 1 addition & 1 deletion deploy/helm/internal-charts/apidocs-server/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# apidocs-server

![Version: 4.1.0](https://img.shields.io/badge/Version-4.1.0-informational?style=flat-square)
![Version: 4.2.1](https://img.shields.io/badge/Version-4.2.1-informational?style=flat-square)

A Helm chart for Kubernetes

Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/internal-charts/authorization-api/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
description: A Helm chart for Kubernetes
name: authorization-api
version: 4.1.0
version: 4.2.1
kubeVersion: ">= 1.14.0-0"
annotations:
magdaModuleType: "core"
2 changes: 1 addition & 1 deletion deploy/helm/internal-charts/authorization-api/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# authorization-api

![Version: 4.1.0](https://img.shields.io/badge/Version-4.1.0-informational?style=flat-square)
![Version: 4.2.1](https://img.shields.io/badge/Version-4.2.1-informational?style=flat-square)

A Helm chart for Kubernetes

Expand Down
6 changes: 3 additions & 3 deletions deploy/helm/internal-charts/authorization-db/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies:
- name: magda-postgres
repository: file://../magda-postgres
version: 4.1.0
digest: sha256:8b5bde9c601c7fd5b246fb14ba6a5f50f23c96066e619627864d4a246a640a65
generated: "2024-06-28T06:53:05.304030359Z"
version: 4.2.1
digest: sha256:3396d487955d5e56f0af53a08b754bf2a46a5197b64007e778c9ca3226ae469e
generated: "2024-07-02T10:25:15.604266444Z"
4 changes: 2 additions & 2 deletions deploy/helm/internal-charts/authorization-db/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
apiVersion: v2
description: A Helm chart for Kubernetes
name: authorization-db
version: 4.1.0
version: 4.2.1
kubeVersion: ">= 1.14.0-0"
annotations:
magdaModuleType: "core"
dependencies:
- name: magda-postgres
version: "4.1.0"
version: "4.2.1"
repository: "file://../magda-postgres"
condition: global.useInK8sDbInstance.authorization-db
4 changes: 2 additions & 2 deletions deploy/helm/internal-charts/authorization-db/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# authorization-db

![Version: 4.1.0](https://img.shields.io/badge/Version-4.1.0-informational?style=flat-square)
![Version: 4.2.1](https://img.shields.io/badge/Version-4.2.1-informational?style=flat-square)

A Helm chart for Kubernetes

Expand All @@ -10,7 +10,7 @@ Kubernetes: `>= 1.14.0-0`

| Repository | Name | Version |
|------------|------|---------|
| file://../magda-postgres | magda-postgres | 4.1.0 |
| file://../magda-postgres | magda-postgres | 4.2.1 |

## Values

Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/internal-charts/cloud-sql-proxy/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
description: A Helm chart for Kubernetes
name: cloud-sql-proxy
version: 4.1.0
version: 4.2.1
appVersion: "1.11"
kubeVersion: ">= 1.14.0-0"
annotations:
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/internal-charts/cloud-sql-proxy/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# cloud-sql-proxy

![Version: 4.1.0](https://img.shields.io/badge/Version-4.1.0-informational?style=flat-square) ![AppVersion: 1.11](https://img.shields.io/badge/AppVersion-1.11-informational?style=flat-square)
![Version: 4.2.1](https://img.shields.io/badge/Version-4.2.1-informational?style=flat-square) ![AppVersion: 1.11](https://img.shields.io/badge/AppVersion-1.11-informational?style=flat-square)

A Helm chart for Kubernetes

Expand Down
6 changes: 3 additions & 3 deletions deploy/helm/internal-charts/combined-db/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies:
- name: magda-postgres
repository: file://../magda-postgres
version: 4.1.0
digest: sha256:60cc0b0ee6569a96f79f562630c09f12874190b8291c3a6fea367b72406cab52
generated: "2024-06-28T06:53:05.392981637Z"
version: 4.2.1
digest: sha256:68bb76962afd28d471fe2e2059561d9fe82c271426caa13ef5f690e9f104084a
generated: "2024-07-02T10:25:15.690760576Z"
4 changes: 2 additions & 2 deletions deploy/helm/internal-charts/combined-db/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ description: |
Unless you attempt to run logical DBs over seperate physical DBs (via `global.useInK8sDbInstance.xxx`),
you should always enable this module (even when you use cloud based DB service e.g. AWS RDS or Google Cloud SQL).
name: combined-db
version: 4.1.0
version: 4.2.1
kubeVersion: ">= 1.14.0-0"
annotations:
magdaModuleType: "core"
dependencies:
- name: magda-postgres
version: "4.1.0"
version: "4.2.1"
repository: "file://../magda-postgres"
condition: global.useCombinedDb
4 changes: 2 additions & 2 deletions deploy/helm/internal-charts/combined-db/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# combined-db

![Version: 4.1.0](https://img.shields.io/badge/Version-4.1.0-informational?style=flat-square)
![Version: 4.2.1](https://img.shields.io/badge/Version-4.2.1-informational?style=flat-square)

The combined database target module for Magda.
Unless you attempt to run logical DBs over seperate physical DBs (via `global.useInK8sDbInstance.xxx`),
Expand All @@ -12,7 +12,7 @@ Kubernetes: `>= 1.14.0-0`

| Repository | Name | Version |
|------------|------|---------|
| file://../magda-postgres | magda-postgres | 4.1.0 |
| file://../magda-postgres | magda-postgres | 4.2.1 |

## Values

Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/internal-charts/content-api/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
description: A Helm chart for Kubernetes
name: content-api
version: 4.1.0
version: 4.2.1
kubeVersion: ">= 1.14.0-0"
annotations:
magdaModuleType: "core"
2 changes: 1 addition & 1 deletion deploy/helm/internal-charts/content-api/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# content-api

![Version: 4.1.0](https://img.shields.io/badge/Version-4.1.0-informational?style=flat-square)
![Version: 4.2.1](https://img.shields.io/badge/Version-4.2.1-informational?style=flat-square)

A Helm chart for Kubernetes

Expand Down
6 changes: 3 additions & 3 deletions deploy/helm/internal-charts/content-db/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies:
- name: magda-postgres
repository: file://../magda-postgres
version: 4.1.0
digest: sha256:69e620055127219816fded125ebf6f348d837e7a51b8ef8e8ad22ca1169579d6
generated: "2024-06-28T06:53:05.480516163Z"
version: 4.2.1
digest: sha256:a8e92bb58c251c44ee19fca501551c2bb662f3dc100a77b8bcb9f3a0e8532570
generated: "2024-07-02T10:25:15.777009223Z"
4 changes: 2 additions & 2 deletions deploy/helm/internal-charts/content-db/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
apiVersion: v2
description: A Helm chart for Kubernetes
name: content-db
version: 4.1.0
version: 4.2.1
kubeVersion: ">= 1.14.0-0"
annotations:
magdaModuleType: "core"
dependencies:
- name: magda-postgres
version: "4.1.0"
version: "4.2.1"
repository: "file://../magda-postgres"
condition: global.useInK8sDbInstance.content-db
4 changes: 2 additions & 2 deletions deploy/helm/internal-charts/content-db/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# content-db

![Version: 4.1.0](https://img.shields.io/badge/Version-4.1.0-informational?style=flat-square)
![Version: 4.2.1](https://img.shields.io/badge/Version-4.2.1-informational?style=flat-square)

A Helm chart for Kubernetes

Expand All @@ -10,7 +10,7 @@ Kubernetes: `>= 1.14.0-0`

| Repository | Name | Version |
|------------|------|---------|
| file://../magda-postgres | magda-postgres | 4.1.0 |
| file://../magda-postgres | magda-postgres | 4.2.1 |

## Values

Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/internal-charts/correspondence-api/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
description: A Helm chart for Kubernetes
name: correspondence-api
version: 4.1.0
version: 4.2.1
kubeVersion: ">= 1.14.0-0"
annotations:
magdaModuleType: "core"
2 changes: 1 addition & 1 deletion deploy/helm/internal-charts/correspondence-api/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# correspondence-api

![Version: 4.1.0](https://img.shields.io/badge/Version-4.1.0-informational?style=flat-square)
![Version: 4.2.1](https://img.shields.io/badge/Version-4.2.1-informational?style=flat-square)

A Helm chart for Kubernetes

Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/internal-charts/elasticsearch/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
description: A Helm chart for Kubernetes
name: elasticsearch
version: 4.1.0
version: 4.2.1
kubeVersion: ">= 1.14.0-0"
annotations:
magdaModuleType: "core"
2 changes: 1 addition & 1 deletion deploy/helm/internal-charts/elasticsearch/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# elasticsearch

![Version: 4.1.0](https://img.shields.io/badge/Version-4.1.0-informational?style=flat-square)
![Version: 4.2.1](https://img.shields.io/badge/Version-4.2.1-informational?style=flat-square)

A Helm chart for Kubernetes

Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/internal-charts/gateway/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
description: The Gateway Component of Magda that routes incoming requets to
other magda components.
name: gateway
version: 4.1.0
version: 4.2.1
kubeVersion: ">= 1.14.0-0"
annotations:
magdaModuleType: "core"
2 changes: 1 addition & 1 deletion deploy/helm/internal-charts/gateway/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# gateway

![Version: 4.1.0](https://img.shields.io/badge/Version-4.1.0-informational?style=flat-square)
![Version: 4.2.1](https://img.shields.io/badge/Version-4.2.1-informational?style=flat-square)

The Gateway Component of Magda that routes incoming requets to other magda components.

Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/internal-charts/indexer/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
description: A Helm chart for Magda's Indexer service.
name: indexer
version: 4.1.0
version: 4.2.1
kubeVersion: ">= 1.21.0"
annotations:
magdaModuleType: "core"
2 changes: 1 addition & 1 deletion deploy/helm/internal-charts/indexer/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# indexer

![Version: 4.1.0](https://img.shields.io/badge/Version-4.1.0-informational?style=flat-square)
![Version: 4.2.1](https://img.shields.io/badge/Version-4.2.1-informational?style=flat-square)

A Helm chart for Magda's Indexer service.

Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/internal-charts/ingress/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
description: A Helm chart for Kubernetes
name: ingress
version: 4.1.0
version: 4.2.1
kubeVersion: ">= 1.19.0-0"
annotations:
magdaModuleType: "core"
2 changes: 1 addition & 1 deletion deploy/helm/internal-charts/ingress/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# ingress

![Version: 4.1.0](https://img.shields.io/badge/Version-4.1.0-informational?style=flat-square)
![Version: 4.2.1](https://img.shields.io/badge/Version-4.2.1-informational?style=flat-square)

A Helm chart for Kubernetes

Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/internal-charts/magda-postgres/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: magda-postgres
description: "A helm wrapper chart that provides in-kubernetes postgreSQL for Magda."
type: application
kubeVersion: ">= 1.21.0"
version: "4.1.0"
version: "4.2.1"
annotations:
magdaModuleType: "core"
dependencies:
Expand Down
4 changes: 2 additions & 2 deletions deploy/helm/internal-charts/magda-postgres/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# magda-postgres

![Version: 4.1.0](https://img.shields.io/badge/Version-4.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
![Version: 4.2.1](https://img.shields.io/badge/Version-4.2.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)

A helm wrapper chart that provides in-kubernetes postgreSQL for Magda.

Expand Down Expand Up @@ -53,7 +53,7 @@ More config postgreSQL related options, please refer to: https://github.com/bitn
| postgresql.fullnameOverride | string | `"default-db-postgresql"` | Set `fullnameOverride` & `nameOverride` to fixed value so it's easier to manage the naming pattern. And point k8s service to DB instance. |
| postgresql.image.registry | string | `"ghcr.io"` | |
| postgresql.image.repository | string | `"magda-io/magda-postgres"` | |
| postgresql.image.tag | string | `"4.1.0"` | the default docker image tag/version used by the postgresql chart. When dump the magda version using `yarn set-version` (at magda repo root), this default version will be auto-replaced with the new chart version number. |
| postgresql.image.tag | string | `"4.2.1"` | the default docker image tag/version used by the postgresql chart. When dump the magda version using `yarn set-version` (at magda repo root), this default version will be auto-replaced with the new chart version number. |
| postgresql.livenessProbe.enabled | bool | `false` | `customLivenessProbe` will only be used when `enabled`=`false` Otherwise, default livenessProbe will be used. |
| postgresql.nameOverride | string | `"default-db-postgresql"` | Set `fullnameOverride` & `nameOverride` to fixed value so it's easier to manage the naming pattern. And point k8s service to DB instance. |
| postgresql.persistence.size | string | `"50Gi"` | set the persistence volume size of the postgresql statefulset |
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/internal-charts/magda-postgres/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ postgresql:
image:
# -- the default docker image tag/version used by the postgresql chart.
# When dump the magda version using `yarn set-version` (at magda repo root), this default version will be auto-replaced with the new chart version number.
tag: "4.1.0"
tag: "4.2.1"
repository: "magda-io/magda-postgres"
registry: "ghcr.io"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: A Helm chart for OpenSearch dashboards. To make the service
accessible externally, please refer to [this
doc](https://github.com/magda-io/magda/blob/main/docs/docs/how-to-expose-opensearch-dashboards.md)
name: opensearch-dashboards
version: 4.1.0
version: 4.2.1
kubeVersion: ">= 1.23.0-0"
annotations:
magdaModuleType: "core"
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# opensearch-dashboards

![Version: 4.1.0](https://img.shields.io/badge/Version-4.1.0-informational?style=flat-square)
![Version: 4.2.1](https://img.shields.io/badge/Version-4.2.1-informational?style=flat-square)

A Helm chart for OpenSearch dashboards. To make the service accessible externally, please refer to [this doc](https://github.com/magda-io/magda/blob/main/docs/docs/how-to-expose-opensearch-dashboards.md)

Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/internal-charts/opensearch/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
description: A Helm chart for Magda's OpenSearch Cluster
name: opensearch
version: 4.1.0
version: 4.2.1
kubeVersion: ">= 1.23.0-0"
annotations:
magdaModuleType: "core"
2 changes: 1 addition & 1 deletion deploy/helm/internal-charts/opensearch/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# opensearch

![Version: 4.1.0](https://img.shields.io/badge/Version-4.1.0-informational?style=flat-square)
![Version: 4.2.1](https://img.shields.io/badge/Version-4.2.1-informational?style=flat-square)

A Helm chart for Magda's OpenSearch Cluster

Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/internal-charts/priorities/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
description: A Helm chart for Kubernetes
name: priorities
version: 4.1.0
version: 4.2.1
kubeVersion: ">= 1.14.0-0"
annotations:
magdaModuleType: "core"
2 changes: 1 addition & 1 deletion deploy/helm/internal-charts/rds-dev-proxy/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: rds-dev-proxy
description: A RDS proxy for dev / debugging purpose
version: 4.1.0
version: 4.2.1
kubeVersion: ">= 1.14.0-0"
annotations:
magdaModuleType: "core"
Loading

0 comments on commit a65c675

Please sign in to comment.