Skip to content

Commit c4a4fe6

Browse files
sylvainsfsylvainsf
committed
Merge remote-tracking branch 'upstream/main'
2 parents b050307 + 3eb8338 commit c4a4fe6

File tree

140 files changed

+7749
-814
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

140 files changed

+7749
-814
lines changed

‎.devcontainer/post-create.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ git config --global --add safe.directory /workspaces/radius
1010

1111
# Install the binary form of golangci-lint, as recommended
1212
# https://golangci-lint.run/welcome/install/#local-installation
13-
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/HEAD/install.sh | sh -s -- -b "$(go env GOPATH)/bin" v1.64.6
13+
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/HEAD/install.sh | sh -s -- -b "$(go env GOPATH)/bin" v1.64.8
1414

1515
# Other go tools
1616
go install sigs.k8s.io/controller-tools/cmd/[email protected]

‎.github/workflows/build.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292
target_arch: arm64
9393
steps:
9494
- name: Check out repo
95-
uses: actions/checkout@v4
95+
uses: actions/checkout@v5
9696
- name: Set up Go
9797
uses: actions/setup-go@v5
9898
with:
@@ -170,7 +170,7 @@ jobs:
170170
if: github.repository == 'radius-project/radius'
171171
steps:
172172
- name: Check out code
173-
uses: actions/checkout@v4
173+
uses: actions/checkout@v5
174174
- name: Parse release version and set environment variables
175175
run: python ./.github/scripts/get_release_version.py
176176
- name: Set up Go
@@ -229,7 +229,7 @@ jobs:
229229
OCI_REPOSITORY: "radius-project/helm-chart"
230230
steps:
231231
- name: Checkout
232-
uses: actions/checkout@v4
232+
uses: actions/checkout@v5
233233
- name: Install helm
234234
uses: azure/setup-helm@v4
235235
with:
@@ -264,7 +264,7 @@ jobs:
264264
environment: publish-bicep
265265
steps:
266266
- name: Check out code
267-
uses: actions/checkout@v4
267+
uses: actions/checkout@v5
268268
- name: Parse release version and set environment variables
269269
run: python ./.github/scripts/get_release_version.py
270270
- name: Set up Go
@@ -314,11 +314,11 @@ jobs:
314314
GITHUB_TOKEN: ${{ secrets.GH_RAD_CI_BOT_PAT }}
315315
steps:
316316
- name: Checkout
317-
uses: actions/checkout@v4
317+
uses: actions/checkout@v5
318318
- name: Parse release version and set environment variables
319319
run: python ./.github/scripts/get_release_version.py
320320
- name: Download release artifacts
321-
uses: actions/download-artifact@v4
321+
uses: actions/download-artifact@v5
322322
with:
323323
pattern: rad_cli_*
324324
merge-multiple: true

‎.github/workflows/devcontainer-feature-release.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
pull-requests: write
1919
packages: write
2020
steps:
21-
- uses: actions/checkout@v4
21+
- uses: actions/checkout@v5
2222

2323
- name: "Publish Features"
2424
uses: devcontainers/action@v1

‎.github/workflows/devcontainer-feature-test.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- mcr.microsoft.com/devcontainers/base:ubuntu
2323
- mcr.microsoft.com/devcontainers/base:debian
2424
steps:
25-
- uses: actions/checkout@v4
25+
- uses: actions/checkout@v5
2626

2727
- name: "Install latest devcontainer CLI"
2828
run: npm install -g @devcontainers/cli
@@ -34,7 +34,7 @@ jobs:
3434
test-scenarios:
3535
runs-on: ubuntu-latest
3636
steps:
37-
- uses: actions/checkout@v4
37+
- uses: actions/checkout@v5
3838

3939
- name: "Install latest devcontainer CLI"
4040
run: npm install -g @devcontainers/cli

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ jobs:
168168
echo "CHECKOUT_REF=refs/heads/${{ github.event.inputs.branch }}" >> $GITHUB_ENV
169169
170170
- name: Check out code
171-
uses: actions/checkout@v4
171+
uses: actions/checkout@v5
172172

