Skip to content

Commit a6b3dc0

Browse files
engedaamengedaam
authored
Merge branch 'main' into Node-Overlay-docs-update
2 parents a57ec05 + 771ea78 commit a6b3dc0

File tree

9 files changed

+84
-14
lines changed

9 files changed

+84
-14
lines changed

‎.github/actions/deploy-website/action.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ runs:
4747
TZ: America/Los_Angeles
4848
HUGO_CACHEDIR: ${{ github.workspace }}/.hugo
4949
NPM_CONFIG_CACHE: ${{ github.workspace }}/.npm
50-
if: github.event_name == 'pull_request'
50+
if: github.event_name == 'workflow_run'
5151
run: |
5252
npm ci --prefer-offline
5353
hugo --gc --minify --buildFuture -b "${{ inputs.hugo-base-url }}"
@@ -76,7 +76,7 @@ runs:
7676
aws s3 sync website/public/ "$S3_PATH" --delete
7777
- name: Create Amplify branch (if preview and doesn't exist)
7878
shell: bash
79-
if: github.event_name == 'pull_request'
79+
if: github.event_name == 'workflow_run'
8080
run: |
8181
if ! aws amplify get-branch --app-id ${{ inputs.amplify-app-id }} --branch-name "${{ inputs.amplify-branch-name }}" 2>/dev/null; then
8282
aws amplify create-branch \

‎.github/workflows/website-cleanup-preview.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
name: Cleanup Website PR Preview
22
on:
3-
pull_request:
3+
pull_request_target:
44
types: [ closed ]
5-
paths: [ website/** ]
65
jobs:
76
cleanup:
87
runs-on: ubuntu-latest
8+
if: github.repository == 'aws/karpenter-provider-aws'
99
permissions:
1010
id-token: write
1111
contents: read

‎.github/workflows/website-deploy.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
jobs:
77
deploy:
88
runs-on: ubuntu-latest
9+
if: github.repository == 'aws/karpenter-provider-aws'
910
permissions:
1011
id-token: write
1112
contents: read

‎.github/workflows/website-preview-trigger.yaml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: WebsitePreviewTrigger
2+
on:
3+
pull_request:
4+
types: [ opened, synchronize, reopened ]
5+
jobs:
6+
preview-trigger:
7+
runs-on: ubuntu-latest
8+
if: github.repository == 'aws/karpenter-provider-aws'
9+
steps:
10+
- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
11+
with:
12+
fetch-depth: 0
13+
- name: Save info about the PR as an artifact for other workflows that run on workflow_run to download them
14+
env:
15+
PULL_REQUEST_NUMBER: ${{ github.event.pull_request.number }}
16+
COMMIT_ID: ${{ github.event.pull_request.head.sha }}
17+
run: |
18+
mkdir -p /tmp/artifacts
19+
{ echo "$PULL_REQUEST_NUMBER"; echo "$COMMIT_ID"; } >> /tmp/artifacts/website-metadata.txt
20+
cat /tmp/artifacts/website-metadata.txt
21+
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
22+
with:
23+
name: artifacts
24+
path: /tmp/artifacts

‎.github/workflows/website-preview.yaml‎

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,35 @@
11
name: Deploy Website Preview to Amplify
22
on:
3-
pull_request:
4-
types: [ opened, synchronize, reopened ]
5-
branches: [ main ]
6-
paths: [ website/** ]
3+
workflow_run:
4+
workflows: [ WebsitePreviewTrigger ]
5+
types: [ completed ]
76
jobs:
87
preview:
9-
runs-on: ubuntu-latest
108
permissions:
119
id-token: write
1210
contents: read
1311
pull-requests: write
12+
statuses: write
13+
runs-on: ubuntu-latest
1414
steps:
1515
- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
16-
- id: metadata
16+
- uses: ./.github/actions/download-artifact
17+
- id: website-metadata
1718
run: |
18-
pr_number="${{ github.event.number }}"
19-
pr_commit="${{ github.event.pull_request.head.sha }}"
19+
pr_number="$(head -n 1 /tmp/artifacts/website-metadata.txt)"
20+
pr_commit="$(tail -n 1 /tmp/artifacts/website-metadata.txt)"
2021
{
2122
echo PR_COMMIT="$pr_commit"
2223
echo PR_NUMBER="$pr_number"
2324
echo BRANCH_NAME="pr-$pr_number"
2425
} >> "$GITHUB_ENV"
26+
- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
27+
with:
28+
ref: ${{ env.PR_COMMIT }}
29+
- uses: ./.github/actions/commit-status/start
30+
with:
31+
name: "${{ github.workflow }} / ${{ github.job }} (pull_request_review)"
32+
git_ref: ${{ env.PR_COMMIT }}
2533
- name: Configure AWS credentials
2634
uses: aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df # v4.2.1
2735
with:
@@ -58,3 +66,8 @@ jobs:
5866
5967
Built from commit \`${process.env.PR_COMMIT}\``
6068
})
69+
- if: always()
70+
uses: ./.github/actions/commit-status/end
71+
with:
72+
name: "${{ github.workflow }} / ${{ github.job }} (pull_request_review)"
73+
git_ref: ${{ env.PR_COMMIT }}

‎Makefile‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,15 @@ update-karpenter: ## Update kubernetes-sigs/karpenter to latest
213213
go get -u sigs.k8s.io/karpenter@HEAD
214214
go mod tidy
215215

216+
.PHONY: deploy-cfn
217+
deploy-cfn: ## Deploys the cloudformation stack defined in the docs preview directory
218+
aws cloudformation deploy \
219+
--stack-name "Karpenter-${CLUSTER_NAME}" \
220+
--template-file "./website/content/en/preview/getting-started/getting-started-with-karpenter/cloudformation.yaml" \
221+
--capabilities CAPABILITY_NAMED_IAM \
222+
--parameter-overrides "ClusterName=${CLUSTER_NAME}"
223+
224+
216225
.PHONY: help presubmit ci-test ci-non-test run test deflake e2etests e2etests-deflake benchmark coverage verify vulncheck licenses image apply install delete docgen codegen stable-release-pr snapshot release prepare-website toolchain issues website tidy download update-karpenter
217226

218227
define newline

‎pkg/providers/instancetype/zz_generated.bandwidth.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@ var (
196196
"x1e.2xlarge": 1250,
197197
"x2gd.xlarge": 1250,
198198
"z1d.xlarge": 1250,
199+
"g6f.large": 1500,
199200
"c6a.xlarge": 1562,
200201
"c6i.xlarge": 1562,
201202
"c6id.xlarge": 1562,
@@ -256,6 +257,7 @@ var (
256257
"g5g.2xlarge": 2500,
257258
"g6.xlarge": 2500,
258259
"g6e.xlarge": 2500,
260+
"g6f.xlarge": 2500,
259261
"h1.2xlarge": 2500,
260262
"i3.2xlarge": 2500,
261263
"m5.2xlarge": 2500,
@@ -346,6 +348,7 @@ var (
346348
"g5g.4xlarge": 5000,
347349
"g6.2xlarge": 5000,
348350
"g6e.2xlarge": 5000,
351+
"g6f.2xlarge": 5000,
349352
"h1.4xlarge": 5000,
350353
"i3.4xlarge": 5000,
351354
"inf1.2xlarge": 5000,
@@ -440,7 +443,9 @@ var (
440443
"g4dn.2xlarge": 10000,
441444
"g5.4xlarge": 10000,
442445
"g6.4xlarge": 10000,
446+
"g6f.4xlarge": 10000,
443447
"gr6.4xlarge": 10000,
448+
"gr6f.4xlarge": 10000,
444449
"h1.8xlarge": 10000,
445450
"i2.8xlarge": 10000,
446451
"i3.8xlarge": 10000,

‎pkg/providers/pricing/zz_generated.pricing_aws.go‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ limitations under the License.
1616

1717
package pricing
1818

19-
// generated at 2025-07-28T13:21:01Z for us-east-1
19+
// generated at 2025-08-04T13:21:54Z for us-east-1
2020

2121
import ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types"
2222

@@ -154,8 +154,12 @@ var InitialOnDemandPricesAWS = map[string]map[ec2types.InstanceType]float64{
154154
// g6e family
155155
"g6e.12xlarge": 10.492640, "g6e.16xlarge": 7.577190, "g6e.24xlarge": 15.065590, "g6e.2xlarge": 2.242080,
156156
"g6e.48xlarge": 30.131180, "g6e.4xlarge": 3.004240, "g6e.8xlarge": 4.528560, "g6e.xlarge": 1.861000,
157+
// g6f family
158+
"g6f.2xlarge": 0.475000, "g6f.4xlarge": 0.950000, "g6f.large": 0.202000, "g6f.xlarge": 0.237500,
157159
// gr6 family
158160
"gr6.4xlarge": 1.539200, "gr6.8xlarge": 2.446400,
161+
// gr6f family
162+
"gr6f.4xlarge": 1.066000,
159163
// h1 family
160164
"h1.16xlarge": 3.744000, "h1.2xlarge": 0.468000, "h1.4xlarge": 0.936000, "h1.8xlarge": 1.872000,
161165
// hpc7g family
@@ -424,7 +428,7 @@ var InitialOnDemandPricesAWS = map[string]map[ec2types.InstanceType]float64{
424428
// u-9tb1 family
425429
"u-9tb1.112xlarge": 81.900000,
426430
// u7i-12tb family
427-
"u7i-12tb.224xlarge": 135.227750,
431+
"u7i-12tb.224xlarge": 125.581820,
428432
// u7i-6tb family
429433
"u7i-6tb.112xlarge": 62.790000,
430434
// u7i-8tb family

‎test/suites/integration/extended_resources_test.go‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,13 @@ var _ = Describe("Extended Resources", func() {
7272
Operator: corev1.NodeSelectorOpExists,
7373
},
7474
})
75+
test.ReplaceRequirements(nodePool, karpv1.NodeSelectorRequirementWithMinValues{
76+
NodeSelectorRequirement: corev1.NodeSelectorRequirement{
77+
Key: v1.LabelInstanceFamily,
78+
Operator: corev1.NodeSelectorOpNotIn,
79+
Values: []string{"g6f"},
80+
},
81+
})
7582
env.ExpectCreated(nodeClass, nodePool, dep)
7683
env.EventuallyExpectHealthyPodCount(selector, numPods)
7784
env.ExpectCreatedNodeCount("==", 1)
@@ -103,6 +110,13 @@ var _ = Describe("Extended Resources", func() {
103110
Key: v1.LabelInstanceCategory,
104111
Operator: corev1.NodeSelectorOpExists,
105112
}})
113+
test.ReplaceRequirements(nodePool, karpv1.NodeSelectorRequirementWithMinValues{
114+
NodeSelectorRequirement: corev1.NodeSelectorRequirement{
115+
Key: v1.LabelInstanceFamily,
116+
Operator: corev1.NodeSelectorOpNotIn,
117+
Values: []string{"g6f"},
118+
},
119+
})
106120
env.ExpectCreated(nodeClass, nodePool, dep)
107121
env.EventuallyExpectHealthyPodCount(selector, numPods)
108122
env.ExpectCreatedNodeCount("==", 1)

0 commit comments

Comments
 (0)