Skip to content

Commit b050307

Browse files
committed
Merge remote-tracking branch 'upstream/main'
2 parents 96a1fd9 + 25b048b commit b050307

File tree

22 files changed

+1130
-226
lines changed

22 files changed

+1130
-226
lines changed

.github/workflows/functional-test-cloud.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@ env:
8686
TF_RECIPE_PRIVATE_GIT_SOURCE: "git::https://github.com/radius-project/terraform-private-modules//kubernetes-redis"
8787
# bicep-types ACR url for uploading Radius Bicep types
8888
BICEP_TYPES_REGISTRY: 'biceptypes.azurecr.io'
89-
89+
# Kubernetes client QPS and Burst settings for high-concurrency CI environments
90+
RADIUS_QPS_AND_BURST: "800"
9091
jobs:
9192
build:
9293
name: Build Radius for test

.github/workflows/functional-test-noncloud.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,8 @@ env:
8585
GITEA_EMAIL: "[email protected]"
8686
# Gitea access token name
8787
GITEA_ACCESS_TOKEN_NAME: "radius-functional-test"
88+
# Kubernetes client QPS and Burst settings for high-concurrency CI environments
89+
RADIUS_QPS_AND_BURST: "800"
8890

8991
jobs:
9092
build:

.github/workflows/release.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
uses: actions/checkout@v4
5353
- name: Get supported versions from versions.yaml
5454
id: get-supported-versions
55-
uses: mikefarah/yq@v4.45.4
55+
uses: mikefarah/yq@v4.46.1
5656
with:
5757
# Get a comma-separated list of supported versions
5858
cmd: yq '.supported[].version' versions.yaml | tr '\n' ',' | sed 's/,$//'
@@ -165,7 +165,7 @@ jobs:
165165
git config --global user.email "[email protected]"
166166
- name: Get supported versions from versions.yaml
167167
id: get-supported-versions
168-
uses: mikefarah/yq@v4.45.4
168+
uses: mikefarah/yq@v4.46.1
169169
with:
170170
# Get a comma-separated list of supported versions
171171
cmd: yq '.supported[].version' ./radius/versions.yaml | tr '\n' ',' | sed 's/,$//'

