zuul-merger: add missing volume mount for ssh keys

openstack-charmers · Dec 13, 2024 · 8c73c30 · 8c73c30
1 parent b7da4a0
commit 8c73c30
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/infrastructure/main.tf b/infrastructure/main.tf
@@ -1310,8 +1310,9 @@ resource "kubernetes_stateful_set" "zuul_merger" {
             }
             spec {
                 security_context {
-                    run_as_user     = "10001"
-                    run_as_group    = "10001"
+                  run_as_user     = "10001"
+                  run_as_group    = "10001"
+                  fs_group        = "10001"
                 }
                 container {
                     name = "merger"
@@ -1321,6 +1322,11 @@ resource "kubernetes_stateful_set" "zuul_merger" {
                         "-f",
                         "-d"
                     ]
+                    volume_mount {
+                        name = "uosci-id-rsa"
+                        mount_path = "/zuul/.ssh"
+                        read_only = "true"
+                    }
                     volume_mount {
                         name = "zuul-config"
                         mount_path = "/etc/zuul"
@@ -1336,6 +1342,13 @@ resource "kubernetes_stateful_set" "zuul_merger" {
                     }
                 }
                 termination_grace_period_seconds = 3600
+                volume {
+                    name = "uosci-id-rsa"
+                    secret {
+                      secret_name = "uosci-id-rsa"
+                      default_mode = "0600"
+                    }
+                }
                 volume {
                     name = "zuul-var"
                     empty_dir {}