Skip to content

Commit 94996c6

Browse files
adrianrioboclaude
andcommitted
chore(tkn): add --vpc-id param to AWS Tekton task specs
Exposes the vpc-id flag added in the previous commit to all affected Tekton tasks (rhel, windows, fedora, rhel-ai) and regenerates the task files from the updated templates. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent b3a0f3d commit 94996c6

8 files changed

Lines changed: 60 additions & 0 deletions

tkn/infra-aws-fedora.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,11 @@ spec:
138138
default: "false"
139139

140140
# Network params
141+
- name: vpc-id
142+
description: |
143+
ID of an existing VPC to deploy into. When set, mapt reuses the VPC
144+
instead of creating a new one. Mutually exclusive with airgap.
145+
default: ""
141146
- name: service-endpoints
142147
description: |
143148
Comma-separated list of VPC service endpoints to create.
@@ -277,6 +282,9 @@ spec:
277282
if [[ "$(params.airgap)" == "true" ]]; then
278283
cmd+="--airgap "
279284
fi
285+
if [[ "$(params.vpc-id)" != "" ]]; then
286+
cmd+="--vpc-id '$(params.vpc-id)' "
287+
fi
280288
if [[ "$(params.service-endpoints)" != "" ]]; then
281289
cmd+="--service-endpoints '$(params.service-endpoints)' "
282290
fi

tkn/infra-aws-rhel-ai.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,11 @@ spec:
160160
default: ""
161161

162162
# Network params
163+
- name: vpc-id
164+
description: |
165+
ID of an existing VPC to deploy into. When set, mapt reuses the VPC
166+
instead of creating a new one.
167+
default: ""
163168
- name: service-endpoints
164169
description: |
165170
Comma-separated list of VPC service endpoints to create.
@@ -302,6 +307,9 @@ spec:
302307
cmd+="--spot-eviction-tolerance '$(params.spot-eviction-tolerance)' "
303308
cmd+="--spot-excluded-regions '$(params.spot-excluded-regions)' "
304309
fi
310+
if [[ "$(params.vpc-id)" != "" ]]; then
311+
cmd+="--vpc-id '$(params.vpc-id)' "
312+
fi
305313
if [[ "$(params.service-endpoints)" != "" ]]; then
306314
cmd+="--service-endpoints '$(params.service-endpoints)' "
307315
fi

tkn/infra-aws-rhel.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,11 @@ spec:
157157
default: "false"
158158

159159
# Network params
160+
- name: vpc-id
161+
description: |
162+
ID of an existing VPC to deploy into. When set, mapt reuses the VPC
163+
instead of creating a new one. Mutually exclusive with airgap.
164+
default: ""
160165
- name: service-endpoints
161166
description: |
162167
Comma-separated list of VPC service endpoints to create.
@@ -302,6 +307,9 @@ spec:
302307
if [[ "$(params.profile-snc)" == "true" ]]; then
303308
cmd+="--snc "
304309
fi
310+
if [[ "$(params.vpc-id)" != "" ]]; then
311+
cmd+="--vpc-id '$(params.vpc-id)' "
312+
fi
305313
if [[ "$(params.service-endpoints)" != "" ]]; then
306314
cmd+="--service-endpoints '$(params.service-endpoints)' "
307315
fi

tkn/infra-aws-windows-server.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,11 @@ spec:
117117
To access the target machine we need to go through the bastion
118118
default: 'false'
119119
# Network params
120+
- name: vpc-id
121+
description: |
122+
ID of an existing VPC to deploy into. When set, mapt reuses the VPC
123+
instead of creating a new one. Mutually exclusive with airgap.
124+
default: "''"
120125
- name: service-endpoints
121126
description: |
122127
Comma-separated list of VPC service endpoints to create.
@@ -238,6 +243,7 @@ spec:
238243
cmd+="--spot --spot-increase-rate $(params.spot-increase-rate) --spot-eviction-tolerance $(params.spot-eviction-tolerance) "
239244
fi
240245
if [[ $(params.airgap) == "true" ]]; then cmd+="--airgap "; fi
246+
if [[ $(params.vpc-id) != "" ]]; then cmd+="--vpc-id $(params.vpc-id) "; fi
241247
if [[ $(params.service-endpoints) != "" ]]; then cmd+="--service-endpoints $(params.service-endpoints) "; fi
242248
cmd+="--tags $(params.tags) "
243249
fi

