Skip to content

Commit 15d20d0

Browse files
authored
Fix instance-tag (#9561)
As suggested by Meirav, change the dynamic windows keys and instance-tag so that the parsing is successful.
1 parent 41d351d commit 15d20d0

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

components/kueue/production/stone-prod-p02/queue-config/cluster-queue.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ spec:
150150
- local
151151
- localhost
152152
- macos-mac2metal-arm64
153-
- windows-amd64
153+
- windows-4xlarge-amd64
154154
flavors:
155155
- name: platform-group-3
156156
resources:
@@ -178,7 +178,7 @@ spec:
178178
nominalQuota: '1000'
179179
- name: macos-mac2metal-arm64
180180
nominalQuota: '5'
181-
- name: windows-amd64
181+
- name: windows-4xlarge-amd64
182182
nominalQuota: '5'
183183
stopPolicy: None
184184
---

components/kueue/staging/stone-stage-p01/queue-config/cluster-queue.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ spec:
109109
- local
110110
- localhost
111111
- macos-mac2metal-arm64
112-
- windows-amd64
112+
- windows-4xlarge-amd64
113113
flavors:
114114
- name: platform-group-2
115115
resources:
@@ -141,7 +141,7 @@ spec:
141141
nominalQuota: '1000'
142142
- name: macos-mac2metal-arm64
143143
nominalQuota: '5'
144-
- name: windows-amd64
144+
- name: windows-4xlarge-amd64
145145
nominalQuota: '5'
146146
stopPolicy: None
147147
---

components/multi-platform-controller/base/host-config-chart/templates/host-config.yaml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1121,20 +1121,20 @@ data:
11211121
# Windows platforms
11221122
{{- if hasKey .Values.dynamicConfigs "windows-amd64" }}
11231123
{{- $config := index .Values.dynamicConfigs "windows-amd64" | default (dict) }}
1124-
dynamic.windows-amd64.type: {{ index $config "type" | default "aws" | quote }}
1125-
dynamic.windows-amd64.region: {{ index $config "region" | default "us-east-1" | quote }}
1126-
dynamic.windows-amd64.ami: {{ default (index $windows "ami") $config.ami | quote }}
1127-
dynamic.windows-amd64.instance-type: {{ (index $config "instance-type") | default "c5.4xlarge" | quote }}
1128-
dynamic.windows-amd64.instance-tag: {{ (index $config "instance-tag") | default (printf "%s-windows-amd64" $environment) | quote }}
1129-
dynamic.windows-amd64.key-name: {{ default (index $windows "key-name") ((index $config "key-name")) | quote }}
1130-
dynamic.windows-amd64.aws-secret: {{ (index $config "aws-secret") | default "aws-account" | quote }}
1131-
dynamic.windows-amd64.ssh-secret: {{ (index $config "ssh-secret") | default "aws-ssh-key" | quote }}
1132-
dynamic.windows-amd64.security-group-id: {{ default (index $windows "security-group-id") ((index $config "security-group-id")) | quote }}
1133-
dynamic.windows-amd64.max-instances: {{ (index $config "max-instances") | default "5" | quote }}
1134-
dynamic.windows-amd64.subnet-id: {{ default (index $windows "subnet-id") ((index $config "subnet-id")) | quote }}
1135-
dynamic.windows-amd64.disk: {{ index $config "disk" | default "100" | quote }}
1136-
dynamic.windows-amd64.check-interval: {{ (index $config "check-interval") | default "60" | quote }}
1137-
dynamic.windows-amd64.allocation-timeout: "1200"
1124+
dynamic.windows-4xlarge-amd64.type: {{ index $config "type" | default "aws" | quote }}
1125+
dynamic.windows-4xlarge-amd64.region: {{ index $config "region" | default "us-east-1" | quote }}
1126+
dynamic.windows-4xlarge-amd64.ami: {{ default (index $windows "ami") $config.ami | quote }}
1127+
dynamic.windows-4xlarge-amd64.instance-type: {{ (index $config "instance-type") | default "c5.4xlarge" | quote }}
1128+
dynamic.windows-4xlarge-amd64.instance-tag: {{ (index $config "instance-tag") | default (printf "%s-amd64-4xlarge" $environment) | quote }}
1129+
dynamic.windows-4xlarge-amd64.key-name: {{ default (index $windows "key-name") ((index $config "key-name")) | quote }}
1130+
dynamic.windows-4xlarge-amd64.aws-secret: {{ (index $config "aws-secret") | default "aws-account" | quote }}
1131+
dynamic.windows-4xlarge-amd64.ssh-secret: {{ (index $config "ssh-secret") | default "aws-ssh-key" | quote }}
1132+
dynamic.windows-4xlarge-amd64.security-group-id: {{ default (index $windows "security-group-id") ((index $config "security-group-id")) | quote }}
1133+
dynamic.windows-4xlarge-amd64.max-instances: {{ (index $config "max-instances") | default "5" | quote }}
1134+
dynamic.windows-4xlarge-amd64.subnet-id: {{ default (index $windows "subnet-id") ((index $config "subnet-id")) | quote }}
1135+
dynamic.windows-4xlarge-amd64.disk: {{ index $config "disk" | default "100" | quote }}
1136+
dynamic.windows-4xlarge-amd64.check-interval: {{ (index $config "check-interval") | default "60" | quote }}
1137+
dynamic.windows-4xlarge-amd64.allocation-timeout: "1200"
11381138
{{- if (index $config "iops") }}
11391139
dynamic.windows-amd64.iops: {{ index $config "iops" | quote }}
11401140
{{ end }}

0 commit comments

Comments
 (0)