Skip to content

Commit 6df0aec

Browse files
authored
fix: update install_admin_cluster.sh (#767)
1 parent 83da2e7 commit 6df0aec

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

anthos-bm-gcp-bash/install_admin_cluster.sh

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# Copyright 2022 Google LLC
2+
# Copyright 2022-2025 Google LLC
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@ if [[ -z "${ADMIN_CLUSTER_NAME}" ]]; then
3232
case $yn in
3333
[Yy]* ) ADMIN_CLUSTER_NAME="abm-admin-cluster"; break;;
3434
[Nn]* ) exit 1;;
35-
* ) echo "Please answer 'Y' or 'y for Yes and 'N' or 'n' for No.";;
35+
* ) echo "Please answer 'Y' or 'y' for Yes and 'N' or 'n' for No.";;
3636
esac
3737
done
3838
fi
@@ -92,6 +92,7 @@ done
9292
printf "🔄 Creating Service Account and Service Account key...\n"
9393
# [START anthos_bm_gcp_bash_admin_create_sa]
9494
gcloud iam service-accounts create baremetal-gcr
95+
sleep 5s
9596

9697
gcloud iam service-accounts keys create bm-gcr.json \
9798
--iam-account=baremetal-gcr@"${PROJECT_ID}".iam.gserviceaccount.com
@@ -239,6 +240,7 @@ i=2 # We start from 10.200.0.2/24
239240
for vm in "${VMs[@]}"
240241
do
241242
gcloud compute ssh root@"$vm" --zone "${ZONE}" --tunnel-through-iap << EOF
243+
export DEBIAN_FRONTEND=noninteractive
242244
apt-get -qq update > /dev/null
243245
apt-get -qq install -y jq > /dev/null
244246
set -x

anthos-bm-gcp-terraform/main.tf

+2-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,8 @@ module "instance_template" {
131131
metadata = {
132132
enable-oslogin = "false"
133133
}
134-
service_account = null
134+
service_account = null
135+
create_service_account = false
135136
}
136137

137138
module "instance_template_worker" {

test/integration/anthos_attached_clusters_kind/anthos_attached_clusters_kind_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"github.com/stretchr/testify/assert"
2626
)
2727

28-
const deploymentName = "istiod-asm-1227-1"
28+
const deploymentName = "istiod-asm-1227-4"
2929

3030
func TestAACKind(t *testing.T) {
3131
kind := tft.NewTFBlueprintTest(t)

0 commit comments

Comments
 (0)