change nodeAffinity to And

[jiuker]

change nodeAffinity to And
merge nodeAffinity
related #1635

How to test this PR:

1. Build the image:

make build

As a result get the image:

=> => naming to docker.io/minio/operator:v5.0.5-11-g68ac4605

2. Upload the image to your testing cluster:

kind load docker-image docker.io/minio/operator:v5.0.5-11-g68ac4605 

3. Change the image in the Deployment of Operator.

4. Create tenant:

5. Expected result is:

 pools:
  - affinity:
      nodeAffinity:
        requiredDuringSchedulingIgnoredDuringExecution:
          nodeSelectorTerms:
          - matchExpressions:
            - key: kubernetes.io/hostname
              operator: In
              values:
              - node2
              - node3
              - node4
              - node5

[cniackz]

I might be wrong, but when testing I still see unexpected output in the YAML:

  pools:
  - affinity:
      nodeAffinity:
        requiredDuringSchedulingIgnoredDuringExecution:
          nodeSelectorTerms:
          - matchExpressions:
            - key: kubernetes.io/hostname
              operator: In
              values:
              - kind-worker
            - key: kubernetes.io/hostname
              operator: In
              values:
              - kind-worker2
            - key: kubernetes.io/hostname
              operator: In
              values:
              - kind-worker3
            - key: kubernetes.io/hostname
              operator: In
              values:
              - kind-worker4

need to retest

[cniackz]

Aha, I was missing to change the image in the console deployment, yes this works:

  pools:
  - affinity:
      nodeAffinity:
        requiredDuringSchedulingIgnoredDuringExecution:
          nodeSelectorTerms:
          - matchExpressions:
            - key: kubernetes.io/hostname
              operator: In
              values:
              - kind-worker
              - kind-worker2
              - kind-worker3
              - kind-worker4

[cniackz]

LGTM, it works!