Skip to content

Commit c162c1b

Browse files
authored
Merge branch 'main' into comtalyst/refactor-cloudprovider-promise
2 parents 26c8415 + 6d32e0d commit c162c1b

File tree

26 files changed

+349
-160
lines changed

26 files changed

+349
-160
lines changed

.github/actions/e2e/install-karpenter/action.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ inputs:
2828
location:
2929
description: "the azure location to run the e2e test in"
3030
default: "eastus"
31+
provisionmode:
32+
description: "the karpenter provisioning mode to run the e2e test in"
33+
default: "aksscriptless"
3134
runs:
3235
using: "composite"
3336
steps:
@@ -45,7 +48,7 @@ runs:
4548
run: az account set --subscription ${{ inputs.subscription-id }}
4649
- name: configure Helm chart values
4750
shell: bash
48-
run: AZURE_CLUSTER_NAME=${{ inputs.cluster_name }} AZURE_RESOURCE_GROUP=${{ inputs.resource_group }} AZURE_LOCATION=${{ inputs.location }} make az-configure-values
51+
run: AZURE_CLUSTER_NAME=${{ inputs.cluster_name }} AZURE_RESOURCE_GROUP=${{ inputs.resource_group }} AZURE_LOCATION=${{ inputs.location }} PROVISION_MODE=${{ inputs.provisionmode }} make az-configure-values
4952
- name: deploy karpenter to cluster
5053
shell: bash
5154
run: AZURE_ACR_NAME=${{ inputs.acr_name }} make az-run

.github/workflows/e2e-matrix-trigger.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ on:
88
type: string
99
description: "the azure location to run the e2e test in"
1010
default: "westus3"
11+
provisionmode:
12+
type: string
13+
description: "the karpenter provisioning mode to run the e2e test in"
14+
default: "aksscriptless"
1115
push:
1216
branches: [main]
1317

@@ -28,6 +32,7 @@ jobs:
2832
with:
2933
git_ref: ${{ needs.resolve.outputs.GIT_REF }}
3034
location: ${{ inputs.location || 'westus3' }}
35+
provisionmode: ${{ inputs.provisionmode || 'aksscriptless' }}
3136
secrets:
3237
E2E_CLIENT_ID: ${{ secrets.E2E_CLIENT_ID }}
3338
E2E_TENANT_ID: ${{ secrets.E2E_TENANT_ID }}

.github/workflows/e2e-matrix.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ on:
88
type: string
99
description: "the azure location to run the e2e test in"
1010
default: "eastus"
11+
provisionmode:
12+
type: string
13+
description: "the karpenter provisioning mode to run the e2e test in"
14+
default: "aksscriptless"
1115
# k8s_version:
1216
# type: string
1317
# default: "1.27"
@@ -58,6 +62,7 @@ jobs:
5862
suite: ${{ matrix.suite }}
5963
hash: ${{ needs.initialize-generative-params.outputs.E2E_HASH }}
6064
location: ${{ inputs.location }}
65+
provisionmode: ${{ inputs.provisionmode || 'aksscriptless' }}
6166
# k8s_version: ${{ inputs.k8s_version }}
6267
secrets:
6368
E2E_CLIENT_ID: ${{ secrets.E2E_CLIENT_ID }}

.github/workflows/e2e.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ on:
1414
type: string
1515
description: "the azure location to run the e2e test in"
1616
default: "southcentralus"
17+
provisionmode:
18+
type: string
19+
description: "the karpenter provisioning mode to run the e2e test in"
20+
default: "aksscriptless"
1721
# k8s_version:
1822
# type: string
1923
# default: "1.27"
@@ -158,6 +162,7 @@ jobs:
158162
acr_name: ${{ env.ACR_NAME }}
159163
git_ref: ${{ inputs.git_ref }}
160164
location: ${{ inputs.location }}
165+
provisionmode: ${{ inputs.provisionmode }}
161166
- name: run the ${{ inputs.suite }} test suite
162167
env:
163168
AZURE_CLUSTER_NAME: ${{ env.CLUSTER_NAME }}
@@ -167,6 +172,7 @@ jobs:
167172
AZURE_ACR_NAME: ${{ env.ACR_NAME }}
168173
TEST_SUITE: ${{ inputs.suite }}
169174
GIT_REF: ${{ github.sha }}
175+
PROVISION_MODE: ${{ inputs.provisionmode }}
170176
run: |
171177
make az-creds
172178
make e2etests

