Skip to content

Commit 97e250c

Browse files
authored
258 make log level configurable and other env variables for metrics exporter healthcheck sidecar and typesense server (#260)
* added logLevel for metrics-exporter and healthcheck as enum based on slog level values #258 * bump charts and versions #258
1 parent b773de3 commit 97e250c

11 files changed

Lines changed: 70 additions & 9 deletions

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ OPERATOR_SDK_VERSION ?= v1.39.0
5252
# Image URL to use all building/pushing image targets
5353
DOCKER_HUB_NAME ?= quay.io/akyriako#$(shell docker info | sed '/Username:/!d;s/.* //')
5454
IMG_NAME ?= typesense-operator
55-
IMG_TAG ?= 0.4.1-dev.13
55+
IMG_TAG ?= 0.4.1-rc.1
5656
IMG ?= $(DOCKER_HUB_NAME)/$(IMG_NAME):$(IMG_TAG)
5757

5858
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ Join the conversation:
228228
## 📦 Project Status
229229
230230
TyKO is an **independently maintained** project (not affiliated with Typesense, Inc.).
231-
- Latest version: **0.4.0**
231+
- Latest version: **0.4.1-rc.1**
232232
- Tested on: Kubernetes 1.35 (earliest 1.26), Typesense 30.0 (earliest 26.0)
233233
- Contributions welcome! See [FAQ](https://akyriako.github.io/typesense-operator-docs/docs/faq) and [Development](https://akyriako.github.io/typesense-operator-docs/docs/development)
234234

api/v1alpha1/typesensecluster_types_healthcheck.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,16 @@ type HealthCheckSpec struct {
1212

1313
// +kubebuilder:validation:Optional
1414
Resources *corev1.ResourceRequirements `json:"resources,omitempty"`
15+
16+
// +optional
17+
// +kubebuilder:default=0
18+
// +kubebuilder:validation:Minimum=-4
19+
// +kubebuilder:validation:Maximum=8
20+
// +kubebuilder:validation:ExclusiveMinimum=false
21+
// +kubebuilder:validation:ExclusiveMaximum=false
22+
// +kubebuilder:validation:Type=integer
23+
// +kubebuilder:validation:Enum=-4;0;4;8
24+
LogLevel int `json:"logLevel,omitempty"`
1525
}
1626

1727
func (s *TypesenseClusterSpec) GetHealthCheckSidecarSpecs() HealthCheckSpec {

api/v1alpha1/typesensecluster_types_metrics.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,16 @@ type MetricsExporterSpec struct {
2323

2424
// +kubebuilder:validation:Optional
2525
Resources *corev1.ResourceRequirements `json:"resources,omitempty"`
26+
27+
// +optional
28+
// +kubebuilder:default=0
29+
// +kubebuilder:validation:Minimum=-4
30+
// +kubebuilder:validation:Maximum=8
31+
// +kubebuilder:validation:ExclusiveMinimum=false
32+
// +kubebuilder:validation:ExclusiveMaximum=false
33+
// +kubebuilder:validation:Type=integer
34+
// +kubebuilder:validation:Enum=-4;0;4;8
35+
LogLevel int `json:"logLevel,omitempty"`
2636
}
2737

2838
func (s *TypesenseClusterSpec) GetMetricsExporterSpecs() MetricsExporterSpec {

charts/typesense-operator/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ type: application
1414
# This is the chart version. This version number should be incremented each time you make changes
1515
# to the chart and its templates, including the app version.
1616
# Versions are expected to follow Semantic Versioning (https://semver.org/)
17-
version: 0.4.0
17+
version: 0.4.1-rc.1
1818
# This is the version number of the application being deployed. This version number should be
1919
# incremented each time you make changes to the application. Versions are not expected to
2020
# follow Semantic Versioning. They should reflect the version the application is using.
2121
# It is recommended to use it with quotes.
22-
appVersion: "0.4.0"
22+
appVersion: "0.4.1-rc.1"
2323

2424
maintainers:
2525
- name: Kyriakos Akriotis

charts/typesense-operator/templates/typesensecluster-crd.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1025,6 +1025,16 @@ spec:
10251025
image:
10261026
default: quay.io/akyriako/typesense-healthcheck:0.1.8
10271027
type: string
1028+
logLevel:
1029+
default: 0
1030+
enum:
1031+
- -4
1032+
- 0
1033+
- 4
1034+
- 8
1035+
maximum: 8
1036+
minimum: -4
1037+
type: integer
10281038
resources:
10291039
description: ResourceRequirements describes the compute resource
10301040
requirements.
@@ -3509,6 +3519,16 @@ spec:
35093519
maximum: 60
35103520
minimum: 15
35113521
type: integer
3522+
logLevel:
3523+
default: 0
3524+
enum:
3525+
- -4
3526+
- 0
3527+
- 4
3528+
- 8
3529+
maximum: 8
3530+
minimum: -4
3531+
type: integer
35123532
release:
35133533
type: string
35143534
resources:

charts/typesense-operator/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ controllerManager:
1212
- ALL
1313
image:
1414
repository: quay.io/akyriako/typesense-operator
15-
tag: 0.4.0
15+
tag: 0.4.1-rc.1
1616
imagePullPolicy: IfNotPresent
1717
resources:
1818
limits:

config/crd/bases/ts.opentelekomcloud.com_typesenseclusters.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1025,6 +1025,16 @@ spec:
10251025
image:
10261026
default: quay.io/akyriako/typesense-healthcheck:0.1.8
10271027
type: string
1028+
logLevel:
1029+
default: 0
1030+
enum:
1031+
- -4
1032+
- 0
1033+
- 4
1034+
- 8
1035+
maximum: 8
1036+
minimum: -4
1037+
type: integer
10281038
resources:
10291039
description: ResourceRequirements describes the compute resource
10301040
requirements.
@@ -3512,6 +3522,16 @@ spec:
35123522
maximum: 60
35133523
minimum: 15
35143524
type: integer
3525+
logLevel:
3526+
default: 0
3527+
enum:
3528+
- -4
3529+
- 0
3530+
- 4
3531+
- 8
3532+
maximum: 8
3533+
minimum: -4
3534+
type: integer
35153535
release:
35163536
type: string
35173537
resources:

config/manager/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ kind: Kustomization
55
images:
66
- name: controller
77
newName: quay.io/akyriako/typesense-operator
8-
newTag: 0.4.0
8+
newTag: 0.4.1-rc.1

config/samples/ts_v1alpha1_typesensecluster_kind.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ metadata:
3434
app.kubernetes.io/managed-by: kustomize
3535
name: c-kind-1
3636
spec:
37-
image: typesense/typesense:30.0.rc27-amd64
37+
image: typesense/typesense:30.2.rc12-amd64
3838
replicas: 3
3939
resources:
4040
limits:
@@ -49,6 +49,7 @@ spec:
4949
adminApiKey:
5050
name: typesense-common-bootstrap-key
5151
metrics:
52+
logLevel: -4
5253
release: promstack
5354
additionalServerConfiguration:
5455
name: c-kind-1-server-configuration

0 commit comments

Comments
 (0)