Skip to content

Commit 1e5dee3

Browse files
committed
task: directory cleanup
1 parent 4c1bce0 commit 1e5dee3

9 files changed

Lines changed: 102 additions & 27 deletions

File tree

.tasks/ansible.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,14 @@ tasks:
99

1010
collection:
1111
desc: Install Ansible collections
12+
deps:
13+
- :ensure-collections-dir
1214
cmds:
13-
- mkdir -p {{.ANSIBLE_COLLECTIONS_PATH}}
1415
- ansible-galaxy collection install -r {{.USER_WORKING_DIR}}/requirements.yml --force -p {{.ANSIBLE_COLLECTIONS_PATH}}
1516

1617
role:
1718
desc: Install Ansible roles
19+
deps:
20+
- :ensure-roles-dir
1821
cmds:
19-
- mkdir -p {{.ANSIBLE_ROLES_PATH}}
2022
- ansible-galaxy role install -r {{.USER_WORKING_DIR}}/requirements.yml --force -p {{.ANSIBLE_ROLES_PATH}}

.tasks/certificates.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ tasks:
1010

1111
client:key:
1212
desc: Generate client private key
13+
deps:
14+
- :ensure-client-dir
1315
cmds:
14-
- mkdir -p {{.CLIENT_DIR}}
1516
- openssl genrsa -out {{.CLIENT_DIR}}/{{.CLIENT_NAME}}.key 2048
1617
generates:
1718
- "{{.CLIENT_DIR}}/{{.CLIENT_NAME}}.key"

.tasks/cluster.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,54 +5,54 @@ tasks:
55
desc: Provision Redpanda cluster
66
deps:
77
- :ansible:prereqs
8+
- :ensure-logs-dir
89
cmds:
9-
- mkdir -p {{.ARTIFACT_DIR}}/logs
1010
- ansible-playbook ansible/provision-cluster.yml --private-key {{.PRIVATE_KEY}} --inventory {{.ANSIBLE_INVENTORY}} --extra-vars is_using_unstable={{.IS_USING_UNSTABLE}}
1111

1212
tls:
1313
desc: Provision Redpanda cluster with TLS
1414
deps:
1515
- :ansible:prereqs
16+
- :ensure-logs-dir
1617
cmds:
17-
- mkdir -p {{.ARTIFACT_DIR}}/logs
1818
- ansible-playbook ansible/provision-cluster-tls.yml --private-key {{.PRIVATE_KEY}} --extra-vars is_using_unstable={{.IS_USING_UNSTABLE}}
1919

2020
tiered:
2121
desc: Provision Redpanda cluster with tiered storage
2222
deps:
2323
- :ansible:prereqs
24+
- :ensure-logs-dir
2425
cmds:
25-
- mkdir -p {{.ARTIFACT_DIR}}/logs
2626
- ansible-playbook ansible/provision-cluster-tiered-storage.yml --private-key {{.PRIVATE_KEY}} --extra-vars is_using_unstable={{.IS_USING_UNSTABLE}} --extra-vars segment_upload_interval={{.SEGMENT_UPLOAD_INTERVAL}} --extra-vars cloud_storage_credentials_source={{.CLOUD_STORAGE_CREDENTIALS_SOURCE}} --extra-vars redpanda_license={{.REDPANDA_LICENSE}}
2727

2828
proxy:
2929
desc: Provision Redpanda cluster with proxy
3030
deps:
3131
- :ansible:prereqs
32+
- :ensure-logs-dir
3233
cmds:
33-
- mkdir -p {{.ARTIFACT_DIR}}/logs
3434
- ansible-playbook ansible/proxy/provision-private-proxied-cluster.yml --private-key {{.PRIVATE_KEY}} --inventory {{.ANSIBLE_INVENTORY}} --extra-vars is_using_unstable={{.IS_USING_UNSTABLE}} --extra-vars '{"squid_acl_localnet":["{{.SQUID_ACL_LOCALNET}}"]}' --extra-vars redpanda='{"cluster":{"cloud_storage_segment_max_upload_interval_sec":"{{.SEGMENT_UPLOAD_INTERVAL}}"}}' {{.SKIP_TAGS}} {{.CLI_ARGS}}
3535