173173
- name: "Download PR data artifacts"
174174
if: github.event_name == 'workflow_run'
@@ -208,7 +208,7 @@ jobs:
208208
}
209209
210210
- name: Check out code
211-
uses: actions/checkout@v4
211+
uses: actions/checkout@v5
212212
with:
213213
repository: ${{ env.CHECKOUT_REPO }}
214214
ref: ${{ env.CHECKOUT_REF }}
@@ -480,13 +480,13 @@ jobs:
480480
details_url: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
481481

482482
- name: Checkout Radius repository
483-
uses: actions/checkout@v4
483+
uses: actions/checkout@v5
484484
with:
485485
repository: ${{ env.CHECKOUT_REPO }}
486486
ref: ${{ env.CHECKOUT_REF }}
487487

488488
- name: Checkout Samples repository
489-
uses: actions/checkout@v4
489+
uses: actions/checkout@v5
490490
if: matrix.name == 'samples'
491491
with:
492492
repository: radius-project/samples
@@ -501,7 +501,7 @@ jobs:
501501
cache: true
502502

503503
- name: Download rad CLI
504-
uses: actions/download-artifact@v4
504+
uses: actions/download-artifact@v5
505505
with:
506506
name: ${{ env.RAD_CLI_ARTIFACT_NAME }}
507507
path: bin
@@ -542,7 +542,7 @@ jobs:
542542
# The role-to-assume is the role that the github action will assume to execute aws commands and
543543
# construct cloud control client in test code.
544544
- name: configure aws credentials using assumed role
545-
uses: aws-actions/configure-aws-credentials@v4.2.1
545+
uses: aws-actions/configure-aws-credentials@v4.3.1
546546
with:
547547
role-to-assume: ${{ secrets.AWS_GH_ACTIONS_ROLE }}
548548
role-session-name: GitHub_to_AWS_via_FederatedOIDC

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ jobs:
151151
ucp-noncloud,
152152
datastoresrp-noncloud,
153153
dynamicrp-noncloud,
154+
upgrade-noncloud,
154155
]
155156
runs-on: ${{ matrix.os }}
156157
env:
@@ -179,10 +180,10 @@ jobs:
179180
echo "CHECKOUT_REF=refs/heads/${{ github.event.inputs.branch }}" >> $GITHUB_ENV
180181
181182
- name: Check out code
182-
uses: actions/checkout@v4
183+
uses: actions/checkout@v5
183184

184185
- name: Checkout samples repo
185-
uses: actions/checkout@v4
186+
uses: actions/checkout@v5
186187
if: matrix.name == 'samples-noncloud'
187188
with:
188189
repository: radius-project/samples
@@ -302,6 +303,7 @@ jobs:
302303
--set controller.image=${{ env.LOCAL_REGISTRY_NAME }}:${{ env.LOCAL_REGISTRY_PORT }}/controller,controller.tag=${{ env.REL_VERSION }} \
303304
--set ucp.image=${{ env.LOCAL_REGISTRY_NAME }}:${{ env.LOCAL_REGISTRY_PORT }}/ucpd,ucp.tag=${{ env.REL_VERSION }} \
304305
--set bicep.image=${{ env.LOCAL_REGISTRY_NAME }}:${{ env.LOCAL_REGISTRY_PORT }}/bicep,bicep.tag=${{ env.REL_VERSION }} \
306+
--set preupgrade.image=${{ env.LOCAL_REGISTRY_NAME }}:${{ env.LOCAL_REGISTRY_PORT }}/pre-upgrade,preupgrade.tag=${{ env.REL_VERSION }} \
305307
--set de.image=${{ env.DE_IMAGE }},de.tag=${{ env.DE_TAG }}"
306308
307309
if [ "${{ env.USE_CERT_FILE }}" = "true" ]; then
@@ -501,7 +503,7 @@ jobs:
501503
namespace="radius-system"
502504
pod_names=($(kubectl get pods -n $namespace -o jsonpath='{.items[*].metadata.name}'))
503505
for pod_name in "${pod_names[@]}"; do
504-
kubectl logs $pod_name -n $namespace > func-nc/radius-logs-events/${{ matrix.name }}/${pod_name}.txt
506+
kubectl logs $pod_name -n $namespace > func-nc/radius-logs-events/${{ matrix.name }}/${pod_name}.txt 2>&1 || echo "Failed to get logs for pod: $pod_name" > func-nc/radius-logs-events/${{ matrix.name }}/${pod_name}.txt
505507
done
506508
echo "Pod logs saved to func-nc/radius-logs-events/${{ matrix.name }}/"
507509
# Get kubernetes events and save to file

