Merge pull request #22757 from bdunne/node_affinity

Add Node Affinity arch selector based on the affinity of the orchestrator

(cherry picked from commit 90989d7)

Author: Fryguy

lib/container_orchestrator.rb

@@ -95,6 +95,14 @@ def my_pod
     get_pod_by_namespace_and_hostname(my_namespace, ENV["HOSTNAME"])
   end
 
+  def my_node_affinity_arch_values
+    ContainerOrchestrator.new.my_pod.spec.affinity&.nodeAffinity&.requiredDuringSchedulingIgnoredDuringExecution&.nodeSelectorTerms&.each do |i|
+      i.matchExpressions&.each { |a| return(a.values) if a.key == "kubernetes.io/arch" }
+    end
+
+    return ["amd64"]
+  end
+
   private
 
   def default_get_options

lib/container_orchestrator/object_definition.rb

@@ -15,6 +15,17 @@ def deployment_definition(name)
           :template => {
             :metadata => {:name => name, :labels => common_labels.merge(:name => name)},
             :spec     => {
+              :affinity => {
+                :nodeAffinity => {
+                  :requiredDuringSchedulingIgnoredDuringExecution => {
+                    :nodeSelectorTerms => [{
+                      :matchExpressions => [
+                        {:key => "kubernetes.io/arch", :operator => "In", :values => ContainerOrchestrator.new.my_node_affinity_arch_values}
+                      ]}
+                    ]
+                  }
+                }
+              },
               :serviceAccountName => ENV["WORKER_SERVICE_ACCOUNT"],
               :containers         => [{
                 :name            => name,

spec/lib/container_orchestrator_spec.rb

@@ -127,6 +127,12 @@
   end
 
   context "#deployment_definition (private)" do
+    let(:container_orchestrator) { ContainerOrchestrator.new }
+    before do
+      allow(ContainerOrchestrator).to receive(:new).and_return(container_orchestrator)
+      expect(container_orchestrator).to receive(:my_node_affinity_arch_values).and_return(["amd64", "arm64"])
+    end
+
     it "skips the database root certificate if the orchestrator doesn't have it" do
       expect(File).to receive(:file?).with("/.postgresql/root.crt").and_return(false)
       allow(File).to receive(:file?).and_call_original # allow other calls to .file? to still work
@@ -181,6 +187,16 @@
         }
       })
     end
+
+    it "includes node affinities" do
+      deployment_definition = subject.send(:deployment_definition, "test")
+
+      expect(deployment_definition.fetch_path(:spec, :template, :spec, :affinity, :nodeAffinity, :requiredDuringSchedulingIgnoredDuringExecution, :nodeSelectorTerms, 0, :matchExpressions, 0)).to include({
+        :key => "kubernetes.io/arch",
+        :operator => "In",
+        :values => ["amd64", "arm64"],
+      })
+    end
   end
 
   context "with stub connections" do
@@ -202,6 +218,12 @@
     end
 
     describe "#create_deployment" do
+      let(:container_orchestrator) { ContainerOrchestrator.new }
+      before do
+        allow(ContainerOrchestrator).to receive(:new).and_return(container_orchestrator)
+        expect(container_orchestrator).to receive(:my_node_affinity_arch_values).and_return(["amd64", "arm64"])
+      end
+
       it "creates a deployment with the given name and edits" do
         expect(apps_connection_stub).to receive(:create_deployment) do |definition|
           expect(definition[:metadata][:name]).to eq("test")

spec/models/miq_worker/container_common_spec.rb

@@ -46,9 +46,10 @@ def deployment_name_for(name)
 
     it "MiqUiWorker adds the ui_httpd_configs volume mount" do
       container_orchestrator = ContainerOrchestrator.new
+      expect(container_orchestrator).to receive(:my_node_affinity_arch_values).and_return(["amd64", "arm64"])
       kubeclient = double("Kubeclient::Client")
 
-      expect(ContainerOrchestrator).to receive(:new).and_return(container_orchestrator)
+      allow(ContainerOrchestrator).to receive(:new).and_return(container_orchestrator)
       expect(container_orchestrator).to receive(:my_namespace).and_return("my-namespace")
       expect(container_orchestrator).to receive(:raw_connect).and_return(kubeclient)
 
@@ -64,9 +65,10 @@ def deployment_name_for(name)
 
     it "Service workers use httpGet liveness and readiness probes" do
       container_orchestrator = ContainerOrchestrator.new
+      expect(container_orchestrator).to receive(:my_node_affinity_arch_values).and_return(["amd64", "arm64"])
       kubeclient = double("Kubeclient::Client")
 
-      expect(ContainerOrchestrator).to receive(:new).and_return(container_orchestrator)
+      allow(ContainerOrchestrator).to receive(:new).and_return(container_orchestrator)
       expect(container_orchestrator).to receive(:my_namespace).and_return("my-namespace")
       expect(container_orchestrator).to receive(:raw_connect).and_return(kubeclient)