Skip to content

Commit

Permalink
Remove Elasticsearch dependency and update Helm package
Browse files Browse the repository at this point in the history
  • Loading branch information
mechermu committed Jan 21, 2025
1 parent 15f2437 commit 0b37be3
Show file tree
Hide file tree
Showing 5 changed files with 118 additions and 47 deletions.
52 changes: 37 additions & 15 deletions index.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,29 @@ entries:
nomad:
- apiVersion: v2
appVersion: "1.0"
created: "2025-01-21T12:43:34.41964979Z"
created: "2025-01-21T13:08:18.681383832Z"
dependencies:
- condition: rabbitmq.enabled
name: rabbitmq
repository: oci://registry-1.docker.io/bitnamicharts
version: 15.2.3
- condition: mongodb.enabled
name: mongodb
repository: oci://registry-1.docker.io/bitnamicharts
version: 16.4.2
- condition: jupyterhub.enabled
name: jupyterhub
repository: https://jupyterhub.github.io/helm-chart
version: 3.0.3
description: A Helm chart to deploy NOMAD in Kubernetes
digest: f186a990c1aa69f170bbb76791ecac36b048a0d1b84227263ff6ca2bdf025f24
name: nomad
urls:
- nomad-0.2.0.tgz
version: 0.2.0
- apiVersion: v2
appVersion: "1.0"
created: "2025-01-21T13:08:18.542263109Z"
dependencies:
- condition: rabbitmq.enabled
name: rabbitmq
Expand All @@ -29,7 +51,7 @@ entries:
version: 0.1.13
- apiVersion: v2
appVersion: "1.0"
created: "2025-01-21T12:43:34.387947805Z"
created: "2025-01-21T13:08:18.523393781Z"
dependencies:
- condition: rabbitmq.enabled
name: rabbitmq
Expand All @@ -55,7 +77,7 @@ entries:
version: 0.1.12
- apiVersion: v2
appVersion: "1.0"
created: "2025-01-21T12:43:34.364048999Z"
created: "2025-01-21T13:08:18.509062336Z"
dependencies:
- condition: rabbitmq.enabled
name: rabbitmq
Expand All @@ -81,7 +103,7 @@ entries:
version: 0.1.11
- apiVersion: v2
appVersion: "1.0"
created: "2025-01-21T12:43:34.348568994Z"
created: "2025-01-21T13:08:18.494001653Z"
dependencies:
- condition: rabbitmq.enabled
name: rabbitmq
Expand All @@ -107,7 +129,7 @@ entries:
version: 0.1.10
- apiVersion: v2
appVersion: "1.0"
created: "2025-01-21T12:43:34.729639873Z"
created: "2025-01-21T13:08:18.663961386Z"
dependencies:
- condition: rabbitmq.enabled
name: rabbitmq
Expand All @@ -133,7 +155,7 @@ entries:
version: 0.1.9
- apiVersion: v2
appVersion: "1.0"
created: "2025-01-21T12:43:34.668928352Z"
created: "2025-01-21T13:08:18.649990245Z"
dependencies:
- condition: rabbitmq.enabled
name: rabbitmq
Expand All @@ -159,7 +181,7 @@ entries:
version: 0.1.8
- apiVersion: v2
appVersion: "1.0"
created: "2025-01-21T12:43:34.613854051Z"
created: "2025-01-21T13:08:18.635297438Z"
dependencies:
- condition: rabbitmq.enabled
name: rabbitmq
Expand All @@ -185,7 +207,7 @@ entries:
version: 0.1.7
- apiVersion: v2
appVersion: "1.0"
created: "2025-01-21T12:43:34.581841024Z"
created: "2025-01-21T13:08:18.618251715Z"
dependencies:
- condition: rabbitmq.enabled
name: rabbitmq
Expand All @@ -211,7 +233,7 @@ entries:
version: 0.1.6
- apiVersion: v2
appVersion: "1.0"
created: "2025-01-21T12:43:34.544059434Z"
created: "2025-01-21T13:08:18.604229521Z"
dependencies:
- condition: rabbitmq.enabled
name: rabbitmq
Expand All @@ -237,7 +259,7 @@ entries:
version: 0.1.5
- apiVersion: v2
appVersion: "1.0"
created: "2025-01-21T12:43:34.509036533Z"
created: "2025-01-21T13:08:18.589782762Z"
dependencies:
- condition: rabbitmq.enabled
name: rabbitmq
Expand All @@ -263,7 +285,7 @@ entries:
version: 0.1.4
- apiVersion: v2
appVersion: "1.0"
created: "2025-01-21T12:43:34.48311104Z"
created: "2025-01-21T13:08:18.573485356Z"
dependencies:
- condition: rabbitmq.enabled
name: rabbitmq
Expand All @@ -289,7 +311,7 @@ entries:
version: 0.1.3
- apiVersion: v2
appVersion: "1.0"
created: "2025-01-21T12:43:34.452367826Z"
created: "2025-01-21T13:08:18.55916614Z"
dependencies:
- name: rabbitmq
repository: https://charts.bitnami.com/bitnami
Expand All @@ -311,7 +333,7 @@ entries:
version: 0.1.2
- apiVersion: v2
appVersion: "1.0"
created: "2025-01-21T12:43:34.334363812Z"
created: "2025-01-21T13:08:18.478590151Z"
dependencies:
- name: rabbitmq
repository: https://charts.bitnami.com/bitnami
Expand All @@ -333,7 +355,7 @@ entries:
version: 0.1.1
- apiVersion: v2
appVersion: "1.0"
created: "2025-01-21T12:43:34.317555958Z"
created: "2025-01-21T13:08:18.46108601Z"
dependencies:
- name: rabbitmq
repository: https://charts.bitnami.com/bitnami
Expand All @@ -356,4 +378,4 @@ entries:
urls:
- nomad-0.1.0.tgz
version: 0.1.0
generated: "2025-01-21T12:43:34.301541912Z"
generated: "2025-01-21T13:08:18.445015572Z"
Binary file added nomad-0.2.0.tgz
Binary file not shown.
6 changes: 1 addition & 5 deletions ops/kubernetes/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
apiVersion: v2
name: nomad
description: A Helm chart to deploy NOMAD in Kubernetes
version: 0.1.13
version: 0.2.0
appVersion: "1.0"
dependencies:
- name: rabbitmq
version: 15.2.3
repository: oci://registry-1.docker.io/bitnamicharts
condition: rabbitmq.enabled
- name: elasticsearch
version: 7.17.3
repository: https://helm.elastic.co
condition: elasticsearch.enabled
- name: mongodb
version: 16.4.2
repository: oci://registry-1.docker.io/bitnamicharts
Expand Down
76 changes: 76 additions & 0 deletions ops/kubernetes/templates/elasticsearch-deployment.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ .Release.Name }}-elastic
labels:
app: {{ .Release.Name }}
component: elasticsearch
spec:
replicas: 1
selector:
matchLabels:
app: {{ .Release.Name }}
component: elasticsearch
template:
metadata:
labels:
app: {{ .Release.Name }}
component: elasticsearch
spec:
containers:
- name: elasticsearch
image: elasticsearch:7.17.24
env:
- name: ES_JAVA_OPTS
value: "-Xms512m -Xmx512m"
- name: discovery.type
value: "single-node"
ports:
- containerPort: 9200
- containerPort: 9300
volumeMounts:
- name: elasticsearch-data
mountPath: /usr/share/elasticsearch/data
resources:
requests:
memory: "1Gi"
cpu: "500m"
limits:
memory: "2Gi"
cpu: "1"
volumes:
- name: elasticsearch-data
persistentVolumeClaim:
claimName: {{ .Release.Name }}-elastic-pvc
---
apiVersion: v1
kind: Service
metadata:
name: {{ .Release.Name }}-elastic
labels:
app: {{ .Release.Name }}
component: elasticsearch
spec:
ports:
- port: 9200
targetPort: 9200
protocol: TCP
name: http
- port: 9300
targetPort: 9300
protocol: TCP
name: transport
selector:
app: {{ .Release.Name }}
component: elasticsearch
---
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: {{ .Release.Name }}-elastic-pvc
spec:
accessModes:
- ReadWriteOnce
resources:
requests:
storage: 10Gi
31 changes: 4 additions & 27 deletions ops/kubernetes/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,29 +42,6 @@ rabbitmq:
RABBITMQ_DEFAULT_PASS: rabbitmq
RABBITMQ_DEFAULT_VHOST: /

