Skip to content

Commit 4abfe16

Browse files
committed
feat(opentofu): drop nested container, default to arc-tf native runner
The arc-tf runner-set runs the tfroot-runner image directly; jobs no longer need a `container:` block. Drop the input, the three container blocks, and the `cp -r /root/.ssh /github/home/` shim that was only required when the job ran inside a nested container. Default `runs-on` flips to `arc-tf`. Existing callers passing `runs-on: arc-dind` need to update — there's only the one (tfroot-libvirt), handled in a paired PR.
1 parent 28d7c7f commit 4abfe16

1 file changed

Lines changed: 1 addition & 23 deletions

File tree

.github/workflows/opentofu.yml

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,7 @@ on:
1010
runs-on:
1111
description: Runner label
1212
type: string
13-
default: ubuntu-latest
14-
container:
15-
description: Container image to use
16-
type: string
17-
default: ghcr.io/makeitworkcloud/tfroot-runner:latest
13+
default: arc-tf
1814
setup-ssh:
1915
description: Whether to setup SSH keys
2016
type: boolean
@@ -35,8 +31,6 @@ jobs:
3531
test:
3632
name: Pre-commit Tests
3733
runs-on: ${{ inputs.runs-on }}
38-
container:
39-
image: ${{ inputs.container }}
4034
env:
4135
SOPS_AGE_KEY: ${{ secrets.SOPS_AGE_KEY }}
4236
steps:
@@ -52,10 +46,6 @@ jobs:
5246
key: ${{ secrets.SSH_PRIVATE_KEY }}
5347
known_hosts: ${{ secrets.SSH_KNOWN_HOSTS }}
5448

55-
- name: Copy SSH area
56-
if: ${{ inputs.setup-ssh }}
57-
run: cp -r /root/.ssh /github/home/
58-
5949
- name: Fetch canonical pre-commit config
6050
run: |
6151
curl -sSL -o .pre-commit-config.yaml \
@@ -70,8 +60,6 @@ jobs:
7060
plan:
7161
name: OpenTofu Plan
7262
runs-on: ${{ inputs.runs-on }}
73-
container:
74-
image: ${{ inputs.container }}
7563
if: github.event_name == 'pull_request'
7664
needs: [test]
7765
env:
@@ -87,10 +75,6 @@ jobs:
8775
key: ${{ secrets.SSH_PRIVATE_KEY }}
8876
known_hosts: ${{ secrets.SSH_KNOWN_HOSTS }}
8977

90-
- name: Copy SSH area
91-
if: ${{ inputs.setup-ssh }}
92-
run: cp -r /root/.ssh /github/home/
93-
9478
- name: OpenTofu Plan
9579
id: plan
9680
run: |
@@ -125,8 +109,6 @@ jobs:
125109
apply:
126110
name: OpenTofu Apply
127111
runs-on: ${{ inputs.runs-on }}
128-
container:
129-
image: ${{ inputs.container }}
130112
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
131113
needs: [test]
132114
environment: ${{ inputs.environment }}
@@ -143,9 +125,5 @@ jobs:
143125
key: ${{ secrets.SSH_PRIVATE_KEY }}
144126
known_hosts: ${{ secrets.SSH_KNOWN_HOSTS }}
145127

146-
- name: Copy SSH area
147-
if: ${{ inputs.setup-ssh }}
148-
run: cp -r /root/.ssh /github/home/
149-
150128
- name: OpenTofu Apply
151129
run: make apply

0 commit comments

Comments
 (0)