Makefile-az.mk

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
AZURE_LOCATION ?= westus2
22
AZURE_VM_SIZE ?= ""
33
COMMON_NAME ?= karpenter
4+
ENABLE_AZURE_SDK_LOGGING ?= true
45
ifeq ($(CODESPACES),true)
56
AZURE_RESOURCE_GROUP ?= $(CODESPACE_NAME)
67
AZURE_ACR_NAME ?= $(subst -,,$(CODESPACE_NAME))
@@ -138,8 +139,8 @@ az-mkaks-savm: az-mkrg ## Create experimental cluster with standalone VMs (+ ACR
138139
az-rmrg: ## Destroy test ACR and AKS cluster by deleting the resource group (use with care!)
139140
az group delete --name $(AZURE_RESOURCE_GROUP)
140141

141-
az-configure-values: ## Generate cluster-related values for Karpenter Helm chart
142-
hack/deploy/configure-values.sh $(AZURE_CLUSTER_NAME) $(AZURE_RESOURCE_GROUP) $(KARPENTER_SERVICE_ACCOUNT_NAME) $(AZURE_KARPENTER_USER_ASSIGNED_IDENTITY_NAME)
142+
az-configure-values: ## Generate cluster-related values for Karpenter Helm chart and set middleware logging flag
143+
hack/deploy/configure-values.sh $(AZURE_CLUSTER_NAME) $(AZURE_RESOURCE_GROUP) $(KARPENTER_SERVICE_ACCOUNT_NAME) $(AZURE_KARPENTER_USER_ASSIGNED_IDENTITY_NAME) $(ENABLE_AZURE_SDK_LOGGING)
143144

144145
az-mkvmssflex: ## Create VMSS Flex (optional, only if creating VMs referencing this VMSS)
145146
az vmss create --name $(AZURE_CLUSTER_NAME)-vmss --resource-group $(AZURE_RESOURCE_GROUP_MC) --location $(AZURE_LOCATION) \

go.mod

