Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add janitor/control plane services, cleanup. #69

Merged
merged 2 commits into from
Mar 2, 2024
Merged

Add janitor/control plane services, cleanup. #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fdd30be
Add janitor/control plane services, cleanup.
fmassot Mar 2, 2024
982c33e
Fix values for tests.
fmassot Mar 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/quickwit/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: quickwit
description: Sub-second search & analytics engine on cloud storage.
type: application
version: 0.5.4
version: 0.5.5
appVersion: "v0.7.1"
keywords:
- quickwit
Expand Down
2 changes: 1 addition & 1 deletion charts/quickwit/templates/control-plane-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ spec:
matchLabels:
{{- include "quickwit.control_plane.selectorLabels" . | nindent 6 }}
strategy:
{{- toYaml .Values.control_plane.updateStrategy | nindent 4 }}
type: Recreate
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ensures only one control plane in the metastore when upgrading the chart.

template:
metadata:
annotations:
Expand Down
2 changes: 1 addition & 1 deletion charts/quickwit/templates/janitor-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ spec:
matchLabels:
{{- include "quickwit.janitor.selectorLabels" . | nindent 6 }}
strategy:
{{- toYaml .Values.janitor.updateStrategy | nindent 4 }}
type: Recreate
template:
metadata:
annotations:
Expand Down
38 changes: 38 additions & 0 deletions charts/quickwit/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,42 @@ spec:
name: grpc
selector:
{{- include "quickwit.metastore.selectorLabels" . | nindent 4 }}
---
apiVersion: v1
kind: Service
metadata:
name: {{ include "quickwit.fullname" . }}-control-plane
labels:
{{- include "quickwit.labels" . | nindent 4 }}
spec:
type: {{ .Values.service.type }}
ports:
- port: 7280
targetPort: rest
protocol: TCP
name: rest
- port: 7281
targetPort: grpc
name: grpc
selector:
{{- include "quickwit.control_plane.selectorLabels" . | nindent 4 }}

---
apiVersion: v1
kind: Service
metadata:
name: {{ include "quickwit.fullname" . }}-janitor
labels:
{{- include "quickwit.labels" . | nindent 4 }}
spec:
type: {{ .Values.service.type }}
ports:
- port: 7280
targetPort: rest
protocol: TCP
name: rest
- port: 7281
targetPort: grpc
name: grpc
selector:
{{- include "quickwit.janitor.selectorLabels" . | nindent 4 }}
32 changes: 8 additions & 24 deletions charts/quickwit/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,11 +155,6 @@ metastore:
# cpu: 100m
# memory: 128Mi

## Pod distruption budget
podDisruptionBudget: {}
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cleanup: was not used in the chart.

# maxUnavailable: 1
# minAvailable: 2

updateStrategy: {}
# type: RollingUpdate

Expand Down Expand Up @@ -187,8 +182,6 @@ metastore:
affinity: {}

control_plane:
replicaCount: 1
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we don't want more than 1 control plane


# Extra env for control plane
extraEnv: {}
# KEY: VALUE
Expand All @@ -201,14 +194,6 @@ control_plane:
# cpu: 100m
# memory: 128Mi

## Pod distruption budget
podDisruptionBudget: {}
# maxUnavailable: 1
# minAvailable: 2

updateStrategy: {}
# type: RollingUpdate

startupProbe:
httpGet:
path: /health/livez
Expand Down Expand Up @@ -248,14 +233,6 @@ janitor:
# cpu: 100m
# memory: 128Mi

## Pod distruption budget
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

was not used

podDisruptionBudget: {}
# maxUnavailable: 1
# minAvailable: 2

updateStrategy: {}
# type: RollingUpdate

startupProbe:
httpGet:
path: /health/livez
Expand Down Expand Up @@ -306,14 +283,20 @@ bootstrap:
# Quickwit configuration
config:
# Metastore configuration.
postgres: {}
# Default to `qwdata/indexes` if not set.
# S3 metastore
# metastore_uri: s3://quickwit/indexes
#
# Postgres metastore
# postgres:
# host: ""
# port: 5432
# database: metastore
# username: quickwit
# password: ""
# max_num_connections: 50

# Storage configuration.
# storage:
# s3:
# endpoint: "http://custom-s3-endpoint"
Expand All @@ -327,6 +310,7 @@ config:
# access_key: "my-azure-blob-access-key"

default_index_root_uri: s3://quickwit/indexes

# Indexer settings
# indexer:
# split_store_max_num_bytes: 200G
Expand Down
Loading