Skip to content

Commit

Permalink
chore(artifact): remove temporal config and worker app (#481)
Browse files Browse the repository at this point in the history
Because

- instill-ai/artifact-backend#13 changes the
ports (addressed) but also the worker app.

This commit

- Follows up #473
removing worker and temporal configs.
  • Loading branch information
jvallesm authored Apr 15, 2024
1 parent 1566014 commit b66c410
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 58 deletions.
7 changes: 0 additions & 7 deletions charts/core/templates/artifact-backend/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,6 @@ data:
port: 8082
replicationtimeframe: 1
{{- end }}
temporal:
hostport: {{ default (printf "%s-frontend-headless:%s" (include "core.temporal" .) (include "core.temporal.frontend.grpcPort" .)) .Values.artifactBackend.temporal.hostPort }}
namespace: {{ default "artifact-backend" .Values.artifactBackend.temporal.namespace }}
ca: {{ default "" .Values.artifactBackend.temporal.ca }}
cert: {{ default "" .Values.artifactBackend.temporal.cert }}
key: {{ default "" .Values.artifactBackend.temporal.key }}
serverName: {{ default "" .Values.artifactBackend.temporal.serverName }}
registry:
host: {{ template "core.registry" . }}
port: {{ template "core.registry.port" . }}
42 changes: 0 additions & 42 deletions charts/core/templates/artifact-backend/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,22 +61,6 @@ spec:
- name: PGUSER
value: {{ template "core.database.username" . }}
{{- end }}
{{- if not .Values.artifactBackend.temporal.hostPort }}
- name: temporal-admin-tools
securityContext:
runAsUser: 0
runAsGroup: 0
image: {{ .Values.temporal.admintools.image.repository }}:{{ .Values.temporal.admintools.image.tag }}
imagePullPolicy: {{ .Values.temporal.admintools.image.pullPolicy }}
command: ["/bin/bash", "-c"]
args:
- >
until tctl cluster health 2>&1 > /dev/null; do echo waiting for Temporal; sleep 2; done &&
if [[ ! $(tctl --namespace artifact-backend namespace list | grep artifact-backend) ]]; then tctl --namespace artifact-backend namespace register; fi
env:
- name: TEMPORAL_CLI_ADDRESS
value: "{{ template "core.temporal" . }}-frontend:{{ template "core.temporal.frontend.grpcPort" . }}"
{{- end }}
- name: artifact-backend-migration
image: {{ .Values.artifactBackend.image.repository }}:{{ .Values.artifactBackend.image.tag }}
imagePullPolicy: {{ .Values.artifactBackend.image.pullPolicy }}
Expand Down Expand Up @@ -135,32 +119,6 @@ spec:
env:
{{- toYaml . | nindent 12 }}
{{- end }}
- name: artifact-backend-worker
image: {{ .Values.artifactBackend.image.repository }}:{{ .Values.artifactBackend.image.tag }}
imagePullPolicy: {{ .Values.artifactBackend.image.pullPolicy }}
livenessProbe:
tcpSocket:
port: rpc
{{- if .Values.artifactBackend.resources }}
resources:
{{- toYaml .Values.artifactBackend.resources | nindent 12 }}
{{- end }}
command: [./{{ .Values.artifactBackend.commandName.worker }}]
volumeMounts:
- name: config
mountPath: {{ .Values.artifactBackend.configPath }}
subPath: config.yaml
{{- if .Values.internalTLS.enabled }}
- name: artifact-internal-certs
mountPath: "/etc/instill-ai/core/ssl/artifact"
{{- end }}
{{- with .Values.artifactBackend.extraVolumeMounts }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- with .Values.artifactBackend.extraEnv }}
env:
{{- toYaml . | nindent 12 }}
{{- end }}
{{- with .Values.artifactBackend.sidecarContainers }}
{{- toYaml . | nindent 8 }}
{{- end }}
Expand Down
9 changes: 0 additions & 9 deletions charts/core/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -636,7 +636,6 @@ artifactBackend:
commandName:
migration: artifact-backend-migrate
main: artifact-backend
worker: artifact-backend-worker
# -- The path of configuration file for artifact-backend
configPath: /artifact-backend/config/config.yaml
# -- The database migration version
Expand Down Expand Up @@ -687,14 +686,6 @@ artifactBackend:
spec:
minAvailable:
maxUnavailable:
# -- The configuration of Temporal Cloud
temporal:
hostPort:
namespace:
ca:
cert:
key:
serverName:
# -- The configuration of console
console:
# -- Enable console deployment or not
Expand Down

0 comments on commit b66c410

Please sign in to comment.