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 deployments/kai-scheduler/templates/crd-upgrader.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ spec:
{{- end }}
containers:
- name: upgrader
image: "{{ .Values.global.registry }}/{{ .Values.crdupgrader.image.name }}:{{ .Chart.Version }}"
image: "{{ .Values.global.registry }}/{{ .Values.crdupgrader.image.name }}:{{ .Values.crdupgrader.image.tag | default .Values.global.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.crdupgrader.image.pullPolicy }}
{{- if (lookup "apiextensions.k8s.io/v1" "CustomResourceDefinition" "" "clusterversions.config.openshift.io") }}
securityContext:
Expand Down
16 changes: 8 additions & 8 deletions deployments/kai-scheduler/templates/kai-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ spec:
image:
name: {{ .Values.binder.image.name }}
repository: {{ .Values.global.registry }}
tag: {{ .Chart.Version }}
tag: {{ .Values.binder.image.tag | default .Values.global.tag | default .Chart.AppVersion }}
pullPolicy: {{ .Values.binder.image.pullPolicy | default .Values.global.imagePullPolicy }}
{{- if .Values.binder.resources }}
resources:
Expand All @@ -70,7 +70,7 @@ spec:
image:
name: {{ .Values.podgroupcontroller.image.name }}
repository: {{ .Values.global.registry }}
tag: {{ .Chart.Version }}
tag: {{ .Values.podgroupcontroller.image.tag | default .Values.global.tag | default .Chart.AppVersion }}
pullPolicy: {{ .Values.podgroupcontroller.image.pullPolicy | default .Values.global.imagePullPolicy }}
{{- if .Values.podgroupcontroller.resources }}
resources:
Expand All @@ -87,7 +87,7 @@ spec:
image:
name: {{ .Values.queuecontroller.image.name }}
repository: {{ .Values.global.registry }}
tag: {{ .Chart.Version }}
tag: {{ .Values.queuecontroller.image.tag | default .Values.global.tag | default .Chart.AppVersion }}
pullPolicy: {{ .Values.queuecontroller.image.pullPolicy | default .Values.global.imagePullPolicy }}
{{- if .Values.queuecontroller.resources }}
resources:
Expand All @@ -104,7 +104,7 @@ spec:
image:
name: {{ .Values.admission.image.name }}
repository: {{ .Values.global.registry }}
tag: {{ .Chart.Version }}
tag: {{ .Values.admission.image.tag | default .Values.global.tag | default .Chart.AppVersion }}
pullPolicy: {{ .Values.admission.image.pullPolicy | default .Values.global.imagePullPolicy }}
{{- if .Values.admission.resources }}
resources:
Expand All @@ -129,7 +129,7 @@ spec:
image:
name: {{ .Values.nodescaleadjuster.image.name }}
repository: {{ .Values.global.registry }}
tag: {{ .Chart.Version }}
tag: {{ .Values.nodescaleadjuster.image.tag | default .Values.global.tag | default .Chart.AppVersion }}
pullPolicy: {{ .Values.nodescaleadjuster.image.pullPolicy | default .Values.global.imagePullPolicy }}
{{- if .Values.nodescaleadjuster.resources }}
resources:
Expand All @@ -140,19 +140,19 @@ spec:
{{- toYaml .Values.nodescaleadjuster.affinity | nindent 8 }}
{{- end }}
args:
nodeScaleNamespace: {{ .Values.nodescaleadjuster.scalingPodNamespace }}
nodeScaleNamespace: {{ .Values.nodescaleadjuster.scalingPodNamespace }}
scalingPodImage:
name: {{ .Values.nodescaleadjuster.scalingPodImage.name }}
repository: {{ .Values.global.registry }}
tag: {{ .Chart.Version }}
tag: {{ .Values.nodescaleadjuster.scalingPodImage.tag | default .Values.global.tag | default .Chart.AppVersion }}
pullPolicy: {{ .Values.nodescaleadjuster.scalingPodImage.pullPolicy | default .Values.global.imagePullPolicy }}

