Skip to content

Commit 856e3bf

Browse files
duanhongyiduanhongyi
committed
fix(cronjob): quickwit create template error
1 parent 1b91e81 commit 856e3bf

8 files changed

Lines changed: 52 additions & 15 deletions

File tree

‎charts/quickwit/templates/control-plane/control-plane-deployment.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ spec:
2424
nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.control_plane.nodeAffinityPreset.type "key" .Values.control_plane.nodeAffinityPreset.key "values" .Values.control_plane.nodeAffinityPreset.values ) | nindent 10 }}
2525
serviceAccountName: drycc-quickwit
2626
initContainers:
27-
- name: drycc-registry-init
27+
- name: drycc-quickwit-control-plane-init
2828
image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/python-dev:latest
2929
imagePullPolicy: {{.Values.imagePullPolicy}}
3030
args:
3131
- netcat
3232
- -v
3333
- -u
34-
- $(DRYCC_DATABASE_URL),$(DRYCC_STORAGE_ENDPOINT)
34+
- http://drycc-quickwit-metastore:7280
3535
{{- include "quickwit.envs" . | indent 8 }}
3636
containers:
3737
- name: drycc-quickwit-control-plane

‎charts/quickwit/templates/indexer/indexer-statefulset.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ spec:
2424
nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.indexer.nodeAffinityPreset.type "key" .Values.indexer.nodeAffinityPreset.key "values" .Values.indexer.nodeAffinityPreset.values ) | nindent 10 }}
2525
serviceAccountName: drycc-quickwit
2626
initContainers:
27-
- name: drycc-registry-init
27+
- name: drycc-quickwit-indexer-init
2828
image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/python-dev:latest
2929
imagePullPolicy: {{.Values.imagePullPolicy}}
3030
args:
3131
- netcat
3232
- -v
3333
- -u
34-
- $(DRYCC_DATABASE_URL),$(DRYCC_STORAGE_ENDPOINT)
34+
- http://drycc-quickwit-metastore:7280
3535
{{- include "quickwit.envs" . | indent 8 }}
3636
containers:
3737
- name: drycc-quickwit-indexer

‎charts/quickwit/templates/janitor/janitor-deployment.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ spec:
2424
nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.janitor.nodeAffinityPreset.type "key" .Values.janitor.nodeAffinityPreset.key "values" .Values.janitor.nodeAffinityPreset.values ) | nindent 10 }}
2525
serviceAccountName: drycc-quickwit
2626
initContainers:
27-
- name: drycc-registry-init
27+
- name: drycc-quickwit-janitor-init
2828
image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/python-dev:latest
2929
imagePullPolicy: {{.Values.imagePullPolicy}}
3030
args:
3131
- netcat
3232
- -v
3333
- -u
34-
- $(DRYCC_DATABASE_URL),$(DRYCC_STORAGE_ENDPOINT)
34+
- http://drycc-quickwit-metastore:7280
3535
{{- include "quickwit.envs" . | indent 8 }}
3636
containers:
3737
- name: drycc-quickwit-janitor

‎charts/quickwit/templates/metastore/metastore-deployment.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ spec:
2424
nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.metastore.nodeAffinityPreset.type "key" .Values.metastore.nodeAffinityPreset.key "values" .Values.metastore.nodeAffinityPreset.values ) | nindent 10 }}
2525
serviceAccountName: drycc-quickwit
2626
initContainers:
27-
- name: drycc-registry-init
27+
- name: drycc-quickwit-metastore-init
2828
image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/python-dev:latest
2929
imagePullPolicy: {{.Values.imagePullPolicy}}
3030
args:

‎charts/quickwit/templates/quickwit-configmap.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ data:
1717
1818
storage:
1919
s3:
20+
flavor: minio
2021
access_key_id: ${DRYCC_STORAGE_ACCESSKEY}
2122
secret_access_key: ${DRYCC_STORAGE_SECRETKEY}
2223
region: ${AWS_REGION:-us-east-1}