cmd/rad/cmd/root.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@ import (
7070
"github.com/radius-project/radius/pkg/cli/cmd/run"
7171
"github.com/radius-project/radius/pkg/cli/cmd/uninstall"
7272
uninstall_kubernetes "github.com/radius-project/radius/pkg/cli/cmd/uninstall/kubernetes"
73+
"github.com/radius-project/radius/pkg/cli/cmd/upgrade"
74+
upgrade_kubernetes "github.com/radius-project/radius/pkg/cli/cmd/upgrade/kubernetes"
7375
version "github.com/radius-project/radius/pkg/cli/cmd/version"
7476
workspace_create "github.com/radius-project/radius/pkg/cli/cmd/workspace/create"
7577
workspace_delete "github.com/radius-project/radius/pkg/cli/cmd/workspace/delete"
@@ -375,6 +377,12 @@ func initSubCommands() {
375377
uninstallKubernetesCmd, _ := uninstall_kubernetes.NewCommand(framework)
376378
uninstallCmd.AddCommand(uninstallKubernetesCmd)
377379

380+
upgradeCmd := upgrade.NewCommand()
381+
RootCmd.AddCommand(upgradeCmd)
382+
383+
upgradeKubernetesCmd, _ := upgrade_kubernetes.NewCommand(framework)
384+
upgradeCmd.AddCommand(upgradeKubernetesCmd)
385+
378386
versionCmd, _ := version.NewCommand(framework)
379387
RootCmd.AddCommand(versionCmd)
380388
}

go.mod

Lines changed: 50 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ go 1.24.2
77
replace github.com/opencontainers/go-digest => github.com/opencontainers/go-digest v1.0.1-0.20220411205349-bde1400a84be
88

99
require (
10-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0
10+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.1
1111
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.10.1
1212
github.com/Azure/azure-sdk-for-go/sdk/containers/azcontainerregistry v0.2.3
1313
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/authorization/armauthorization/v2 v2.2.0
14-
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/msi/armmsi v1.2.0
14+
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/msi/armmsi v1.3.0
1515
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v2 v2.2.1
1616
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.2.0
1717
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armsubscriptions v1.3.0
@@ -21,26 +21,27 @@ require (
2121
github.com/Masterminds/semver v1.5.0
2222
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d
2323
github.com/agnivade/levenshtein v1.2.1
24-
github.com/aws/aws-sdk-go-v2 v1.36.5
25-
github.com/aws/aws-sdk-go-v2/config v1.29.17
26-
github.com/aws/aws-sdk-go-v2/credentials v1.17.70
27-
github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.24.6
28-
github.com/aws/aws-sdk-go-v2/service/cloudformation v1.61.0
29-
github.com/aws/aws-sdk-go-v2/service/ec2 v1.230.0
30-
github.com/aws/aws-sdk-go-v2/service/ecr v1.45.1
31-
github.com/aws/aws-sdk-go-v2/service/sts v1.34.0
32-
github.com/aws/smithy-go v1.22.4
24+
github.com/aws/aws-sdk-go-v2 v1.36.6
25+
github.com/aws/aws-sdk-go-v2/config v1.29.18
26+
github.com/aws/aws-sdk-go-v2/credentials v1.17.71
27+
github.com/aws/aws-sdk-go-v2/service/cloudcontrol v1.24.7
28+
github.com/aws/aws-sdk-go-v2/service/cloudformation v1.61.1
29+
github.com/aws/aws-sdk-go-v2/service/ec2 v1.236.0
30+
github.com/aws/aws-sdk-go-v2/service/ecr v1.46.0
31+
github.com/aws/aws-sdk-go-v2/service/sts v1.34.1
32+
github.com/aws/smithy-go v1.22.5
3333
github.com/charmbracelet/bubbles v0.20.0
34-
github.com/charmbracelet/bubbletea v1.3.5
34+
github.com/charmbracelet/bubbletea v1.3.6
3535
github.com/charmbracelet/lipgloss v1.1.0
3636
github.com/charmbracelet/x/ansi v0.9.3
3737
github.com/charmbracelet/x/exp/teatest v0.0.0-20240408110044-525ba71bb562
3838
github.com/dimchansky/utfbom v1.1.1
3939
github.com/fatih/color v1.18.0
40-
github.com/fluxcd/pkg/apis/meta v1.13.0
41-
github.com/fluxcd/pkg/http/fetch v0.16.0
42-
github.com/fluxcd/pkg/tar v0.12.0
40+
github.com/fluxcd/pkg/apis/meta v1.18.0
41+
github.com/fluxcd/pkg/http/fetch v0.17.0
42+
github.com/fluxcd/pkg/tar v0.13.0
4343
github.com/fluxcd/source-controller/api v1.6.2
44+
github.com/getkin/kin-openapi v0.132.0
4445
github.com/go-chi/chi/v5 v5.2.2
4546
github.com/go-git/go-git/v5 v5.16.2
4647
github.com/go-logr/logr v1.4.3
@@ -74,15 +75,15 @@ require (
7475
github.com/prometheus/client_golang v1.22.0
7576
github.com/sethvargo/go-retry v0.3.0
7677
github.com/spf13/cobra v1.9.1
77-
github.com/spf13/pflag v1.0.6
78+
github.com/spf13/pflag v1.0.7
7879
github.com/spf13/viper v1.20.1
7980
github.com/stern/stern v1.32.0
8081
github.com/stretchr/testify v1.10.0
8182
github.com/wI2L/jsondiff v0.7.0
8283
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0
8384
go.opentelemetry.io/contrib/instrumentation/runtime v0.62.0
8485
go.opentelemetry.io/otel v1.37.0
85-
go.opentelemetry.io/otel/exporters/prometheus v0.59.0
86+
go.opentelemetry.io/otel/exporters/prometheus v0.59.1
8687
go.opentelemetry.io/otel/exporters/zipkin v1.37.0
8788
go.opentelemetry.io/otel/metric v1.37.0
8889
go.opentelemetry.io/otel/sdk v1.37.0
@@ -91,19 +92,19 @@ require (
9192
go.uber.org/atomic v1.11.0
9293
go.uber.org/mock v0.5.2
9394
go.uber.org/zap v1.27.0
94-
golang.org/x/sync v0.15.0
95-
golang.org/x/text v0.26.0
95+
golang.org/x/sync v0.16.0
96+
golang.org/x/text v0.27.0
9697
gopkg.in/yaml.v3 v3.0.1
97-
helm.sh/helm/v3 v3.18.3
98-
k8s.io/api v0.33.2
99-
k8s.io/apiextensions-apiserver v0.33.2
100-
k8s.io/apimachinery v0.33.2
101-
k8s.io/cli-runtime v0.33.2
102-
k8s.io/client-go v0.33.2
103-
k8s.io/kubectl v0.33.2
98+
helm.sh/helm/v3 v3.18.4
99+
k8s.io/api v0.33.3
100+
k8s.io/apiextensions-apiserver v0.33.3
101+
k8s.io/apimachinery v0.33.3
102+
k8s.io/cli-runtime v0.33.3
103+
k8s.io/client-go v0.33.3
104+
k8s.io/kubectl v0.33.3
104105
oras.land/oras-go/v2 v2.6.0
105106
sigs.k8s.io/controller-runtime v0.21.0
106-
sigs.k8s.io/secrets-store-csi-driver v1.5.2
107+
sigs.k8s.io/secrets-store-csi-driver v1.5.3
107108
)
108109

109110
require (
@@ -141,7 +142,6 @@ require (
141142
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
142143
github.com/fluxcd/pkg/apis/acl v0.7.0 // indirect
143144
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
144-
github.com/getkin/kin-openapi v0.132.0 // indirect
145145
github.com/go-fed/httpsig v1.1.0 // indirect
146146
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
147147
github.com/go-git/go-billy/v5 v5.6.2 // indirect
@@ -152,6 +152,7 @@ require (
152152
github.com/google/s2a-go v0.1.8 // indirect
153153
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
154154
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
155+
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect
155156
github.com/hashicorp/go-safetemp v1.0.0 // indirect
156157
github.com/jackc/pgpassfile v1.0.0 // indirect
157158
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
@@ -169,6 +170,7 @@ require (
169170
github.com/perimeterx/marshmallow v1.1.5 // indirect
170171
github.com/pjbgf/sha1cd v0.3.2 // indirect
171172
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
173+
github.com/prometheus/otlptranslator v0.0.0-20250717125610-8549f4ab4f8f // indirect
172174
github.com/sagikazarmark/locafero v0.7.0 // indirect
173175
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
174176
github.com/skeema/knownhosts v1.3.1 // indirect
@@ -188,7 +190,9 @@ require (
188190
go.opencensus.io v0.24.0 // indirect
189191
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
190192
go.opentelemetry.io/contrib/detectors/gcp v1.34.0 // indirect
191-
golang.org/x/tools v0.33.0 // indirect
193+
go.yaml.in/yaml/v2 v2.4.2 // indirect
194+
go.yaml.in/yaml/v3 v3.0.3 // indirect
195+
golang.org/x/tools v0.34.0 // indirect
192196
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
193197
google.golang.org/api v0.215.0 // indirect
194198
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
@@ -211,20 +215,20 @@ require (
211215
github.com/agext/levenshtein v1.2.3 // indirect
212216
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
213217
github.com/atotto/clipboard v0.1.4 // indirect
214-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.32 // indirect
215-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.36 // indirect
216-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.36 // indirect
218+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.33 // indirect
219+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.37 // indirect
220+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.37 // indirect
217221
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
218-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.17 // indirect
219-
github.com/aws/aws-sdk-go-v2/service/sso v1.25.5 // indirect
220-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.3 // indirect
222+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.18 // indirect
223+
github.com/aws/aws-sdk-go-v2/service/sso v1.25.6 // indirect
224+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.4 // indirect
221225
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
222226
github.com/aymanbagabas/go-udiff v0.2.0 // indirect
223227
github.com/beorn7/perks v1.0.1 // indirect
224228
github.com/cespare/xxhash/v2 v2.3.0 // indirect
225229
github.com/chai2010/gettext-go v1.0.3 // indirect
226230
github.com/cloudflare/circl v1.6.1 // indirect
227-
github.com/containerd/containerd v1.7.27
231+
github.com/containerd/containerd v1.7.28
228232
github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
229233
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
230234
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
@@ -296,7 +300,7 @@ require (
296300
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
297301
github.com/prometheus/client_model v0.6.2 // indirect
298302
github.com/prometheus/common v0.65.0 // indirect
299-
github.com/prometheus/procfs v0.16.1 // indirect
303+
github.com/prometheus/procfs v0.17.0 // indirect
300304
github.com/rivo/uniseg v0.4.7 // indirect
301305
github.com/rubenv/sql-migrate v1.8.0 // indirect
302306
github.com/russross/blackfriday/v2 v2.1.0 // indirect
@@ -313,28 +317,28 @@ require (
313317
github.com/zclconf/go-cty v1.16.2 // indirect
314318
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 // indirect
315319
go.uber.org/multierr v1.11.0 // indirect
316-
golang.org/x/crypto v0.39.0 // indirect
320+
golang.org/x/crypto v0.40.0 // indirect
317321
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0
318-
golang.org/x/mod v0.25.0 // indirect
319-
golang.org/x/net v0.41.0 // indirect
322+
golang.org/x/mod v0.26.0 // indirect
323+
golang.org/x/net v0.42.0 // indirect
320324
golang.org/x/oauth2 v0.30.0 // indirect
321-
golang.org/x/sys v0.33.0 // indirect
322-
golang.org/x/term v0.32.0 // indirect
323-
golang.org/x/time v0.9.0 // indirect
325+
golang.org/x/sys v0.34.0 // indirect
326+
golang.org/x/term v0.33.0 // indirect
327+
golang.org/x/time v0.12.0 // indirect
324328
google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect
325329
google.golang.org/genproto/googleapis/api v0.0.0-20250218202821-56aae31c358a // indirect
326330
google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a // indirect
327331
google.golang.org/grpc v1.72.1 // indirect
328332
google.golang.org/protobuf v1.36.6 // indirect
329333
gopkg.in/inf.v0 v0.9.1 // indirect
330-
k8s.io/apiserver v0.33.2 // indirect
331-
k8s.io/component-base v0.33.2 // indirect
334+
k8s.io/apiserver v0.33.3 // indirect
335+
k8s.io/component-base v0.33.3 // indirect
332336
k8s.io/klog/v2 v2.130.1 // indirect
333337
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
334338
k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e // indirect
335339
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
336340
sigs.k8s.io/kustomize/api v0.19.0 // indirect
337341
sigs.k8s.io/kustomize/kyaml v0.19.0 // indirect
338342
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
339-
sigs.k8s.io/yaml v1.4.0 // indirect
343+
sigs.k8s.io/yaml v1.5.0 // indirect
340344
)

0 commit comments

Comments
 (0)