Skip to content

Commit a2c7d0c

Browse files
authored
Merge pull request #5123 from cfpb/fix-db-helm
update databrowser chart
2 parents be00d33 + 819f861 commit a2c7d0c

19 files changed

Lines changed: 18 additions & 402 deletions

File tree

check-digit/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
packageName in Docker := "hmda-check-digit"
1+
packageName in Docker := "check-digit"
22

33
dockerExposedPorts := Vector(9091, 60080)
44

data-browser/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
packageName in Docker := "hmda-data-browser-api"
1+
packageName in Docker := "data-browser"
22

33
version in Docker := "latest"

kubernetes/beta/hmda-data-browser-api/templates/deployment.yaml

Lines changed: 0 additions & 132 deletions
This file was deleted.

kubernetes/beta/hmda-data-browser-api/templates/ingress.yaml

Lines changed: 0 additions & 38 deletions
This file was deleted.

kubernetes/beta/hmda-data-browser-api/templates/service.yaml

Lines changed: 0 additions & 32 deletions
This file was deleted.

kubernetes/beta/hmda-data-browser-api/values.yaml

Lines changed: 0 additions & 76 deletions
This file was deleted.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
apiVersion: v1
22
appVersion: "2.7.2"
33
description: A Helm chart for Kubernetes
4-
name: hmda-data-browser-api
4+
name: data-browser
55
version: 2.7.2
File renamed without changes.

kubernetes/beta/hmda-data-browser-api/templates/_helpers.tpl renamed to kubernetes/data-browser/templates/_helpers.tpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{{/*
33
Expand the name of the chart.
44
*/}}
5-
{{- define "hmda-data-browser-api.name" -}}
5+
{{- define "data-browser.name" -}}
66
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
77
{{- end -}}
88

@@ -11,7 +11,7 @@ Create a default fully qualified app name.
1111
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
1212
If release name contains chart name it will be used as a full name.
1313
*/}}
14-
{{- define "hmda-data-browser-api.fullname" -}}
14+
{{- define "data-browser.fullname" -}}
1515
{{- if .Values.fullnameOverride -}}
1616
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
1717
{{- else -}}
@@ -27,6 +27,6 @@ If release name contains chart name it will be used as a full name.
2727
{{/*
2828
Create chart name and version as used by the chart label.
2929
*/}}
30-
{{- define "hmda-data-browser-api.chart" -}}
30+
{{- define "data-browser.chart" -}}
3131
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
3232
{{- end -}}

kubernetes/hmda-data-browser-api/templates/deployment.yaml renamed to kubernetes/data-browser/templates/deployment.yaml

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
apiVersion: apps/v1
22
kind: Deployment
33
metadata:
4-
name: {{ include "hmda-data-browser-api.fullname" . }}
4+
name: {{ include "data-browser.fullname" . }}
55
labels:
6-
app: {{ include "hmda-data-browser-api.name" . }}
7-
chart: {{ include "hmda-data-browser-api.chart" . }}
6+
app: {{ include "data-browser.name" . }}
7+
chart: {{ include "data-browser.chart" . }}
88
release: {{ .Release.Name }}
99
heritage: {{ .Release.Service }}
1010
spec:
1111
replicas: {{ .Values.replicaCount }}
1212
selector:
1313
matchLabels:
14-
app: {{ include "hmda-data-browser-api.name" . }}
14+
app: {{ include "data-browser.name" . }}
1515
release: {{ .Release.Name }}
1616
template:
1717
metadata:
1818
labels:
19-
app: {{ include "hmda-data-browser-api.name" . }}
19+
app: {{ include "data-browser.name" . }}
2020
release: {{ .Release.Name }}
2121
spec:
2222
# initContainers:
@@ -112,7 +112,7 @@ spec:
112112
allowPrivilegeEscalation: false
113113
capabilities:
114114
drop:
115-
- ALL
115+
- ALL
116116
imagePullPolicy: {{ .Values.image.pullPolicy }}
117117
env:
118118
# - name: _JAVA_OPTIONS
@@ -192,11 +192,6 @@ spec:
192192
value: "redis"
193193
- name: REDIS_PORT
194194
value: "6379"
195-
- name: S3_PUBLIC_BUCKET
196-
valueFrom:
197-
configMapKeyRef:
198-
name: s3-configmap
199-
key: s3-public-bucket
200195
- name: REDIS_PASS
201196
valueFrom:
202197
secretKeyRef:

0 commit comments

Comments
 (0)