Only configure default node affinity to infra nodes for OCP

appuio · May 15, 2024 · 58679b4 · 58679b4
1 parent ca702ed
commit 58679b4
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/docs/modules/ROOT/pages/references/component-library.adoc b/docs/modules/ROOT/pages/references/component-library.adoc
@@ -36,7 +36,7 @@ This function creates a `subscriptions.operators.coreos.com` resource in a names
 
 The result of this function can be used in the same way as resources created by `kube.libjsonnet`.
 
-By default the components sets the nodeAffinity to infra nodes, this can be overwritten.
+By default, if `facts.distribution` is set to `openshift4`, the component sets the nodeAffinity to infra nodes, this can be overwritten.
 See https://docs.openshift.com/container-platform/latest/nodes/scheduling/nodes-scheduler-node-affinity.html#nodes-scheduler-node-affinity-configuring-required_nodes-scheduler-node-affinity[Official Documentation]
 
 --

diff --git a/lib/openshift4-operators.libsonnet b/lib/openshift4-operators.libsonnet
@@ -15,6 +15,9 @@ local instanceParams(instance) =
 
 local apigroup = 'operators.coreos.com';
 
+local is_ocp =
+  std.get(inv.parameters.facts, 'distribution', '') == 'openshift4';
+
 /**
  * \brief Validate instance
  *
@@ -66,7 +69,7 @@ local subscription(name) =
   kube._Object(apigroup + '/v1alpha1', 'Subscription', name) {
     spec: {
       name: name,
-      config: {
+      [if is_ocp then 'config']: {
         affinity: {
           nodeAffinity: {
             requiredDuringSchedulingIgnoredDuringExecution: {

diff --git a/tests/affinity-override.yml b/tests/affinity-override.yml
@@ -2,6 +2,9 @@ applications:
   - openshift4-operators as affinity-override
 
 parameters:
+  facts:
+    distribution: openshift4
+
   affinity_override:
     useCustomNamespace: true
     subscription:

diff --git a/...erator-subscription/operator-subscription/openshift4-operators/operator-subscription.yaml b/...erator-subscription/operator-subscription/openshift4-operators/operator-subscription.yaml
@@ -28,14 +28,6 @@ metadata:
   namespace: operator-subscription
 spec:
   channel: stable
-  config:
-    affinity:
-      nodeAffinity:
-        requiredDuringSchedulingIgnoredDuringExecution:
-          nodeSelectorTerms:
-            - matchExpressions:
-                - key: node-role.kubernetes.io/infra
-                  operator: Exists
   installPlanApproval: Manual
   name: foo
   source: certified-operators

diff --git a/tests/openshift-operators-redhat.yml b/tests/openshift-operators-redhat.yml
@@ -1 +1,3 @@
-parameters: {}
+parameters:
+  facts:
+    distribution: openshift4