elasticsearch:
enabled: true
condition: elasticsearch.enabled
clusterName: "{{ .Release.Name }}-elastic"
replicas: 1
roles:
- master
- data
protocol: http
createCert: false
extraEnvs:
- name: xpack.security.enabled
value: "false"
esConfig:
elasticsearch.yml: |
node.store.allow_mmap: false
xpack.security.authc:
anonymous:
authz_exception: false
roles: superuser
username: anonymous
clusterHealthCheckParams: "wait_for_status=yellow&timeout=1s"

mongodb:
enabled: true
condition: mongodb.enabled
Expand Down Expand Up @@ -97,7 +74,7 @@ app:
NOMAD_SERVICES_API_PORT: 80
NOMAD_FS_EXTERNAL_WORKING_DIRECTORY: /app/.volumes/fs
NOMAD_RABBITMQ_HOST: "{{ .Release.Name }}-rabbitmq"
NOMAD_ELASTIC_HOST: "{{ .Release.Name }}-elastic-master"
NOMAD_ELASTIC_HOST: "{{ .Release.Name }}-elastic"
NOMAD_MONGO_HOST: "{{ .Release.Name }}-mongodb"
NOMAD_MONGO_USERNAME: root
NOMAD_MONGO_PASSWORD: "{{ .Values.mongodb.auth.rootPassword }}"
Expand All @@ -113,7 +90,7 @@ worker:
env:
NOMAD_SERVICE: nomad_oasis_worker
NOMAD_RABBITMQ_HOST: "{{ .Release.Name }}-rabbitmq"
NOMAD_ELASTIC_HOST: "{{ .Release.Name }}-elastic-master"
NOMAD_ELASTIC_HOST: "{{ .Release.Name }}-elastic"
NOMAD_MONGO_HOST: "{{ .Release.Name }}-mongodb"
NOMAD_MONGO_USERNAME: root
NOMAD_MONGO_PASSWORD: "{{ .Values.mongodb.auth.rootPassword }}"
Expand All @@ -134,7 +111,7 @@ north:
NOMAD_SERVICES_API_HOST: app
NOMAD_FS_EXTERNAL_WORKING_DIRECTORY: /app/.volumes/fs
NOMAD_RABBITMQ_HOST: "{{ .Release.Name }}-rabbitmq"
NOMAD_ELASTIC_HOST: "{{ .Release.Name }}-elastic-master"
NOMAD_ELASTIC_HOST: "{{ .Release.Name }}-elastic"
NOMAD_MONGO_HOST: "{{ .Release.Name }}-mongodb"
NOMAD_MONGO_USERNAME: root
NOMAD_MONGO_PASSWORD: "{{ .Values.mongodb.auth.rootPassword }}"
Expand All @@ -153,7 +130,7 @@ ingress:
# Hostname for the ingress
host: nomad-oasis.example.com
# Ingress annotations
annotations:
annotations:
# Example annotations:
# nginx.ingress.kubernetes.io/ssl-redirect: "true"
# nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
Expand Down

0 comments on commit 0b37be3

Please sign in to comment.