Merge pull request #155 from ClubCedille/feature/merge-omni-acl

merge omni acls
ClubCedille · Mar 29, 2024 · d783953 · d783953
2 parents e9d1408 + 4711c6c
commit d783953
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 15 deletions.
diff --git a/.github/workflows/apply-omni.yml b/.github/workflows/apply-omni.yml
@@ -12,7 +12,7 @@ jobs:
                 curl -L -o omnictl https://cedille.omni.siderolabs.io/omnictl/omnictl-linux-amd64
                 chmod +x omnictl
             - run: |
-                for i in omni/*.yaml; do ./omnictl apply -f "$i"; done
+                eval-all '. as $item ireduce ({}; . *+ $item )' omni/*.acl.yaml | ./omnictl apply -f -
               env:
                 OMNI_ENDPOINT: ${{vars.OMNI_ENDPOINT}}
                 OMNI_SERVICE_ACCOUNT_KEY: ${{secrets.OMNI_SERVICE_ACCOUNT_KEY}}
diff --git a/omni/base.acl.yaml b/omni/base.acl.yaml
@@ -0,0 +1,4 @@
+"metadata":
+  "id": "omni-acl"
+  "namespace": "default"
+  "type": "AccessPolicies.omni.sidero.dev"
diff --git a/omni/compilade.acl.yaml b/omni/compilade.acl.yaml
@@ -1,8 +1,3 @@
-# MANAGED BY TERRAFORM; DO NOT MODIFY
-"metadata":
-  "id": "compilade-acl"
-  "namespace": "default"
-  "type": "AccessPolicies.omni.sidero.dev"
 "spec":
   "rules":
   - "clusters":

diff --git a/omni/lamiphil.acl.yaml b/omni/lamiphil.acl.yaml
@@ -1,8 +1,4 @@
 # MANAGED BY TERRAFORM; DO NOT MODIFY
-"metadata":
-  "id": "lamiphil-acl"
-  "namespace": "default"
-  "type": "AccessPolicies.omni.sidero.dev"
 "spec":
   "rules":
   - "clusters":

diff --git a/terraform/modules/user/main.tf b/terraform/modules/user/main.tf
@@ -18,11 +18,6 @@ resource "github_repository_file" "omni_acl" {
   content = join("\n", [
     "# MANAGED BY TERRAFORM; DO NOT MODIFY",
     yamlencode({
-      metadata = {
-          namespace = "default"
-          type = "AccessPolicies.omni.sidero.dev"
-          id = "${var.github_username}-acl"
-      }
       spec = {
           rules = [{
               users = [var.github_email]