Skip to content

Commit 0d7968e

Browse files
nmorenorwgalanciakdanc094codetogether
authored
Merge changes to main. (#121)
* fix: separate SSL certificates (#101) * fix: Set environment variables via .env file. (#99) * Set environment variables via .env file. * Missing change * Change how hostnames and secret are set. * changes for env template * add env variable resolver on sso redirect value * fix: add env_file to codetogether-intel (#105) * fix: missing CT_HQ_BASE_URL env var (#107) * feat: nginx auto config (#109) * fix: add step for sso provider (#110) * fix: add client_max_body_size to intel (#112) * fix: tweak name of dhparam.pem env var (#113) * tweak name of dhparam.pem env var * fix env var name in nginx template * fix pam to pem * fix: missing env file on collab (#114) * fix: handle nil ai.openai.api_key to prevent template er… (#116) * fix(intel-chart): handle nil ai.openai.api_key to prevent template errors Adjusted the Helm chart template for ai-secrets to avoid referencing ai.openai.api_key and ai.external.api_key when undefined. This fixes a fatal error during `helm template` when AI mode is set to `bundled` and no OpenAI config is present. Ensures compatibility with bundled-only deployments. * Changes to fix workflow issues * fix: cleanup for sso tenants (#117) * feat(intel): add option to disable AI integration entirely (#120) Previously, the Helm chart required either 'bundled' or 'external' AI mode to be configured, making it mandatory to include AI integration. This commit introduces a new flag `ai.enabled` to allow disabling AI features entirely, enabling Intel to be deployed without any AI-related containers or resources. --------- Co-authored-by: Wojciech Galanciak <wojtek@codetogether.com> Co-authored-by: danc094codetogether <daniel@codetogether.com>
1 parent 6448162 commit 0d7968e

2 files changed

Lines changed: 36 additions & 31 deletions

File tree

charts/intel/templates/deployment.yaml

Lines changed: 35 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,23 @@ spec:
2828
{{- end }}
2929
serviceAccountName: {{ include "codetogether.serviceAccountName" . }}
3030
containers:
31-
{{- if eq .Values.ai.mode "bundled" }}
32-
- name: codetogether-llm
33-
image: "{{ .Values.ai.image.repository }}:{{ .Values.ai.image.tag }}"
34-
imagePullPolicy: Always
35-
ports:
36-
- name: ai
37-
containerPort: 8000
38-
protocol: TCP
39-
resources:
40-
requests:
41-
cpu: {{ .Values.ai.resources.requests.cpu | quote }}
42-
memory: {{ .Values.ai.resources.requests.memory | quote }}
43-
limits:
44-
cpu: {{ .Values.ai.resources.limits.cpu | quote }}
45-
memory: {{ .Values.ai.resources.limits.memory | quote }}
31+
{{- if .Values.ai.enabled }}
32+
{{- if eq .Values.ai.mode "bundled" }}
33+
- name: codetogether-llm
34+
image: "{{ .Values.ai.image.repository }}:{{ .Values.ai.image.tag }}"
35+
imagePullPolicy: Always
36+
ports:
37+
- name: ai
38+
containerPort: 8000
39+
protocol: TCP
40+
resources:
41+
requests:
42+
cpu: {{ .Values.ai.resources.requests.cpu | quote }}
43+
memory: {{ .Values.ai.resources.requests.memory | quote }}
44+
limits:
45+
cpu: {{ .Values.ai.resources.limits.cpu | quote }}
46+
memory: {{ .Values.ai.resources.limits.memory | quote }}
47+
{{- end }}
4648
{{- end }}
4749
- name: {{ .Chart.Name }}
4850
securityContext:
@@ -56,22 +58,24 @@ spec:
5658
- name: AI_BUNDLED_URL
5759
value: "http://codetogether-llm:8000"
5860
{{- end }}
59-
{{- if eq .Values.ai.mode "external" }}
60-
- name: AI_PROVIDER
61-
valueFrom:
62-
configMapKeyRef:
63-
name: ai-config
64-
key: ai_provider
65-
- name: AI_EXTERNAL_URL
66-
valueFrom:
67-
configMapKeyRef:
68-
name: ai-config
69-
key: ai_url
70-
- name: AI_EXTERNAL_API_KEY
71-
valueFrom:
72-
secretKeyRef:
73-
name: ai-external-secret
74-
key: api-key
61+
{{- if .Values.ai.enabled }}
62+
{{- if eq .Values.ai.mode "external" }}
63+
- name: AI_PROVIDER
64+
valueFrom:
65+
configMapKeyRef:
66+
name: ai-config
67+
key: ai_provider
68+
- name: AI_EXTERNAL_URL
69+
valueFrom:
70+
configMapKeyRef:
71+
name: ai-config
72+
key: ai_url
73+
- name: AI_EXTERNAL_API_KEY
74+
valueFrom:
75+
secretKeyRef:
76+
name: ai-external-secret
77+
key: api-key
78+
{{- end }}
7579
{{- end }}
7680
#
7781
# Set CodeTogether runtime configuration

charts/intel/values.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ securityContext: {}
139139
# runAsUser: 1000
140140

141141
ai:
142+
enabled: false
142143
mode: "bundled" # Options: bundled | external
143144
provider: "ollama" # No OpenAI dependency
144145
resources:

0 commit comments

Comments
 (0)