3636
extra:provision:
3737
desc: Provision secondary Redpanda cluster
3838
deps:
3939
- :ansible:prereqs
40+
- :ensure-logs-dir
4041
cmds:
41-
- mkdir -p {{.ARTIFACT_DIR}}/logs
4242
- ansible-playbook ansible/provision-cluster.yml --private-key {{.PRIVATE_KEY}} --inventory {{.EXTRA_INVENTORY}} --extra-vars is_using_unstable={{.IS_USING_UNSTABLE}}
4343

4444
extra:tls:
4545
desc: Provision secondary cluster with TLS
4646
deps:
4747
- :ansible:prereqs
48+
- :ensure-logs-dir
4849
cmds:
49-
- mkdir -p {{.ARTIFACT_DIR}}/logs
5050
- ansible-playbook ansible/provision-cluster-tls.yml --private-key {{.PRIVATE_KEY}} --inventory {{.EXTRA_INVENTORY}} --extra-vars is_using_unstable={{.IS_USING_UNSTABLE}}
5151

5252
dev:tiered:
5353
desc: Development tiered storage deployment (no log suppression)
5454
deps:
5555
- :ansible:prereqs
56+
- :ensure-logs-dir
5657
cmds:
57-
- mkdir -p {{.ARTIFACT_DIR}}/logs
5858
- ansible-playbook ansible/provision-cluster-tiered-storage.yml --private-key {{.PRIVATE_KEY}} --extra-vars redpanda_broker_no_log=false --extra-vars development_build=true --extra-vars segment_upload_interval={{.SEGMENT_UPLOAD_INTERVAL}} --extra-vars cloud_storage_credentials_source={{.CLOUD_STORAGE_CREDENTIALS_SOURCE}}

.tasks/connect.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ tasks:
4343
ENABLE_CONNECT: "true"
4444
deps:
4545
- :ansible:prereqs
46+
- :ensure-logs-dir
4647
cmds:
47-
- mkdir -p {{.ARTIFACT_DIR}}/logs
4848
- ansible-playbook ansible/deploy-connect.yml --private-key {{.PRIVATE_KEY}} --inventory {{.ANSIBLE_INVENTORY}} --extra-vars is_using_unstable={{.IS_USING_UNSTABLE}}
4949

5050
provision:tls:
@@ -53,8 +53,8 @@ tasks:
5353
ENABLE_CONNECT: "true"
5454
deps:
5555
- :ansible:prereqs
56+
- :ensure-logs-dir
5657
cmds:
57-
- mkdir -p {{.ARTIFACT_DIR}}/logs
5858
- ansible-playbook ansible/deploy-connect-tls.yml --private-key {{.PRIVATE_KEY}} --inventory {{.ANSIBLE_INVENTORY}} --extra-vars is_using_unstable={{.IS_USING_UNSTABLE}}
5959

6060
extra:copy-rpm:

.tasks/infrastructure.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,9 @@ tasks:
133133
# Extra AWS cluster for mirroring/testing
134134
extra:aws:copy:
135135
desc: Copy AWS terraform files for secondary cluster
136+
deps:
137+
- :ensure-aws-extra-dir
136138
cmds:
137-
- mkdir -p aws-extra
138139
- find aws -maxdepth 1 -name "*.tf" -exec cp {} aws-extra/ \;
139140
- test -f aws/README.md && cp aws/README.md aws-extra/ || true
140141

.tasks/monitoring.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,63 +5,63 @@ tasks:
55
desc: Deploy monitoring stack (Prometheus/Grafana)
66
deps:
77
- :ansible:prereqs
8+
- :ensure-logs-dir
89
cmds:
9-
- mkdir -p {{.ARTIFACT_DIR}}/logs
1010
- export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES
1111
- ansible-playbook ansible/deploy-monitor.yml --private-key {{.PRIVATE_KEY}} --inventory {{.ANSIBLE_INVENTORY}} --extra-vars is_using_unstable={{.IS_USING_UNSTABLE}}
1212

1313
deploy:tls:
1414
desc: Deploy monitoring stack with TLS
1515
deps:
1616
- :ansible:prereqs
17+
- :ensure-logs-dir
1718
cmds:
18-
- mkdir -p {{.ARTIFACT_DIR}}/logs
1919
- ansible-playbook ansible/deploy-monitor-tls.yml --private-key {{.PRIVATE_KEY}} --inventory {{.ANSIBLE_INVENTORY}} --extra-vars is_using_unstable={{.IS_USING_UNSTABLE}}
2020

