Merge pull request #22773 from nasark/messaging_cert_default

Mount messaging cert if root not present (cherry picked from commit 3baa1f3)
ManageIQ · Jan 5, 2024 · 4b3220b · 4b3220b
1 parent 98ee3e7
commit 4b3220b
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/lib/container_orchestrator/object_definition.rb b/lib/container_orchestrator/object_definition.rb
@@ -111,6 +111,25 @@ def deployment_definition(name)
             ],
           }
         }
+      else
+        deployment[:spec][:template][:spec][:containers][0][:volumeMounts] ||= []
+        deployment[:spec][:template][:spec][:containers][0][:volumeMounts] << {
+          :mountPath => "/etc/pki/ca-trust/source/anchors",
+          :name      => "messaging-certificate",
+          :readOnly  => true,
+        }
+
+        deployment[:spec][:template][:spec][:volumes] ||= []
+        deployment[:spec][:template][:spec][:volumes] << {
+          :name   => "messaging-certificate",
+          :secret => {
+            :secretName => "manageiq-cluster-ca-cert",
+            :items      => [
+              :key  => "ca.crt",
+              :path => "ca.crt",
+            ],
+          }
+        }
       end
 
       deployment

diff --git a/spec/lib/container_orchestrator_spec.rb b/spec/lib/container_orchestrator_spec.rb
@@ -139,8 +139,8 @@
 
       deployment_definition = subject.send(:deployment_definition, "test")
 
-      expect(deployment_definition.fetch_path(:spec, :template, :spec, :containers, 0, :volumeMounts).length).to eq(2)
-      expect(deployment_definition.fetch_path(:spec, :template, :spec, :volumes).length).to eq(2)
+      expect(deployment_definition.fetch_path(:spec, :template, :spec, :containers, 0, :volumeMounts).length).to eq(3)
+      expect(deployment_definition.fetch_path(:spec, :template, :spec, :volumes).length).to eq(3)
     end
 
     it "mounts the database root certificate" do