‎charts/quickwit/templates/quickwit-job-upgrade.yaml‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,20 @@ metadata:
88
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
99
spec:
1010
template:
11+
metadata:
12+
labels:
13+
app: drycc-quickwit
14+
component: drycc-quickwit-job-upgrade
1115
spec:
1216
initContainers:
13-
- name: drycc-quickwit-init
17+
- name: drycc-quickwit-job-upgrade-init
1418
image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/python-dev:latest
1519
imagePullPolicy: {{.Values.imagePullPolicy}}
1620
args:
17-
- netcat
18-
- -v
19-
- -u
20-
- $(DRYCC_DATABASE_URL),$(DRYCC_DATABASE_REPLICA_URL)
21+
- netcat
22+
- -v
23+
- -u
24+
- http://drycc-quickwit-indexer:7280
2125
{{- include "quickwit.envs" . | indent 8 }}
2226
containers:
2327
- name: drycc-quickwit-job-upgrade
@@ -33,7 +37,7 @@ spec:
3337
- bash
3438
- -ec
3539
- |
36-
QUICKWIT_API="http://drycc-quickwit.{{ $.Release.Namespace }}.svc.{{ .Values.global.clusterDomain }}:7280"
40+
QUICKWIT_API="http://drycc-quickwit-indexer.{{ $.Release.Namespace }}.svc.{{ .Values.global.clusterDomain }}:7280/api/v1/templates"
3741
TEMPLATE_FILE="/opt/drycc/quickwit/config/log-indexes-template.json"
3842
response=$(curl -s -o /dev/null -w "%{http_code}" -XGET "$QUICKWIT_API/{{ .Values.logIndexTemplateName }}")
3943
if [ "$response" -eq 404 ]; then

‎charts/quickwit/templates/quickwit-networkpolicy.yaml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
apiVersion: networking.k8s.io/v1
2+
kind: NetworkPolicy
3+
metadata:
4+
name: drycc-quickwit
5+
spec:
6+
podSelector:
7+
matchLabels:
8+
app: drycc-quickwit
9+
policyTypes:
10+
- Ingress
11+
ingress:
12+
- from:
13+
- namespaceSelector:
14+
matchLabels:
15+
kubernetes.io/metadata.name: {{.Release.Namespace}}
16+
podSelector:
17+
matchLabels:
18+
app: drycc-fluentbit
19+
- from:
20+
- namespaceSelector:
21+
matchLabels:
22+
kubernetes.io/metadata.name: {{.Release.Namespace}}
23+
podSelector:
24+
matchLabels:
25+
app: drycc-quickwit
26+
- from:
27+
- namespaceSelector:
28+
matchLabels:
29+
kubernetes.io/metadata.name: {{.Release.Namespace}}
30+
podSelector:
31+
matchLabels:
32+
app: drycc-controller-api

‎charts/quickwit/templates/searcher/searcher-statefulset.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ spec:
2424
nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.searcher.nodeAffinityPreset.type "key" .Values.searcher.nodeAffinityPreset.key "values" .Values.searcher.nodeAffinityPreset.values ) | nindent 10 }}
2525
serviceAccountName: drycc-quickwit
2626
initContainers:
27-
- name: drycc-registry-init
27+
- name: drycc-quickwit-searcher-init
2828
image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/python-dev:latest
2929
imagePullPolicy: {{.Values.imagePullPolicy}}
3030
args:
3131
- netcat
3232
- -v
3333
- -u
34-
- $(DRYCC_DATABASE_URL),$(DRYCC_STORAGE_ENDPOINT)
34+
- http://drycc-quickwit-metastore:7280
3535
{{- include "quickwit.envs" . | indent 8 }}
3636
containers:
3737
- name: drycc-quickwit-searcher

0 commit comments

Comments
 (0)