Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 bin/k8s/templates/access-control-service-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ spec:
spec:
containers:
- name: {{ .Values.accessControlService.name }}
image: {{ .Values.global.imageRegistry }}/{{ .Values.accessControlService.imageName }}:{{ .Values.global.imageTag }}
image: {{ .Values.texera.imageRegistry }}/{{ .Values.accessControlService.imageName }}:{{ .Values.texera.imageTag }}
imagePullPolicy: {{ .Values.texeraImages.pullPolicy }}
ports:
- containerPort: {{ .Values.accessControlService.service.port }}
Expand Down
2 changes: 1 addition & 1 deletion bin/k8s/templates/config-service-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ spec:
spec:
containers:
- name: {{ .Values.configService.name }}
image: {{ .Values.global.imageRegistry }}/{{ .Values.configService.imageName }}:{{ .Values.global.imageTag }}
image: {{ .Values.texera.imageRegistry }}/{{ .Values.configService.imageName }}:{{ .Values.texera.imageTag }}
imagePullPolicy: {{ .Values.texeraImages.pullPolicy }}
ports:
- containerPort: {{ .Values.configService.service.port }}
Expand Down
2 changes: 1 addition & 1 deletion bin/k8s/templates/example-data-loader-job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ spec:
restartPolicy: Never
containers:
- name: example-data-loader
image: {{ .Values.global.imageRegistry }}/{{ .Values.exampleDataLoader.imageName }}:{{ .Values.global.imageTag }}
image: {{ .Values.texera.imageRegistry }}/{{ .Values.exampleDataLoader.imageName }}:{{ .Values.texera.imageTag }}
env:
- name: TEXERA_EXAMPLE_USERNAME
value: {{ .Values.exampleDataLoader.username }}
Expand Down
2 changes: 1 addition & 1 deletion bin/k8s/templates/file-service-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ spec:
spec:
containers:
- name: {{ .Values.fileService.name }}
image: {{ .Values.global.imageRegistry }}/{{ .Values.fileService.imageName }}:{{ .Values.global.imageTag }}
image: {{ .Values.texera.imageRegistry }}/{{ .Values.fileService.imageName }}:{{ .Values.texera.imageTag }}
imagePullPolicy: {{ .Values.texeraImages.pullPolicy }}
ports:
- containerPort: {{ .Values.fileService.service.port }}
Expand Down
2 changes: 1 addition & 1 deletion bin/k8s/templates/webserver-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ spec:
spec:
containers:
- name: {{ .Values.webserver.name }}
image: {{ .Values.global.imageRegistry }}/{{ .Values.webserver.imageName }}:{{ .Values.global.imageTag }}
image: {{ .Values.texera.imageRegistry }}/{{ .Values.webserver.imageName }}:{{ .Values.texera.imageTag }}
imagePullPolicy: {{ .Values.texeraImages.pullPolicy }}
ports:
- containerPort: {{ .Values.webserver.service.port }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ spec:
spec:
containers:
- name: {{ .Values.workflowCompilingService.name }}
image: {{ .Values.global.imageRegistry }}/{{ .Values.workflowCompilingService.imageName }}:{{ .Values.global.imageTag }}
image: {{ .Values.texera.imageRegistry }}/{{ .Values.workflowCompilingService.imageName }}:{{ .Values.texera.imageTag }}
imagePullPolicy: {{ .Values.texeraImages.pullPolicy }}
ports:
- containerPort: {{ .Values.workflowCompilingService.service.port }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ spec:
serviceAccountName: {{ .Values.workflowComputingUnitManager.serviceAccountName }}
containers:
- name: {{ .Values.workflowComputingUnitManager.name }}
image: {{ .Values.global.imageRegistry }}/{{ .Values.workflowComputingUnitManager.imageName }}:{{ .Values.global.imageTag }}
image: {{ .Values.texera.imageRegistry }}/{{ .Values.workflowComputingUnitManager.imageName }}:{{ .Values.texera.imageTag }}
imagePullPolicy: {{ .Values.texeraImages.pullPolicy }}
ports:
- containerPort: {{ .Values.workflowComputingUnitManager.service.port }}
Expand All @@ -46,7 +46,7 @@ spec:
- name: KUBERNETES_COMPUTE_UNIT_SERVICE_NAME
value: {{ .Values.workflowComputingUnitPool.name }}-svc
- name: KUBERNETES_IMAGE_NAME
value: {{ .Values.global.imageRegistry }}/{{ .Values.workflowComputingUnitPool.imageName }}:{{ .Values.global.imageTag }}
value: {{ .Values.texera.imageRegistry }}/{{ .Values.workflowComputingUnitPool.imageName }}:{{ .Values.texera.imageTag }}
# TexeraDB Access
- name: STORAGE_JDBC_URL
value: jdbc:postgresql://{{ .Release.Name }}-postgresql:5432/texera_db?currentSchema=texera_db,public
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:
- operator: "Exists"
initContainers:
- name: prepuller
image: {{ .Values.global.imageRegistry }}/{{ .Values.workflowComputingUnitPool.imageName }}:{{ .Values.global.imageTag }}
image: {{ .Values.texera.imageRegistry }}/{{ .Values.workflowComputingUnitPool.imageName }}:{{ .Values.texera.imageTag }}
imagePullPolicy: Always
command: ["sh", "-c", "true"]
containers:
Expand Down
12 changes: 9 additions & 3 deletions bin/k8s/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,16 @@
# specific language governing permissions and limitations
# under the License.

global:
texera:
# Container image registry and tag for all Texera services
# Override these to use a different registry or version
imageRegistry: ghcr.io/apache
imageTag: latest

global:
# Required by Bitnami sub-charts (postgresql, minio) to allow custom images
security:
allowInsecureImages: true # for custom postgres image
allowInsecureImages: true

# Persistence Configuration
# This controls how Persistent Volumes (PVs) and Persistent Volume Claims (PVCs) are managed
Expand All @@ -37,12 +40,15 @@ persistence:
# Part 1: the configuration of Postgres, Minio and LakeFS
postgresql:
image:
repository: texera/postgres17-pgroonga
repository: groonga/pgroonga
tag: latest
debug: true
auth:
postgresPassword: root_password # for executing init script with superuser
primary:
containerSecurityContext:
# Disabled because groonga/pgroonga needs to write a lock/socket file to /var/run/postgresql
readOnlyRootFilesystem: false
livenessProbe:
initialDelaySeconds: 30 # increase this if the launching of postgresql is slow on the cluster
readinessProbe:
Expand Down
50 changes: 0 additions & 50 deletions bin/postgres17-pgroonga.dockerfile

This file was deleted.

Loading