2121
extra:deploy:
2222
desc: Deploy monitoring on secondary cluster
2323
deps:
2424
- :ansible:prereqs
25+
- :ensure-logs-dir
2526
cmds:
26-
- mkdir -p {{.ARTIFACT_DIR}}/logs
2727
- ansible-playbook ansible/deploy-monitor.yml --private-key {{.PRIVATE_KEY}} --inventory {{.EXTRA_INVENTORY}} --extra-vars is_using_unstable={{.IS_USING_UNSTABLE}}
2828

2929
extra:deploy:tls:
3030
desc: Deploy monitoring with TLS on secondary cluster
3131
deps:
3232
- :ansible:prereqs
33+
- :ensure-logs-dir
3334
cmds:
34-
- mkdir -p {{.ARTIFACT_DIR}}/logs
3535
- ansible-playbook ansible/deploy-monitor-tls.yml --private-key {{.PRIVATE_KEY}} --inventory {{.EXTRA_INVENTORY}} --extra-vars is_using_unstable={{.IS_USING_UNSTABLE}}
3636

3737
console:deploy:
3838
desc: Deploy Redpanda Console
3939
deps:
4040
- :ansible:prereqs
41+
- :ensure-logs-dir
4142
cmds:
42-
- mkdir -p {{.ARTIFACT_DIR}}/logs
4343
- ansible-playbook ansible/deploy-console.yml --private-key {{.PRIVATE_KEY}} --inventory {{.ANSIBLE_INVENTORY}} --extra-vars is_using_unstable={{.IS_USING_UNSTABLE}}
4444

4545
console:deploy:tls:
4646
desc: Deploy Redpanda Console with TLS
4747
deps:
4848
- :ansible:prereqs
49+
- :ensure-logs-dir
4950
cmds:
50-
- mkdir -p {{.ARTIFACT_DIR}}/logs
5151
- ansible-playbook ansible/deploy-console-tls.yml --private-key {{.PRIVATE_KEY}} --inventory {{.ANSIBLE_INVENTORY}} --extra-vars is_using_unstable={{.IS_USING_UNSTABLE}}
5252

5353
console:extra:deploy:
5454
desc: Deploy Console on secondary cluster
5555
deps:
5656
- :ansible:prereqs
57+
- :ensure-logs-dir
5758
cmds:
58-
- mkdir -p {{.ARTIFACT_DIR}}/logs
5959
- ansible-playbook ansible/deploy-console.yml --private-key {{.PRIVATE_KEY}} --inventory {{.EXTRA_INVENTORY}} --extra-vars is_using_unstable={{.IS_USING_UNSTABLE}}
6060

6161
console:extra:deploy:tls:
6262
desc: Deploy Console with TLS on secondary cluster
6363
deps:
6464
- :ansible:prereqs
65+
- :ensure-logs-dir
6566
cmds:
66-
- mkdir -p {{.ARTIFACT_DIR}}/logs
6767
- ansible-playbook ansible/deploy-console-tls.yml --private-key {{.PRIVATE_KEY}} --inventory {{.EXTRA_INVENTORY}} --extra-vars is_using_unstable={{.IS_USING_UNSTABLE}}

.tasks/operations.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,30 @@ tasks:
55
desc: Configure Redpanda logging
66
deps:
77
- :ansible:prereqs
8+
- :ensure-logs-dir
89
cmds:
9-
- mkdir -p {{.ARTIFACT_DIR}}/logs
1010
- ansible-playbook ansible/operation-configure-logging.yml --private-key {{.PRIVATE_KEY}} --inventory {{.ANSIBLE_INVENTORY}} --extra-vars is_using_unstable={{.IS_USING_UNSTABLE}} --extra-vars redpanda_logging_log_file={{.REDPANDA_LOGGING_LOG_FILE}}
1111

1212
connect:restart:
1313
desc: Perform rolling restart of Redpanda Connect cluster
1414
deps:
1515
- :ansible:prereqs
16+
- :ensure-logs-dir
1617
cmds:
17-
- mkdir -p {{.ARTIFACT_DIR}}/logs
1818
- ansible-playbook ansible/operation-rolling-restart-connect.yml --private-key {{.PRIVATE_KEY}} --inventory {{.ANSIBLE_INVENTORY}}
1919

