Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Run yum update in stress images. Remove account key from bicep #9093

Merged
merged 2 commits into from
Oct 3, 2024
Merged

Run yum update in stress images. Remove account key from bicep #9093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c517a5b
Run yum update in stress images
benbp Oct 3, 2024
851d948
Change storage account key lookup in stress bicep template
benbp Oct 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion tools/stress-cluster/cluster/azure/cluster/storage.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,4 @@ resource fileshare 'Microsoft.Storage/storageAccounts/fileServices/shares@2021-0
}

output name string = storage.name
output key string = storage.listKeys().keys[0].value
output fileShareName string = fileShareName
12 changes: 10 additions & 2 deletions tools/stress-cluster/cluster/azure/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,16 +98,24 @@ module containerRegistry 'cluster/acr.bicep' = {
}
}

var storageName = 'stressdebug${resourceSuffix}'

module storage 'cluster/storage.bicep' = {
name: 'storage'
scope: group
params: {
storageName: 'stressdebug${resourceSuffix}'
storageName: storageName
fileShareName: 'stressfiles${resourceSuffix}'
location: clusterLocation
}
}

// Get storage account reference for key lookup (avoid key as secret output from storage module)
resource storageAccount 'Microsoft.Storage/storageAccounts@2019-06-01' existing = {
name: storageName
scope: group
}

var appInsightsInstrumentationKeySecretName = 'appInsightsInstrumentationKey-${resourceSuffix}'
// Value is in dotenv format as it will be appended to stress test container dotenv files
var appInsightsInstrumentationKeySecretValue = 'APPINSIGHTS_INSTRUMENTATIONKEY=${appInsights.outputs.instrumentationKey}\n'
Expand All @@ -120,9 +128,9 @@ var appInsightsConnectionStringSecretValue = 'APPLICATIONINSIGHTS_CONNECTION_STR
// See https://docs.microsoft.com/azure/aks/azure-files-volume#create-a-kubernetes-secret
// See https://docs.microsoft.com/azure/aks/azure-files-csi
var debugStorageKeySecretName = 'debugStorageKey-${resourceSuffix}'
var debugStorageKeySecretValue = storage.outputs.key
var debugStorageAccountSecretName = 'debugStorageAccount-${resourceSuffix}'
var debugStorageAccountSecretValue = storage.outputs.name
var debugStorageKeySecretValue = '${storageAccount.listKeys().keys[0].value}'

module keyvault 'cluster/keyvault.bicep' = {
name: 'keyvault'
Expand Down
2 changes: 2 additions & 0 deletions ...ss-cluster/cluster/kubernetes/stress-test-addons/images/test-resource-deployer/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
FROM mcr.microsoft.com/azure-powershell:mariner-2

RUN yum update -y

RUN curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
RUN install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
RUN kubectl version --client
Expand Down
2 changes: 2 additions & 0 deletions tools/stress-cluster/services/Stress.Watcher/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
FROM mcr.microsoft.com/dotnet/sdk:8.0-cbl-mariner2.0 AS build

RUN yum update -y

COPY ./src /src

RUN cd /src && dotnet publish -c Release -o /stresswatcher -r linux-x64 -f net8.0 -p:PublishSingleFile=true --self-contained
Expand Down