Skip to content

Commit

Permalink
Various MS changes. Enable debug
Browse files Browse the repository at this point in the history
  • Loading branch information
alerman committed Dec 6, 2024
1 parent 1a5c936 commit 48da888
Show file tree
Hide file tree
Showing 10 changed files with 81 additions and 2 deletions.
6 changes: 6 additions & 0 deletions common-service-library/templates/_deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,12 @@ spec:
runAsUser: {{ .Values.global.security.userid }}
containers:
- name: "{{ .Values.meta.name }}"
command:
{{ if .Values.command }}
{{- range $i, $value := .Values.command }}
- {{ $value }}
{{- end }}
{{- end }}
args:
{{- range $i, $value := .Values.args }}
- {{ $value }}
Expand Down
2 changes: 1 addition & 1 deletion configuration/configMapFiles/accumulo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ accumulo:
audit-client:
discovery:
enabled: false
uri: '${AUDIT_SERVER_URL:http://localhost:11111/audit}'
uri: '${AUDIT_SERVER_URL:http://audit-service:8080/audit}'

datawave:
swagger:
Expand Down
2 changes: 1 addition & 1 deletion configuration/configMapFiles/query.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,4 @@ datawave:
audit-client:
discovery:
enabled: false
uri: '${AUDIT_SERVER_URL:http://localhost:11111/audit}'
uri: '${AUDIT_SERVER_URL:http://audit-service:8080/audit}'
2 changes: 2 additions & 0 deletions datawave-driver.sh
Original file line number Diff line number Diff line change
Expand Up @@ -262,11 +262,13 @@ function update_hosts_file_for_hadoop() {
function configure_etc_hosts(){
sudo sed -i "/^$/d" /etc/hosts
sudo sed -i "/.*datawave\.org.*/d" /etc/hosts
sudo sed -i "/.*microwave\.org.*/d" /etc/hosts
sudo sed -i "/.*zookeeper.*/d" /etc/hosts
sudo sed -i "/.*hdfs.*/d" /etc/hosts
sudo sed -i "/.*yarn.*/d" /etc/hosts
echo "$(minikube ip) accumulo.datawave.org" | sudo tee -a /etc/hosts
echo "$(minikube ip) web.datawave.org" | sudo tee -a /etc/hosts
echo "$(minikube ip) query.microwave.org" | sudo tee -a /etc/hosts
echo "$(minikube ip) dictionary.datawave.org" | sudo tee -a /etc/hosts

if ${USE_EXISTING_ZOOKEEPER}; then
Expand Down
1 change: 1 addition & 0 deletions datawave-stack/values-testing.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ dwv-accumulo:
dwv-hadoop:
image:
tag: 3.3.6

12 changes: 12 additions & 0 deletions datawave-stack/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,15 @@ external:
hosts:
- yarn-rm
- yarn-nm
dwv-query:
command:
- java
- -agentlib:jdwp=transport=dt_socket,server=y,address=5005,suspend=n
- -jar
- app.jar
dwv-executor:
command:
- java
- -agentlib:jdwp=transport=dt_socket,server=y,address=5005,suspend=n
- -jar
- app.jar
3 changes: 3 additions & 0 deletions kafdrop/templates/kafdrop-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -83,3 +83,6 @@ spec:
image: "{{ .Values.image.name }}:{{ .Values.image.tag }}"
imagePullPolicy: "{{ .Values.image.pullPolicy }}"
resources: {}
env:
- name: KAFKA_BROKERCONNECT
value: {{.Values.global.serviceDns.kafka.name }}:{{.Values.global.serviceDns.kafka.port }}
4 changes: 4 additions & 0 deletions kafdrop/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ global:
certSecretName: certificates-secret
pullSecrets:
- dockerconfigjson-ghcr
serviceDns:
kafka:
name: kafka
port: 9092

#######################################
# Default Values for Audit Deployment #
Expand Down
45 changes: 45 additions & 0 deletions query/templates/query-ingress.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
####################################
# Core Helm Template Configuration #
####################################
{{- if .Values.global.ingress.enabled }}
apiVersion: networking.k8s.io/v1
kind: Ingress

######################################
# Basic Metadata for this Deployment #
######################################

metadata:
name: "{{ .Chart.Name }}-qms-ingress"
annotations:
{{- with .Values.global.ingress.annotations }}
{{- toYaml . | nindent 4 }}
{{- end }}

####################################
# Ingress Controller Specification #
####################################

spec:

################################################
# Transport-Layer Security (TLS) Configuration #
################################################


#########################################
# Ingress Controller Rule Configuration #
#########################################
ingressClassName: "{{ .Values.global.ingress.ingressClassName }}"
rules:
- host: "{{ .Values.global.ingress.domain }}"
http:
paths:
- path: /
pathType: Prefix
backend:
service:
name: "{{ .Values.service.name }}"
port:
number: {{ .Values.ports.https }}
{{- end }}
6 changes: 6 additions & 0 deletions query/values.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
global:
ingress:
enabled: true
annotations:
nginx.ingress.kubernetes.io/ssl-passthrough: "true"
ingressClassName: nginx
domain: "query.microwave.org"
security:
userid: 1000
dockerRegistry:
Expand Down

0 comments on commit 48da888

Please sign in to comment.