Skip to content

Commit 3810792

Browse files
authored
fix: fix the private api reset endpoints used in the reset_iks_api_key.sh script (#476)
1 parent 1f67919 commit 3810792

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

common-dev-assets

main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ data "ibm_iam_account_settings" "iam_account_settings" {
283283

284284
resource "null_resource" "reset_api_key" {
285285
provisioner "local-exec" {
286-
command = "${path.module}/scripts/reset_iks_api_key.sh ${var.region} ${var.resource_group_id} ${var.use_private_endpoint}"
286+
command = "${path.module}/scripts/reset_iks_api_key.sh ${var.region} ${var.resource_group_id} ${var.use_private_endpoint} ${var.ocp_version == "4.13" && var.disable_public_endpoint ? "vpe" : var.cluster_config_endpoint_type}" # private only cluster on 4.13 will use VPE endpoint.
287287
interpreter = ["/bin/bash", "-c"]
288288
environment = {
289289
IAM_TOKEN = data.ibm_iam_auth_token.reset_api_key_tokendata.iam_access_token

scripts/reset_iks_api_key.sh

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ REGION="$1"
66
RESOURCE_GROUP_ID="$2"
77
APIKEY_KEY_NAME="containers-kubernetes-key"
88
PRIVATE_ENV="$3"
9+
CLUSTER_ENDPOINT="$4"
910

1011
if [[ -z "${REGION}" ]]; then
1112
echo "Region must be passed as first input script argument" >&2
@@ -51,8 +52,13 @@ fetch_data
5152

5253
if [ "${reset}" == true ]; then
5354
if [ "$PRIVATE_ENV" = true ]; then
54-
RESET_URL="https://private.$REGION.containers.cloud.ibm.com/v1/keys"
55-
curl -H "accept: application/json" -H "Authorization: $IAM_TOKEN" -H "X-Auth-Resource-Group: $RESOURCE_GROUP_ID" -X POST "$RESET_URL"
55+
if [ "$CLUSTER_ENDPOINT" == "private" ] || [ "$CLUSTER_ENDPOINT" == "default" ]; then
56+
RESET_URL="https://private.$REGION.containers.cloud.ibm.com/v1/keys"
57+
curl -H "accept: application/json" -H "Authorization: $IAM_TOKEN" -H "X-Auth-Resource-Group: $RESOURCE_GROUP_ID" -X POST "$RESET_URL"
58+
elif [ "$CLUSTER_ENDPOINT" == "vpe" ]; then
59+
RESET_URL="https://api.$REGION.containers.cloud.ibm.com/v1/keys"
60+
curl -H "accept: application/json" -H "Authorization: $IAM_TOKEN" -H "X-Auth-Resource-Group: $RESOURCE_GROUP_ID" -X POST "$RESET_URL"
61+
fi
5662
else
5763
RESET_URL="https://containers.cloud.ibm.com/global/v1/keys"
5864
curl -H "accept: application/json" -H "X-Region: $REGION" -H "Authorization: $IAM_TOKEN" -H "X-Auth-Resource-Group: $RESOURCE_GROUP_ID" -X POST "$RESET_URL" -d ''

0 commit comments

Comments
 (0)