tkn/template/infra-aws-fedora.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,11 @@ spec:
138138
default: "false"
139139

140140
# Network params
141+
- name: vpc-id
142+
description: |
143+
ID of an existing VPC to deploy into. When set, mapt reuses the VPC
144+
instead of creating a new one. Mutually exclusive with airgap.
145+
default: ""
141146
- name: service-endpoints
142147
description: |
143148
Comma-separated list of VPC service endpoints to create.
@@ -277,6 +282,9 @@ spec:
277282
if [[ "$(params.airgap)" == "true" ]]; then
278283
cmd+="--airgap "
279284
fi
285+
if [[ "$(params.vpc-id)" != "" ]]; then
286+
cmd+="--vpc-id '$(params.vpc-id)' "
287+
fi
280288
if [[ "$(params.service-endpoints)" != "" ]]; then
281289
cmd+="--service-endpoints '$(params.service-endpoints)' "
282290
fi

tkn/template/infra-aws-rhel-ai.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,11 @@ spec:
160160
default: ""
161161

162162
# Network params
163+
- name: vpc-id
164+
description: |
165+
ID of an existing VPC to deploy into. When set, mapt reuses the VPC
166+
instead of creating a new one.
167+
default: ""
163168
- name: service-endpoints
164169
description: |
165170
Comma-separated list of VPC service endpoints to create.
@@ -302,6 +307,9 @@ spec:
302307
cmd+="--spot-eviction-tolerance '$(params.spot-eviction-tolerance)' "
303308
cmd+="--spot-excluded-regions '$(params.spot-excluded-regions)' "
304309
fi
310+
if [[ "$(params.vpc-id)" != "" ]]; then
311+
cmd+="--vpc-id '$(params.vpc-id)' "
312+
fi
305313
if [[ "$(params.service-endpoints)" != "" ]]; then
306314
cmd+="--service-endpoints '$(params.service-endpoints)' "
307315
fi

tkn/template/infra-aws-rhel.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,11 @@ spec:
157157
default: "false"
158158

159159
# Network params
160+
- name: vpc-id
161+
description: |
162+
ID of an existing VPC to deploy into. When set, mapt reuses the VPC
163+
instead of creating a new one. Mutually exclusive with airgap.
164+
default: ""
160165
- name: service-endpoints
161166
description: |
162167
Comma-separated list of VPC service endpoints to create.
@@ -302,6 +307,9 @@ spec:
302307
if [[ "$(params.profile-snc)" == "true" ]]; then
303308
cmd+="--snc "
304309
fi
310+
if [[ "$(params.vpc-id)" != "" ]]; then
311+
cmd+="--vpc-id '$(params.vpc-id)' "
312+
fi
305313
if [[ "$(params.service-endpoints)" != "" ]]; then
306314
cmd+="--service-endpoints '$(params.service-endpoints)' "
307315
fi

tkn/template/infra-aws-windows-server.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,11 @@ spec:
117117
To access the target machine we need to go through the bastion
118118
default: 'false'
119119
# Network params
120+
- name: vpc-id
121+
description: |
122+
ID of an existing VPC to deploy into. When set, mapt reuses the VPC
123+
instead of creating a new one. Mutually exclusive with airgap.
124+
default: "''"
120125
- name: service-endpoints
121126
description: |
122127
Comma-separated list of VPC service endpoints to create.
@@ -238,6 +243,7 @@ spec:
238243
cmd+="--spot --spot-increase-rate $(params.spot-increase-rate) --spot-eviction-tolerance $(params.spot-eviction-tolerance) "
239244
fi
240245
if [[ $(params.airgap) == "true" ]]; then cmd+="--airgap "; fi
246+
if [[ $(params.vpc-id) != "" ]]; then cmd+="--vpc-id $(params.vpc-id) "; fi
241247
if [[ $(params.service-endpoints) != "" ]]; then cmd+="--service-endpoints $(params.service-endpoints) "; fi
242248
cmd+="--tags $(params.tags) "
243249
fi

0 commit comments

Comments
 (0)