diff --git a/.github/test-config.yaml b/.github/test-config.yaml index 9867311a..c8d47cbd 100644 --- a/.github/test-config.yaml +++ b/.github/test-config.yaml @@ -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 diff --git a/.github/workflows/releasedr.yaml b/.github/workflows/releasedr.yaml index 0061a319..cfa6322c 100644 --- a/.github/workflows/releasedr.yaml +++ b/.github/workflows/releasedr.yaml @@ -24,7 +24,6 @@ on: - 'charts/gcloud-sqlproxy/**' - 'charts/oidc-proxy/**' - 'charts/gcp-managed-cert/**' - - 'charts/de-elasticsearch/**' jobs: release_new_umbrella_dr: diff --git a/.github/workflows/releasenondr.yaml b/.github/workflows/releasenondr.yaml index 605597a5..34fb9ea1 100644 --- a/.github/workflows/releasenondr.yaml +++ b/.github/workflows/releasenondr.yaml @@ -15,7 +15,6 @@ on: - '!charts/create-secret-manager-secret/**' - '!charts/gcloud-sqlproxy/**' - '!charts/oidc-proxy/**' - - '!charts/de-elasticsearch/**' jobs: release_non_dr_chart: diff --git a/charts/datarepo/Chart.lock b/charts/datarepo/Chart.lock index 760308df..a1f10136 100644 --- a/charts/datarepo/Chart.lock +++ b/charts/datarepo/Chart.lock @@ -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" diff --git a/charts/datarepo/Chart.yaml b/charts/datarepo/Chart.yaml index e8861d51..a2937f5b 100644 --- a/charts/datarepo/Chart.yaml +++ b/charts/datarepo/Chart.yaml @@ -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 @@ -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/ diff --git a/charts/datarepo/README.md b/charts/datarepo/README.md index bb9d8e24..8c0b48d1 100644 --- a/charts/datarepo/README.md +++ b/charts/datarepo/README.md @@ -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 diff --git a/charts/datarepo/ci/testing-values.yaml b/charts/datarepo/ci/testing-values.yaml index 3517acf5..021ab48d 100644 --- a/charts/datarepo/ci/testing-values.yaml +++ b/charts/datarepo/ci/testing-values.yaml @@ -101,7 +101,3 @@ oidc-proxy: rbac: create: true pspEnabled: true - -de-elasticsearch: - enabled: true - fullnameOverride: test-de-elasticsearch diff --git a/charts/datarepo/values.yaml b/charts/datarepo/values.yaml index b333867c..30803ca3 100644 --- a/charts/datarepo/values.yaml +++ b/charts/datarepo/values.yaml @@ -86,9 +86,6 @@ datarepo-ui: ## rbac: ## create: true -de-elasticsearch: - enabled: false - oidc-proxy: enabled: false ## if true uncomment below ## env: @@ -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 diff --git a/charts/de-elasticsearch/.helmignore b/charts/de-elasticsearch/.helmignore deleted file mode 100644 index 0e8a0eb3..00000000 --- a/charts/de-elasticsearch/.helmignore +++ /dev/null @@ -1,23 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ diff --git a/charts/de-elasticsearch/Chart.lock b/charts/de-elasticsearch/Chart.lock deleted file mode 100644 index 0a35c9cb..00000000 --- a/charts/de-elasticsearch/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: elasticsearch - repository: https://helm.elastic.co - version: 7.10.2 -digest: sha256:f47907c5cb3299e4b34b332608bf4a0f3e396be80329e270a3abfed46abed932 -generated: "2021-04-21T18:39:58.650729-04:00" diff --git a/charts/de-elasticsearch/Chart.yaml b/charts/de-elasticsearch/Chart.yaml deleted file mode 100755 index 95e16fd8..00000000 --- a/charts/de-elasticsearch/Chart.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v2 -name: de-elasticsearch -description: A Helm chart for elastic search in data explorer -type: application -version: 0.1.4 -maintainers: - - email: tjiang@broadinstitute.org - name: tjiang -dependencies: - - name: elasticsearch - version: 7.10.2 - repository: https://helm.elastic.co diff --git a/charts/de-elasticsearch/README.md b/charts/de-elasticsearch/README.md deleted file mode 100644 index f4ce2650..00000000 --- a/charts/de-elasticsearch/README.md +++ /dev/null @@ -1,8 +0,0 @@ -Deploys the [official elastic search helm chart](https://github.com/elastic/helm-charts/tree/v7.10.2/elasticsearch) -as a sub chart. - -to install: -`helm install --debug elastic de-elasticsearch --namespace ` - -to uninstall: -`helm uninstall --debug elastic de-elasticsearch --namespace ` \ No newline at end of file diff --git a/charts/de-elasticsearch/charts/elasticsearch-7.10.2.tgz b/charts/de-elasticsearch/charts/elasticsearch-7.10.2.tgz deleted file mode 100644 index ce764ffd..00000000 Binary files a/charts/de-elasticsearch/charts/elasticsearch-7.10.2.tgz and /dev/null differ diff --git a/charts/de-elasticsearch/values.yaml b/charts/de-elasticsearch/values.yaml deleted file mode 100755 index 21e0b560..00000000 --- a/charts/de-elasticsearch/values.yaml +++ /dev/null @@ -1,58 +0,0 @@ -elasticsearch: - clusterName: "oss" - nodeGroup: "master" - - # See here for default elastic search node roles: - # https://github.com/elastic/helm-charts/blob/2f26d502ea35352649d02b8e56ccabec6c6af1ab/elasticsearch/values.yaml#L11 - # Elasticsearch roles that will be applied to this nodeGroup - # These will be set as environment variables. E.g. node.master=true - # see here for documentation on roles, they're important for scaling!: - # https://www.elastic.co/guide/en/elasticsearch/reference/current/modules-node.html - - replicas: 3 - image: "us.gcr.io/broad-dsp-gcr-public/elasticsearch/elasticsearch-oss" - imageTag: "7.10.2-log4j-2.17.1" - imagePullPolicy: "IfNotPresent" - - # We'll probably want to tweak this, leaving as default for now, - # see here https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ - # for documentation on configuring resources - resources: - requests: - cpu: "1000m" - memory: "2Gi" - limits: - cpu: "1000m" - memory: "2Gi" - - # will most likely want to increase this, see https://kubernetes.io/docs/concepts/storage/persistent-volumes/ - volumeClaimTemplate: - accessModes: ["ReadWriteOnce"] - resources: - requests: - storage: 30Gi - - rbac: - create: true - - podSecurityPolicy: - create: true - spec: - privileged: true - fsGroup: - rule: RunAsAny - runAsUser: - rule: RunAsAny - seLinux: - rule: RunAsAny - supplementalGroups: - rule: RunAsAny - volumes: - - secret - - configMap - - persistentVolumeClaim - - emptyDir - - # we may want a custom node pool here - nodeSelector: {} - tolerations: []