scheduler:
service:
image:
name: {{ .Values.scheduler.image.name }}
repository: {{ .Values.global.registry }}
tag: {{ .Chart.Version }}
tag: {{ .Values.scheduler.image.tag | default .Values.global.tag | default .Chart.AppVersion }}
pullPolicy: {{ .Values.scheduler.image.pullPolicy | default .Values.global.imagePullPolicy }}
{{- if .Values.scheduler.resources }}
resources:
Expand Down
4 changes: 2 additions & 2 deletions deployments/kai-scheduler/templates/services/operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
serviceAccountName: kai-operator
containers:
- name: operator
image: {{ .Values.global.registry }}/{{ .Values.operator.image.name }}:{{ .Chart.Version }}
image: {{ .Values.global.registry }}/{{ .Values.operator.image.name }}:{{ .Values.operator.image.tag | default .Values.global.tag | default .Chart.AppVersion }}
imagePullPolicy: {{ .Values.operator.image.pullPolicy }}
{{- with .Values.operator.resources }}
resources:
Expand All @@ -46,7 +46,7 @@ spec:
- name: MS_REPOSITORY
value: {{ .Values.global.registry }}
- name: MS_TAG
value: {{ .Chart.Version }}
value: {{ .Values.operator.image.tag | default .Values.global.tag | default .Chart.AppVersion }}
ports:
- containerPort: 8080
name: metrics
Expand Down
15 changes: 13 additions & 2 deletions deployments/kai-scheduler/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

global:
registry: registry/local/kai-scheduler
tag: latest
tag: ""
imagePullPolicy: IfNotPresent
securityContext: {}
imagePullSecrets: []
Expand All @@ -25,6 +25,7 @@ operator:
image:
name: operator
pullPolicy: IfNotPresent
# tag: "" # Optional: Override global.tag or Chart.AppVersion
replicaCount: 1
metricsBindAddress: ":8080"
probeBindAddress: ":8081"
Expand All @@ -35,28 +36,33 @@ podgrouper:
image:
name: podgrouper
pullPolicy: IfNotPresent
# tag: "" # Optional: Override global.tag or Chart.AppVersion
queueLabelKey: "kai.scheduler/queue"
affinity: {}

podgroupcontroller:
image:
name: podgroupcontroller
pullPolicy: IfNotPresent
# tag: "" # Optional: Override global.tag or Chart.AppVersion
affinity: {}
binder:
name: binder
image:
name: binder
pullPolicy: IfNotPresent
# tag: "" # Optional: Override global.tag or Chart.AppVersion
resourceReservationImage:
name: resourcereservation
# tag: "" # Optional: Override global.tag or Chart.AppVersion
ports:
metricsPort: 8080
affinity: {}
scheduler:
image:
name: scheduler
pullPolicy: IfNotPresent
# tag: "" # Optional: Override global.tag or Chart.AppVersion
placementStrategy: binpack
ports:
metricsPort: 8080
Expand All @@ -65,14 +71,16 @@ queuecontroller:
image:
name: queuecontroller
pullPolicy: IfNotPresent
# tag: "" # Optional: Override global.tag or Chart.AppVersion
certSecretName: queuecontroller-webhook-tls-secret
affinity: {}
affinity: {}

admission:
name: kai-admission
image:
name: admission
pullPolicy: IfNotPresent
# tag: "" # Optional: Override global.tag or Chart.AppVersion
certSecretName: admission-webhook-tls-secret
ports:
webhookPort: 9443
Expand All @@ -86,16 +94,19 @@ nodescaleadjuster:
image:
name: nodescaleadjuster
pullPolicy: IfNotPresent
# tag: "" # Optional: Override global.tag or Chart.AppVersion
scalingPodImage:
name: scalingpod
pullPolicy: IfNotPresent
# tag: "" # Optional: Override global.tag or Chart.AppVersion
scalingPodNamespace: kai-scale-adjust
affinity: {}

crdupgrader:
image:
name: crd-upgrader
pullPolicy: IfNotPresent
# tag: "" # Optional: Override global.tag or Chart.AppVersion

defaultQueue:
createDefaultQueue: true
Expand Down
Loading