Merge pull request #23 from clyang82/affinity

Overwrite affinity for deployment and statefulset
stolostron · Nov 4, 2020 · acb908d · acb908d
2 parents a163410 + d2c0899
commit acb908d
Show file tree

Hide file tree

Showing 4 changed files with 366 additions and 6 deletions.
diff --git a/api/v1alpha1/observatorium_types.go b/api/v1alpha1/observatorium_types.go
@@ -48,6 +48,9 @@ type ObservatoriumSpec struct {
 	// NodeSelector causes all components to be scheduled on nodes with matching labels.
 	// +optional
 	NodeSelector map[string]string `json:"nodeSelector,omitempty"`
+	// Affinity causes all components to be scheduled on nodes with matching rules.
+	// +optional
+	Affinity *v1.Affinity `json:"affinity,omitempty"`
 }
 
 type ObjectStorageConfig struct {

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/jsonnet/obs-operator.jsonnet b/jsonnet/obs-operator.jsonnet
@@ -61,12 +61,22 @@ local patchObs = obs {
         uid: config.uid,
       }],
     },
-    spec+: if (std.objectHas(obs.config, 'nodeSelector') && (v.kind == 'StatefulSet' || v.kind == 'Deployment')) then {
-      template+: {
-        spec+:{
-          nodeSelector: obs.config.nodeSelector,
+    spec+: (
+      if (std.objectHas(obs.config, 'nodeSelector') && (v.kind == 'StatefulSet' || v.kind == 'Deployment')) then {
+        template+: {
+          spec+:{
+            nodeSelector: obs.config.nodeSelector,
+          },
         },
-      },
-    } else {},
+      } else {}
+    ) + (
+      if (std.objectHas(obs.config, 'affinity') && (v.kind == 'StatefulSet' || v.kind == 'Deployment')) then {
+        template+: {
+          spec+:{
+            affinity: obs.config.affinity,
+          },
+        },
+      } else {}
+    ),
   }, patchObs.manifests),
 }