Lines changed: 42 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ require (
88
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible
99
github.com/Azure/azure-sdk-for-go-extensions v0.2.0
1010
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.19.1
11-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.11.0
11+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.12.0
1212
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/authorization/armauthorization/v2 v2.2.0
1313
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute v1.0.0
1414
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5 v5.7.0
15-
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerservice/armcontainerservice/v7 v7.3.0-beta.1
15+
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerservice/armcontainerservice/v7 v7.3.0
1616
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/keyvault/armkeyvault v1.5.0
17-
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/msi/armmsi v1.2.0
17+
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/msi/armmsi v1.3.0
1818
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork v1.1.0
1919
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resourcegraph/armresourcegraph v0.9.0
2020
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armsubscriptions v1.3.0
@@ -27,19 +27,19 @@ require (
2727
github.com/blang/semver/v4 v4.0.0
2828
github.com/go-logr/logr v1.4.3
2929
github.com/go-logr/zapr v1.3.0
30-
github.com/go-openapi/errors v0.22.2
31-
github.com/go-openapi/runtime v0.28.0
32-
github.com/go-openapi/strfmt v0.23.0
33-
github.com/go-openapi/swag v0.24.1
34-
github.com/go-openapi/validate v0.24.0
35-
github.com/go-playground/validator/v10 v10.27.0
30+
github.com/go-openapi/errors v0.22.3
31+
github.com/go-openapi/runtime v0.29.0
32+
github.com/go-openapi/strfmt v0.24.0
33+
github.com/go-openapi/swag v0.25.1
34+
github.com/go-openapi/validate v0.25.0
35+
github.com/go-playground/validator/v10 v10.28.0
3636
github.com/golang-jwt/jwt/v5 v5.3.0
3737
github.com/google/go-cmp v0.7.0
3838
github.com/google/uuid v1.6.0
3939
github.com/imdario/mergo v0.3.16
4040
github.com/jongio/azidext/go/azidext v0.5.0
4141
github.com/mitchellh/hashstructure/v2 v2.0.2
42-
github.com/onsi/ginkgo/v2 v2.25.3
42+
github.com/onsi/ginkgo/v2 v2.26.0
4343
github.com/onsi/gomega v1.38.2
4444
github.com/patrickmn/go-cache v2.1.0+incompatible
4545
github.com/prometheus/client_golang v1.23.2
@@ -79,7 +79,7 @@ require (
7979
github.com/Azure/go-autorest/logger v0.2.1 // indirect
8080
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
8181
github.com/Azure/msi-dataplane v0.4.3 // indirect
82-
github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2 // indirect
82+
github.com/AzureAD/microsoft-authentication-library-for-go v1.5.0 // indirect
8383
github.com/Masterminds/semver/v3 v3.4.0 // indirect
8484
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
8585
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
@@ -92,44 +92,41 @@ require (
9292
github.com/felixge/httpsnoop v1.0.4 // indirect
9393
github.com/fsnotify/fsnotify v1.9.0 // indirect
9494
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
95-
github.com/gabriel-vasile/mimetype v1.4.8 // indirect
95+
github.com/gabriel-vasile/mimetype v1.4.10 // indirect
9696
github.com/go-logr/stdr v1.2.2 // indirect
97-
github.com/go-openapi/analysis v0.23.0 // indirect
98-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
99-
github.com/go-openapi/jsonreference v0.21.0 // indirect
100-
github.com/go-openapi/loads v0.22.0 // indirect
101-
github.com/go-openapi/spec v0.21.0 // indirect
102-
github.com/go-openapi/swag/cmdutils v0.24.0 // indirect
103-
github.com/go-openapi/swag/conv v0.24.0 // indirect
104-
github.com/go-openapi/swag/fileutils v0.24.0 // indirect
105-
github.com/go-openapi/swag/jsonname v0.24.0 // indirect
106-
github.com/go-openapi/swag/jsonutils v0.24.0 // indirect
107-
github.com/go-openapi/swag/loading v0.24.0 // indirect
108-
github.com/go-openapi/swag/mangling v0.24.0 // indirect
109-
github.com/go-openapi/swag/netutils v0.24.0 // indirect
110-
github.com/go-openapi/swag/stringutils v0.24.0 // indirect
111-
github.com/go-openapi/swag/typeutils v0.24.0 // indirect
112-
github.com/go-openapi/swag/yamlutils v0.24.0 // indirect
97+
github.com/go-openapi/analysis v0.24.0 // indirect
98+
github.com/go-openapi/jsonpointer v0.22.1 // indirect
99+
github.com/go-openapi/jsonreference v0.21.2 // indirect
100+
github.com/go-openapi/loads v0.23.1 // indirect
101+
github.com/go-openapi/spec v0.22.0 // indirect
102+
github.com/go-openapi/swag/cmdutils v0.25.1 // indirect
103+
github.com/go-openapi/swag/conv v0.25.1 // indirect
104+
github.com/go-openapi/swag/fileutils v0.25.1 // indirect
105+
github.com/go-openapi/swag/jsonname v0.25.1 // indirect
106+
github.com/go-openapi/swag/jsonutils v0.25.1 // indirect
107+
github.com/go-openapi/swag/loading v0.25.1 // indirect
108+
github.com/go-openapi/swag/mangling v0.25.1 // indirect
109+
github.com/go-openapi/swag/netutils v0.25.1 // indirect
110+
github.com/go-openapi/swag/stringutils v0.25.1 // indirect
111+
github.com/go-openapi/swag/typeutils v0.25.1 // indirect
112+
github.com/go-openapi/swag/yamlutils v0.25.1 // indirect
113113
github.com/go-playground/locales v0.14.1 // indirect
114114
github.com/go-playground/universal-translator v0.18.1 // indirect
115115
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
116+
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
116117
github.com/gogo/protobuf v1.3.2 // indirect
117118
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
118119
github.com/google/btree v1.1.3 // indirect
119120
github.com/google/gnostic-models v0.6.9 // indirect
120121
github.com/google/pprof v0.0.0-20250820193118-f64d9cf942d6 // indirect
121122
github.com/inconshreveable/mousetrap v1.1.0 // indirect
122-
github.com/josharian/intern v1.0.0 // indirect
123123
github.com/json-iterator/go v1.1.12 // indirect
124124
github.com/kylelemons/godebug v1.1.0 // indirect
125125
github.com/leodido/go-urn v1.4.0 // indirect
126-
github.com/mailru/easyjson v0.9.0 // indirect
127-
github.com/mitchellh/mapstructure v1.5.0 // indirect
128126
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
129127
github.com/modern-go/reflect2 v1.0.2 // indirect
130128
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
131129
github.com/oklog/ulid v1.3.1 // indirect
132-
github.com/opentracing/opentracing-go v1.2.0 // indirect
133130
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
134131
github.com/pkg/errors v0.9.1 // indirect
135132
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
@@ -141,27 +138,28 @@ require (
141138
github.com/spf13/cobra v1.9.1 // indirect
142139
github.com/spf13/pflag v1.0.6 // indirect
143140
github.com/x448/float16 v0.8.4 // indirect
144-
go.mongodb.org/mongo-driver v1.15.0 // indirect
145-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
141+
go.mongodb.org/mongo-driver v1.17.4 // indirect
142+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
146143
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
147-
go.opentelemetry.io/otel v1.37.0 // indirect
144+
go.opentelemetry.io/otel v1.38.0 // indirect
148145
go.opentelemetry.io/otel/exporters/prometheus v0.59.0 // indirect
149-
go.opentelemetry.io/otel/metric v1.37.0 // indirect
150-
go.opentelemetry.io/otel/sdk v1.37.0 // indirect
151-
go.opentelemetry.io/otel/sdk/metric v1.37.0 // indirect
152-
go.opentelemetry.io/otel/trace v1.37.0 // indirect
146+
go.opentelemetry.io/otel/metric v1.38.0 // indirect
147+
go.opentelemetry.io/otel/sdk v1.38.0 // indirect
148+
go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect
149+
go.opentelemetry.io/otel/trace v1.38.0 // indirect
153150
go.uber.org/automaxprocs v1.6.0 // indirect
154151
go.uber.org/mock v0.5.2 // indirect
155152
go.uber.org/zap v1.27.0 // indirect
156153
go.yaml.in/yaml/v2 v2.4.2 // indirect
157154
go.yaml.in/yaml/v3 v3.0.4 // indirect
158-
golang.org/x/crypto v0.41.0 // indirect
155+
golang.org/x/crypto v0.42.0 // indirect
159156
golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 // indirect
160-
golang.org/x/net v0.43.0 // indirect
157+
golang.org/x/mod v0.27.0 // indirect
158+
golang.org/x/net v0.44.0 // indirect
161159
golang.org/x/oauth2 v0.30.0 // indirect
162-
golang.org/x/sys v0.35.0 // indirect
163-
golang.org/x/term v0.34.0 // indirect
164-
golang.org/x/text v0.28.0 // indirect
160+
golang.org/x/sys v0.36.0 // indirect
161+
golang.org/x/term v0.35.0 // indirect
162+
golang.org/x/text v0.29.0 // indirect
165163
golang.org/x/time v0.12.0 // indirect
166164
golang.org/x/tools v0.36.0 // indirect
167165
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect

0 commit comments

Comments
 (0)