2020
broker:restart:
2121
desc: Perform rolling restart of Redpanda broker cluster
2222
deps:
2323
- :ansible:prereqs
24+
- :ensure-logs-dir
2425
cmds:
25-
- mkdir -p {{.ARTIFACT_DIR}}/logs
2626
- ansible-playbook ansible/operation-rolling-restart.yml --private-key {{.PRIVATE_KEY}} --inventory {{.ANSIBLE_INVENTORY}}
2727

2828
license:apply:
2929
desc: Apply Redpanda license to the cluster
3030
deps:
3131
- :ansible:prereqs
32+
- :ensure-logs-dir
3233
cmds:
33-
- mkdir -p {{.ARTIFACT_DIR}}/logs
3434
- ansible-playbook ansible/operation-apply-license.yml --private-key {{.PRIVATE_KEY}} --inventory {{.ANSIBLE_INVENTORY}} --extra-vars redpanda_license={{.REDPANDA_LICENSE}}

.tasks/tools.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@ tasks:
1313
1414
rpk:install:
1515
desc: Download and install rpk CLI tool
16+
deps:
17+
- :ensure-tmp-dir
18+
- :ensure-bin-dir
1619
cmds:
17-
- mkdir -p {{.ARTIFACT_DIR}}/tmp
18-
- mkdir -p {{.ARTIFACT_DIR}}/bin
1920
- |
2021
if [ "$(uname)" = "Darwin" ]; then
2122
curl -L {{.MAC_RPK}} -o {{.ARTIFACT_DIR}}/tmp/rpk.zip

Taskfile.yml

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,3 +180,73 @@ tasks:
180180
cmds:
181181
- task --list-all
182182
silent: true
183+
184+
ensure-logs-dir:
185+
desc: Ensure artifacts logs directory exists
186+
cmds:
187+
- mkdir -p {{.ARTIFACT_DIR}}/logs
188+
status:
189+
- test -d {{.ARTIFACT_DIR}}/logs
190+
generates:
191+
- "{{.ARTIFACT_DIR}}/logs"
192+
silent: true
193+
194+
ensure-tmp-dir:
195+
desc: Ensure artifacts tmp directory exists
196+
cmds:
197+
- mkdir -p {{.ARTIFACT_DIR}}/tmp
198+
status:
199+
- test -d {{.ARTIFACT_DIR}}/tmp
200+
generates:
201+
- "{{.ARTIFACT_DIR}}/tmp"
202+
silent: true
203+
204+
ensure-bin-dir:
205+
desc: Ensure artifacts bin directory exists
206+
cmds:
207+
- mkdir -p {{.ARTIFACT_DIR}}/bin
208+
status:
209+
- test -d {{.ARTIFACT_DIR}}/bin
210+
generates:
211+
- "{{.ARTIFACT_DIR}}/bin"
212+
silent: true
213+
214+
ensure-collections-dir:
215+
desc: Ensure ansible collections directory exists
216+
cmds:
217+
- mkdir -p {{.ANSIBLE_COLLECTIONS_PATH}}
218+
status:
219+
- test -d {{.ANSIBLE_COLLECTIONS_PATH}}
220+
generates:
221+
- "{{.ANSIBLE_COLLECTIONS_PATH}}"
222+
silent: true
223+
224+
ensure-roles-dir:
225+
desc: Ensure ansible roles directory exists
226+
cmds:
227+
- mkdir -p {{.ANSIBLE_ROLES_PATH}}
228+
status:
229+
- test -d {{.ANSIBLE_ROLES_PATH}}
230+
generates:
231+
- "{{.ANSIBLE_ROLES_PATH}}"
232+
silent: true
233+
234+
ensure-client-dir:
235+
desc: Ensure TLS client directory exists
236+
cmds:
237+
- mkdir -p {{.CLIENT_DIR}}
238+
status:
239+
- test -d {{.CLIENT_DIR}}
240+
generates:
241+
- "{{.CLIENT_DIR}}"
242+
silent: true
243+
244+
ensure-aws-extra-dir:
245+
desc: Ensure aws-extra directory exists
246+
cmds:
247+
- mkdir -p aws-extra
248+
status:
249+
- test -d aws-extra
250+
generates:
251+
- "aws-extra"
252+
silent: true

0 commit comments

Comments
 (0)