From 7e35ce9c06434393872abcb33a2a360bccd27320 Mon Sep 17 00:00:00 2001
From: Tom Morelly <tom-morelly@gmx.de>
Date: Fri, 12 Jan 2024 12:08:05 +0100
Subject: [PATCH] fix(ci): do not run on main

---
 .github/workflows/bootstrap.yml | 13 ++++++++-----
 .github/workflows/mkdocs.yml    |  3 ++-
 .github/workflows/terraform.yml |  3 ---
 .github/workflows/tflint.yml    |  5 +----
 .github/workflows/tfsec.yml     |  4 +---
 docs/troubleshooting.md         | 22 +++++++++++-----------
 6 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml
index abdcc57..43077d6 100644
--- a/.github/workflows/bootstrap.yml
+++ b/.github/workflows/bootstrap.yml
@@ -1,9 +1,6 @@
 name: make bootstrap CI
 
 on:
-  push:
-    branches:
-      - main
   pull_request:
 
 jobs:
@@ -12,6 +9,12 @@ jobs:
 
     steps:
     - uses: hashicorp/setup-terraform@v2
+
     - uses: actions/checkout@v3
-    - name: bootstrap
-      run: make bootstrap
+
+    - uses: nick-fields/retry@v2
+      with:
+        timeout_minutes: 10
+        max_attempts: 3
+        shell: bash
+        command: make bootstrap
diff --git a/.github/workflows/mkdocs.yml b/.github/workflows/mkdocs.yml
index 246a97f..7a43760 100644
--- a/.github/workflows/mkdocs.yml
+++ b/.github/workflows/mkdocs.yml
@@ -3,10 +3,11 @@ name: mkdocs
 on:
   push:
     branches:
-      - master
       - main
+
 permissions:
   contents: write
+
 jobs:
   deploy:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml
index 51a5658..0e8252e 100644
--- a/.github/workflows/terraform.yml
+++ b/.github/workflows/terraform.yml
@@ -1,9 +1,6 @@
 name: Terraform
 
 on:
-  push:
-    branches:
-      - main
   pull_request:
 
 jobs:
diff --git a/.github/workflows/tflint.yml b/.github/workflows/tflint.yml
index da27350..e5d084e 100644
--- a/.github/workflows/tflint.yml
+++ b/.github/workflows/tflint.yml
@@ -1,9 +1,6 @@
 name: tflint
+
 on:
-  push:
-    branches:
-      - main
-      - master
   pull_request:
 
 jobs:
diff --git a/.github/workflows/tfsec.yml b/.github/workflows/tfsec.yml
index 6818d84..83b0cda 100644
--- a/.github/workflows/tfsec.yml
+++ b/.github/workflows/tfsec.yml
@@ -1,8 +1,6 @@
 name: tfsec
+
 on:
-  push:
-    branches:
-      - main
   pull_request:
 
 jobs:
diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md
index bf141f8..e1073cf 100644
--- a/docs/troubleshooting.md
+++ b/docs/troubleshooting.md
@@ -1,20 +1,20 @@
-# Troubleshooting 
+# Troubleshooting
 
 ## `Error: serviceaccounts "sa-validator" already exists` during bootstrap
 ```bash
 $> make bootstrap
 ....
 │ Error: serviceaccounts "sa-validator" already exists
-│ 
+│
 │   with module.vault_k8s[0].kubernetes_service_account.service_account,
 │   on vault-k8s/terraform/main.tf line 5, in resource "kubernetes_service_account" "service_account":
 │    5: resource "kubernetes_service_account" "service_account" {
-│ 
+│
 ╵
 make: *** [Makefile:18: bootstrap] Error 1
 ```
 
-can be solved by running: 
+can be solved by running:
 
 ```bash
 $> terraform import "module.vault_k8s[0].kubernetes_service_account.service_account" default/sa-validator
@@ -26,15 +26,15 @@ $> make bootstrap
 ....
 ╷
 │ Error: clusterrolebindings.rbac.authorization.k8s.io "vault-token-reviewer" already exists
-│ 
+│
 │   with module.vault_k8s[0].kubernetes_cluster_role_binding.role_binding,
 │   on vault-k8s/terraform/main.tf line 33, in resource "kubernetes_cluster_role_binding" "role_binding":
 │   33: resource "kubernetes_cluster_role_binding" "role_binding" {
-│ 
+│
 ╵
 ```
 
-can be solved by running: 
+can be solved by running:
 
 ```bash
 $> terraform import "module.vault_k8s[0].kubernetes_cluster_role_binding.role_binding" vault-token-reviewer
@@ -46,16 +46,16 @@ $> make bootstrap
 ....
 ╷
 │ Error: secrets "sa-validator-token-secret" already exists
-│ 
+│
 │   with module.vault_k8s[0].kubernetes_secret.service_account_secret,
 │   on vault-k8s/terraform/main.tf line 18, in resource "kubernetes_secret" "service_account_secret":
 │   18: resource "kubernetes_secret" "service_account_secret" {
-│ 
+│
 ╵
 ```
 
-can be solved by running: 
+can be solved by running:
 
 ```bash
 $> terraform import "module.vault_k8s[0].kubernetes_secret.service_account_secret" default/sa-validator-token-secret
-```
\ No newline at end of file
+```