Skip to content

Commit

Permalink
Merge pull request #247 from broadinstitute/se/DR-3413-remove-elastic…
Browse files Browse the repository at this point in the history
…search-module

[DR-3413] Remove de-elasticsearch chart
  • Loading branch information
samanehsan authored Jan 18, 2024
2 parents 74581f7 + 4b9df73 commit 7d00056
Show file tree
Hide file tree
Showing 14 changed files with 5 additions and 130 deletions.
1 change: 0 additions & 1 deletion .github/test-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ excluded-charts:
- charts/oidc-proxy
- charts/gcloud-sqlproxy
- charts/create-secret-manager-secret
- charts/de-elasticsearch
charts:
- charts/backend-config
- charts/datarepo
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/releasedr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ on:
- 'charts/gcloud-sqlproxy/**'
- 'charts/oidc-proxy/**'
- 'charts/gcp-managed-cert/**'
- 'charts/de-elasticsearch/**'

jobs:
release_new_umbrella_dr:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/releasenondr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ on:
- '!charts/create-secret-manager-secret/**'
- '!charts/gcloud-sqlproxy/**'
- '!charts/oidc-proxy/**'
- '!charts/de-elasticsearch/**'

jobs:
release_non_dr_chart:
Expand Down
7 changes: 2 additions & 5 deletions charts/datarepo/Chart.lock
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,8 @@ dependencies:
- name: create-secret-manager-secret
repository: https://broadinstitute.github.io/datarepo-helm/
version: 0.0.6
- name: de-elasticsearch
repository: https://broadinstitute.github.io/datarepo-helm/
version: 0.1.4
- name: postgres
repository: https://terra-helm.storage.googleapis.com/
version: 0.26.0
digest: sha256:abbabe591136d12e44e97bd6e538fb07b50676ad43a4d75dd9c0b73cad291399
generated: "2024-01-17T16:51:44.429599987Z"
digest: sha256:98f06426708ce763118547e1a62b2b060b387b12944800d809de105c6a03aef8
generated: "2024-01-18T13:25:16.141926-05:00"
8 changes: 2 additions & 6 deletions charts/datarepo/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version

version: 0.1.834
appVersion: 0.1.834
version: 0.2.0
appVersion: 0.2.0
keywords:
- google
- cloud
Expand Down Expand Up @@ -47,10 +47,6 @@ dependencies:
version: 0.0.6
repository: https://broadinstitute.github.io/datarepo-helm/
condition: create-secret-manager-secret.enabled
- name: de-elasticsearch
version: 0.1.4
repository: https://broadinstitute.github.io/datarepo-helm/
condition: de-elasticsearch.enabled
- name: postgres
version: 0.26.0
repository: https://terra-helm.storage.googleapis.com/
Expand Down
1 change: 0 additions & 1 deletion charts/datarepo/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ This chart will do the following:
- [datarepo-ui](https://github.com/broadinstitute/datarepo-helm/tree/master/charts/datarepo-ui)
- [oidc-proxy](https://github.com/broadinstitute/datarepo-helm/tree/master/charts/oidc-proxy)
- [gcloud-sqlproxy](https://github.com/broadinstitute/datarepo-helm/tree/master/charts/gcloud-sqlproxy)
- [de-elasticsearch](https://github.com/broadinstitute/datarepo-helm/tree/master/charts/de-elasticsearch)
- [Postgresql](https://github.com/helm/charts/tree/master/stable/postgresql)

## Prerequisite
Expand Down
4 changes: 0 additions & 4 deletions charts/datarepo/ci/testing-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,3 @@ oidc-proxy:
rbac:
create: true
pspEnabled: true

de-elasticsearch:
enabled: true
fullnameOverride: test-de-elasticsearch
5 changes: 1 addition & 4 deletions charts/datarepo/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,6 @@ datarepo-ui:
## rbac:
## create: true

de-elasticsearch:
enabled: false

oidc-proxy:
enabled: false ## if true uncomment below
## env:
Expand Down Expand Up @@ -121,7 +118,7 @@ oidc-proxy:
## -----END CERTIFICATE-----

# enable local postgres chart deployment (rather than external cloudsql)
postgres:
postgres:
enabled: false

## https://github.com/helm/charts/tree/master/stable/postgresql
Expand Down
23 changes: 0 additions & 23 deletions charts/de-elasticsearch/.helmignore

This file was deleted.

6 changes: 0 additions & 6 deletions charts/de-elasticsearch/Chart.lock

This file was deleted.

12 changes: 0 additions & 12 deletions charts/de-elasticsearch/Chart.yaml

This file was deleted.

8 changes: 0 additions & 8 deletions charts/de-elasticsearch/README.md

This file was deleted.

Binary file not shown.
58 changes: 0 additions & 58 deletions charts/de-elasticsearch/values.yaml

This file was deleted.

0 comments on commit 7d00056

Please sign in to comment.