зеркало из https://github.com/Azure/azure-dev.git
Updates AKS default version to 1.29 (#4279)
Updates AKS default version to 1.29 Fixes issues in template scripts
This commit is contained in:
Родитель
b5bbb0ce23
Коммит
758438d7ea
|
@ -12,7 +12,7 @@ param location string = resourceGroup().location
|
|||
param tags object = {}
|
||||
|
||||
@description('Kubernetes Version')
|
||||
param kubernetesVersion string = '1.27.7'
|
||||
param kubernetesVersion string = '1.29'
|
||||
|
||||
@description('Whether RBAC is enabled for local accounts')
|
||||
param enableRbac bool = true
|
||||
|
|
|
@ -101,7 +101,7 @@ param principalId string = ''
|
|||
param principalType string = 'User'
|
||||
|
||||
@description('Kubernetes Version')
|
||||
param kubernetesVersion string = '1.27'
|
||||
param kubernetesVersion string = '1.29'
|
||||
|
||||
@description('The Tenant ID associated to the Azure Active Directory')
|
||||
param aadTenantId string = tenant().tenantId
|
||||
|
|
|
@ -82,4 +82,5 @@ PSQLADMINPASSWORD
|
|||
PSQLUSERNAME
|
||||
PSQLUSERPASSWORD
|
||||
DBSERVER
|
||||
kubelogin
|
||||
kubelogin
|
||||
vite
|
|
@ -17,18 +17,25 @@ services:
|
|||
dist: dist
|
||||
language: js
|
||||
host: aks
|
||||
hooks:
|
||||
prebuild:
|
||||
windows:
|
||||
shell: pwsh
|
||||
run: 'echo "VITE_API_BASE_URL=""$env:SERVICE_API_ENDPOINT_URL""" > .env.local ; echo "VITE_APPLICATIONINSIGHTS_CONNECTION_STRING=""$env:APPLICATIONINSIGHTS_CONNECTION_STRING""" >> .env.local'
|
||||
posix:
|
||||
shell: sh
|
||||
run: 'echo VITE_API_BASE_URL=\"$SERVICE_API_ENDPOINT_URL\" > .env.local && echo VITE_APPLICATIONINSIGHTS_CONNECTION_STRING=\"$APPLICATIONINSIGHTS_CONNECTION_STRING\" >> .env.local'
|
||||
postbuild:
|
||||
windows:
|
||||
shell: pwsh
|
||||
run: "rm .env.local"
|
||||
posix:
|
||||
shell: sh
|
||||
run: "rm .env.local"
|
||||
api:
|
||||
project: ../../api/js
|
||||
language: js
|
||||
host: aks
|
||||
k8s:
|
||||
ingress:
|
||||
relativePath: api
|
||||
hooks:
|
||||
postdeploy:
|
||||
windows:
|
||||
shell: pwsh
|
||||
run: azd env set REACT_APP_API_BASE_URL $env:SERVICE_API_ENDPOINT_URL
|
||||
posix:
|
||||
shell: sh
|
||||
run: azd env set REACT_APP_API_BASE_URL ${SERVICE_API_ENDPOINT_URL}
|
||||
relativePath: api
|
|
@ -1,6 +0,0 @@
|
|||
apiVersion: v1
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
name: todo-web-config
|
||||
data:
|
||||
REACT_APP_APPLICATIONINSIGHTS_CONNECTION_STRING: {{.Env.REACT_APP_APPLICATIONINSIGHTS_CONNECTION_STRING}}
|
|
@ -17,12 +17,4 @@ spec:
|
|||
image: {{.Env.SERVICE_WEB_IMAGE_NAME}}
|
||||
ports:
|
||||
- containerPort: 3000
|
||||
env:
|
||||
- name: REACT_APP_API_BASE_URL
|
||||
value: /api
|
||||
- name: REACT_APP_APPLICATIONINSIGHTS_CONNECTION_STRING
|
||||
valueFrom:
|
||||
configMapKeyRef:
|
||||
name: todo-web-config
|
||||
key: REACT_APP_APPLICATIONINSIGHTS_CONNECTION_STRING
|
||||
optional: false
|
||||
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
{
|
||||
"name": "todo-vite-note-mongo-aca",
|
||||
"name": "todo-vite",
|
||||
"version": "0.0.0",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "todo-vite-note-mongo-aca",
|
||||
"name": "todo-vite",
|
||||
"version": "0.0.0",
|
||||
"dependencies": {
|
||||
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"name": "todo-vite-note-mongo-aca",
|
||||
"name": "todo-vite",
|
||||
"private": true,
|
||||
"version": "0.0.0",
|
||||
"type": "module",
|
||||
|
|
Загрузка…
Ссылка в новой задаче