‎.github/workflows/functional-tests-approval.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
environment: functional-tests
1313
steps:
1414
- name: Checkout Radius repository
15-
uses: actions/checkout@v4
15+
uses: actions/checkout@v5
1616

1717
- name: Save PR number
1818
uses: ./.github/actions/save-pr-as-artifact

‎.github/workflows/lint.yaml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
HELM_CHARTS_DIR: deploy/Chart
3939
steps:
4040
- name: Check out repo
41-
uses: actions/checkout@v4
41+
uses: actions/checkout@v5
4242
- name: Set up Go
4343
uses: actions/setup-go@v5
4444
with:
@@ -69,6 +69,10 @@ jobs:
6969
- name: Run Helm linter
7070
run: |
7171
helm lint ${{ env.HELM_CHARTS_DIR }}
72+
- name: Run Helm unit tests
73+
run: |
74+
helm plugin install https://github.com/helm-unittest/helm-unittest.git || true
75+
cd ${{ env.HELM_CHARTS_DIR }} && helm unittest .
7276
- name: Run TypeSpec format check
7377
run: |
7478
pushd typespec
@@ -77,7 +81,7 @@ jobs:
7781
- name: Run linter
7882
uses: golangci/golangci-lint-action@v6
7983
with:
80-
version: "v1.64.6"
84+
version: "v1.64.8"
8185
args: --timeout=10m
8286
skip-cache: true
8387
install-mode: "binary"
@@ -99,7 +103,7 @@ jobs:
99103
timeout-minutes: 30
100104
steps:
101105
- name: Check out repo
102-
uses: actions/checkout@v4
106+
uses: actions/checkout@v5
103107
- name: Setup NodeJS
104108
uses: actions/setup-node@v4
105109
with:

‎.github/workflows/long-running-azure.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ jobs:
199199
fi
200200
- name: Check out code
201201
if: steps.skip-build.outputs.SKIP_BUILD != 'true'
202-
uses: actions/checkout@v4
202+
uses: actions/checkout@v5
203203
with:
204204
repository: ${{ env.CHECKOUT_REPO }}
205205
ref: ${{ env.CHECKOUT_REF }}
@@ -360,12 +360,12 @@ jobs:
360360
# already-expired tokens in workflows that exceed the 1-hour token lifetime.
361361
revoke: false
362362
- name: Checkout
363-
uses: actions/checkout@v4
363+
uses: actions/checkout@v5
364364
with:
365365
repository: ${{ env.CHECKOUT_REPO }}
366366
ref: ${{ env.CHECKOUT_REF }}
367367
- name: Checkout samples repo
368-
uses: actions/checkout@v4
368+
uses: actions/checkout@v5
369369
with:
370370
repository: radius-project/samples
371371
ref: refs/heads/edge
@@ -379,7 +379,7 @@ jobs:
379379
cache: true
380380
- name: Download rad CLI
381381
if: env.SKIP_BUILD != 'true'
382-
uses: actions/download-artifact@v4
382+
uses: actions/download-artifact@v5
383383
with:
384384
name: ${{ env.RAD_CLI_ARTIFACT_NAME }}
385385
path: bin

‎.github/workflows/publish-docs.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
GOPRIVATE: github.com/radius-project
2828
steps:
2929
- name: Checkout radius repository
30-
uses: actions/checkout@v4
30+
uses: actions/checkout@v5
3131
with:
3232
repository: radius-project/radius
3333
path: radius
@@ -41,7 +41,7 @@ jobs:
4141
echo DOCS_BRANCH="edge" >> $GITHUB_ENV
4242
fi
4343
- name: Checkout docs repository
44-
uses: actions/checkout@v4
44+
uses: actions/checkout@v5
4545
with:
4646
repository: radius-project/docs
4747
path: docs

0 commit comments

Comments
 (0)