@@ -23,24 +23,15 @@ source "${REPO_ROOT}/hack/ensure-azcli.sh" # install az cli and login using WI
23
23
# shellcheck source=hack/ensure-tags.sh
24
24
source " ${REPO_ROOT} /hack/ensure-tags.sh" # set the right timestamp and job name
25
25
26
- KUBECTL=" ${REPO_ROOT} /hack/tools/bin/kubectl"
27
- AZWI=" ${REPO_ROOT} /hack/tools/bin/azwi"
28
- make --directory=" ${REPO_ROOT} " " ${KUBECTL##*/ } " " ${AZWI##*/ } "
29
-
30
26
export MGMT_CLUSTER_NAME=" ${MGMT_CLUSTER_NAME:- aks-mgmt-capz-${RANDOM_SUFFIX} } " # management cluster name
31
27
export AKS_RESOURCE_GROUP=" ${AKS_RESOURCE_GROUP:- aks-mgmt-capz-${RANDOM_SUFFIX} } " # resource group name
32
28
export AKS_NODE_RESOURCE_GROUP=" node-${AKS_RESOURCE_GROUP} "
33
29
export AKS_MGMT_KUBERNETES_VERSION=" ${AKS_MGMT_KUBERNETES_VERSION:- v1.30.2} "
34
30
export AZURE_LOCATION=" ${AZURE_LOCATION:- westus2} "
35
31
export AKS_NODE_VM_SIZE=" ${AKS_NODE_VM_SIZE:- " Standard_B2s" } "
36
32
export AKS_NODE_COUNT=" ${AKS_NODE_COUNT:- 2} "
37
- export AZURE_NODE_MACHINE_TYPE=" ${AZURE_NODE_MACHINE_TYPE:- " Standard_B2s" } "
38
33
export MGMT_CLUSTER_KUBECONFIG=" ${MGMT_CLUSTER_KUBECONFIG:- $REPO_ROOT / aks-mgmt.config} "
39
34
export AZURE_IDENTITY_ID_FILEPATH=" ${AZURE_IDENTITY_ID_FILEPATH:- $REPO_ROOT / azure_identity_id} "
40
- export AZWI_STORAGE_ACCOUNT=" capzcioidcissuer${RANDOM_SUFFIX} "
41
- export AZWI_STORAGE_CONTAINER=" \$ web"
42
- export SERVICE_ACCOUNT_SIGNING_PUB_FILEPATH=" ${SERVICE_ACCOUNT_SIGNING_PUB_FILEPATH:- } "
43
- export SERVICE_ACCOUNT_SIGNING_KEY_FILEPATH=" ${SERVICE_ACCOUNT_SIGNING_KEY_FILEPATH:- } "
44
35
export REGISTRY=" ${REGISTRY:- } "
45
36
export AKS_MGMT_VNET_NAME=" ${AKS_MGMT_VNET_NAME:- " aks-mgmt-vnet-${RANDOM_SUFFIX} " } "
46
37
export AKS_MGMT_VNET_CIDR=" ${AKS_MGMT_VNET_CIDR:- " 20.255.0.0/16" } "
@@ -73,16 +64,10 @@ main() {
73
64
echo " AKS_MGMT_KUBERNETES_VERSION: $AKS_MGMT_KUBERNETES_VERSION "
74
65
echo " AZURE_LOCATION: $AZURE_LOCATION "
75
66
echo " AKS_NODE_VM_SIZE: $AKS_NODE_VM_SIZE "
76
- echo " AZURE_NODE_MACHINE_TYPE: $AZURE_NODE_MACHINE_TYPE "
77
67
echo " AKS_NODE_COUNT: $AKS_NODE_COUNT "
78
68
echo " MGMT_CLUSTER_KUBECONFIG: $MGMT_CLUSTER_KUBECONFIG "
79
69
echo " AZURE_IDENTITY_ID_FILEPATH: $AZURE_IDENTITY_ID_FILEPATH "
80
- echo " AZWI_STORAGE_ACCOUNT: $AZWI_STORAGE_ACCOUNT "
81
- echo " AZWI_STORAGE_CONTAINER: $AZWI_STORAGE_CONTAINER "
82
- echo " SERVICE_ACCOUNT_SIGNING_PUB_FILEPATH: $SERVICE_ACCOUNT_SIGNING_PUB_FILEPATH "
83
- echo " SERVICE_ACCOUNT_SIGNING_KEY_FILEPATH: $SERVICE_ACCOUNT_SIGNING_KEY_FILEPATH "
84
70
echo " REGISTRY: $REGISTRY "
85
- echo " APISERVER_LB_DNS_SUFFIX: $APISERVER_LB_DNS_SUFFIX "
86
71
echo " AKS_MGMT_VNET_NAME: $AKS_MGMT_VNET_NAME "
87
72
echo " AKS_MGMT_VNET_CIDR: $AKS_MGMT_VNET_CIDR "
88
73
echo " AKS_MGMT_SERVICE_CIDR: $AKS_MGMT_SERVICE_CIDR "
@@ -93,6 +78,14 @@ main() {
93
78
echo " AZURE_SUBSCRIPTION_ID: $AZURE_SUBSCRIPTION_ID "
94
79
echo " AZURE_CLIENT_ID: $AZURE_CLIENT_ID "
95
80
echo " AZURE_TENANT_ID: $AZURE_TENANT_ID "
81
+ echo " APISERVER_LB_DNS_SUFFIX: $APISERVER_LB_DNS_SUFFIX "
82
+ echo " AKS_MI_CLIENT_ID: $AKS_MI_CLIENT_ID "
83
+ echo " AKS_MI_OBJECT_ID: $AKS_MI_OBJECT_ID "
84
+ echo " AKS_MI_RESOURCE_ID: $AKS_MI_RESOURCE_ID "
85
+ echo " MANAGED_IDENTITY_NAME: $MANAGED_IDENTITY_NAME "
86
+ echo " MANAGED_IDENTITY_RG: $MANAGED_IDENTITY_RG "
87
+ echo " ASO_CREDENTIAL_SECRET_MODE: $ASO_CREDENTIAL_SECRET_MODE "
88
+ echo " SKIP_AKS_CREATE: $SKIP_AKS_CREATE "
96
89
echo " --------------------------------"
97
90
98
91
# if using SKIP_AKS_CREATE=true, skip creating the AKS cluster
0 commit comments