Skip to content

Commit 443b0b0

Browse files
committed
nit
Signed-off-by: sk593 <shruthikumar@microsoft.com>
1 parent 2e9e587 commit 443b0b0

File tree

5 files changed

+116
-461
lines changed

5 files changed

+116
-461
lines changed

.github/scripts/create-cluster.sh

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -170,18 +170,27 @@ else
170170
echo "✓ Local registry already running at localhost:5000"
171171
fi
172172

173-
if [[ -z "${AZURE_CLIENT_ID:-}" ]]; then
174-
echo "Error: AZURE_CLIENT_ID must be set to install Radius with Azure Workload Identity."
175-
echo "Ensure the environment variable is available before running make create-radius-cluster."
176-
exit 1
173+
if [[ "${AZURE_WORKLOAD_IDENTITY_ENABLED}" == "true" ]]; then
174+
if [[ -z "${AZURE_CLIENT_ID:-}" ]]; then
175+
echo "Error: AZURE_CLIENT_ID must be set to install Radius with Azure Workload Identity."
176+
echo "Ensure the environment variable is available before running make create-radius-cluster."
177+
exit 1
178+
fi
177179
fi
178180

179181
echo "Installing Radius on Kubernetes..."
180-
rad install kubernetes \
181-
--set rp.publicEndpointOverride=localhost:8081 \
182-
--skip-contour-install \
183-
--set dashboard.enabled=false \
184-
--set global.azureWorkloadIdentity.enabled="${AZURE_WORKLOAD_IDENTITY_ENABLED}" \
182+
if [[ "${AZURE_WORKLOAD_IDENTITY_ENABLED}" == "true" ]]; then
183+
rad install kubernetes \
184+
--set rp.publicEndpointOverride=localhost:8081 \
185+
--skip-contour-install \
186+
--set dashboard.enabled=false \
187+
--set global.azureWorkloadIdentity.enabled=true
188+
else
189+
rad install kubernetes \
190+
--set rp.publicEndpointOverride=localhost:8081 \
191+
--skip-contour-install \
192+
--set dashboard.enabled=false
193+
fi
185194

186195
echo "Installing Dapr on Kubernetes..."
187196
helm repo add dapr https://dapr.github.io/helm-charts --force-update >/dev/null 2>&1

.github/workflows/validate-azure-recipes.yaml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ permissions:
1919

2020
jobs:
2121
validate-azure-recipes:
22-
runs-on: ubuntu-latest
22+
runs-on: ubuntu-24.04
23+
timeout-minutes: 30
2324
name: Validate Azure Recipes
2425
environment: azure
2526
permissions:
@@ -32,6 +33,8 @@ jobs:
3233
steps:
3334
- name: Checkout
3435
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
36+
with:
37+
persist-credentials: false
3538

3639
- name: Azure Login
3740
uses: azure/login@a457da9ea143d694b1b9c7c869ebb04ebe844ef5 # v2.3.0
@@ -73,9 +76,9 @@ jobs:
7376
node-version: 22
7477

7578
- name: Set up ORAS
76-
uses: oras-project/setup-oras@22ce207df3b08e061f537244349aac6ae1d214f6
79+
uses: oras-project/setup-oras@22ce207df3b08e061f537244349aac6ae1d214f6 # v1.2.0
7780
with:
78-
version: '1.2.4'
81+
version: '1.2.0'
7982

8083
- name: Install Radius CLI
8184
run: make install-radius-cli RAD_VERSION="${{ inputs.version || 'edge' }}"
@@ -92,6 +95,9 @@ jobs:
9295
- name: Build Azure Recipes
9396
run: make build-azure-recipes
9497

98+
- name: Register Azure Recipes
99+
run: RECIPE_PLATFORM_FILTER=azure make register ENVIRONMENT=${{ env.AZURE_ENVIRONMENT_NAME }} RECIPE_TYPE=bicep
100+
95101
- name: Test Azure Recipes
96102
run: make test-azure-recipes
97103

.github/workflows/validate-resource-types.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ jobs:
3939
- name: Setup Node
4040
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
4141
with:
42-
node-version: 16
42+
node-version: 22
4343
- name: Set up ORAS
44-
uses: oras-project/setup-oras@22ce207df3b08e061f537244349aac6ae1d214f6 # v1.2.4
44+
uses: oras-project/setup-oras@22ce207df3b08e061f537244349aac6ae1d214f6 # v1.2.0
4545
with:
4646
version: "1.2.0"
4747

0 commit comments

Comments
 (0)