Add test for nodeAffinity override

.cruft.json

@@ -1,13 +1,13 @@
 {
   "template": "https://github.com/projectsyn/commodore-component-template.git",
-  "commit": "fc8ae18a6798d5b232442630883e5ec9b8636d09",
+  "commit": "1062a6134febddc4e4b5479b41afe4ab0f6face0",
   "checkout": "main",
   "context": {
     "cookiecutter": {
       "name": "openshift4-operators",
       "slug": "openshift4-operators",
       "parameter_key": "openshift4_operators",
-      "test_cases": "openshift-operators-redhat openshift-operators openshift-operators-custom operator-subscription",
+      "test_cases": "openshift-operators-redhat openshift-operators openshift-operators-custom operator-subscription affinity-override",
       "add_lib": "y",
       "add_pp": "n",
       "add_golden": "y",

.github/workflows/release.yaml.rej

@@ -0,0 +1,10 @@
+diff a/.github/workflows/release.yaml b/.github/workflows/release.yaml	(rejected hunks)
+@@ -8,7 +8,7 @@ jobs:
+   build:
+     runs-on: ubuntu-latest
+     steps:
+-      - uses: actions/checkout@v3
++      - uses: actions/checkout@v4
+         with:
+           fetch-depth: "0"
+       - name: Build changelog from PRs with labels

.github/workflows/test.yaml

@@ -17,13 +17,13 @@ jobs:
           - lint_yaml
           - lint_adoc
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Run ${{ matrix.command }}
         run: make ${{ matrix.command }}
   editorconfig:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: snow-actions/[email protected]
         with:
           args: 'check'
@@ -36,11 +36,12 @@ jobs:
           - openshift-operators
           - openshift-operators-custom
           - operator-subscription
+          - affinity-override
     defaults:
       run:
         working-directory: ${{ env.COMPONENT_NAME }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           path: ${{ env.COMPONENT_NAME }}
       - name: Compile component
@@ -54,11 +55,12 @@ jobs:
           - openshift-operators
           - openshift-operators-custom
           - operator-subscription
+          - affinity-override
     defaults:
       run:
         working-directory: ${{ env.COMPONENT_NAME }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           path: ${{ env.COMPONENT_NAME }}
       - name: Golden diff

Makefile.vars.mk

@@ -57,4 +57,4 @@ KUBENT_IMAGE    ?= ghcr.io/doitintl/kube-no-trouble:latest
 KUBENT_DOCKER   ?= $(DOCKER_CMD) $(DOCKER_ARGS) $(root_volume) --entrypoint=/app/kubent $(KUBENT_IMAGE)
 
 instance ?= openshift-operators-redhat
-test_instances = tests/openshift-operators-redhat.yml tests/openshift-operators.yml tests/openshift-operators-custom.yml tests/operator-subscription.yml
+test_instances = tests/openshift-operators-redhat.yml tests/openshift-operators.yml tests/openshift-operators-custom.yml tests/operator-subscription.yml tests/affinity-override.yml

component/main.jsonnet

@@ -50,12 +50,12 @@ local sub =
           affinity: {
             nodeAffinity: {
               requiredDuringSchedulingIgnoredDuringExecution: {
-                nodeSelectorTerms: [{
-                  matchExpressions: [{
+                nodeSelectorTerms: [ {
+                  matchExpressions: [ {
                     key: 'node-role.kubernetes.io/infra',
                     operator: 'Exists',
-                  }],
-                }],
+                  } ],
+                } ],
               },
             },
           },

renovate.json

@@ -4,6 +4,9 @@
     ":gitSignOff",
     ":disableDependencyDashboard"
   ],
+  "ignorePaths": [
+    ".github/**"
+  ],
   "postUpgradeTasks": {
     "commands": [
       "make gen-golden-all"

tests/affinity-override.yml

@@ -0,0 +1,19 @@
+applications:
+  - openshift4-operators as affinity-override
+
+parameters:
+  affinity_override:
+    useCustomNamespace: true
+    subscription:
+      name: foo
+      channel: stable
+      spec:
+        installPlanApproval: Manual
+        config:
+          affinity:
+            nodeAffinity:
+              requiredDuringSchedulingIgnoredDuringExecution:
+                nodeSelectorTerms:
+                  - matchExpressions:
+                      - key: node-role.kubernetes.io/master
+                        operator: Exists

tests/golden/affinity-override/affinity-override/openshift4-operators/affinity-override.yaml

@@ -0,0 +1,42 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  annotations:
+    openshift.io/node-selector: node-role.kubernetes.io/infra=
+  labels:
+    name: affinity-override
+    openshift.io/cluster-monitoring: 'false'
+    openshift.io/user-monitoring: 'false'
+  name: affinity-override
+---
+apiVersion: operators.coreos.com/v1
+kind: OperatorGroup
+metadata:
+  annotations: {}
+  labels:
+    name: affinity-override
+  name: affinity-override
+  namespace: affinity-override
+---
+apiVersion: operators.coreos.com/v1alpha1
+kind: Subscription
+metadata:
+  annotations: {}
+  labels:
+    name: foo
+  name: foo
+  namespace: affinity-override
+spec:
+  channel: stable
+  config:
+    affinity:
+      nodeAffinity:
+        requiredDuringSchedulingIgnoredDuringExecution:
+          nodeSelectorTerms:
+            - matchExpressions:
+                - key: node-role.kubernetes.io/master
+                  operator: Exists
+  installPlanApproval: Manual
+  name: foo
+  source: certified-operators
+  sourceNamespace: openshift-marketplace