From 21a9adff55f075500d65b0f0d65a75e55e9e68e3 Mon Sep 17 00:00:00 2001 From: pat-s Date: Sat, 11 Jan 2025 12:04:58 +0100 Subject: [PATCH] use nodeSelector to fix CI --- .woodpecker/process-updates-alpine-320-arm64.yaml | 11 +---------- .woodpecker/process-updates-alpine-321-arm64.yaml | 11 +---------- .woodpecker/process-updates-redhat-8-arm64.yaml | 11 +---------- .woodpecker/process-updates-redhat-9-arm64.yaml | 11 +---------- .woodpecker/process-updates-ubuntu-2204-arm64.yaml | 11 +---------- .woodpecker/process-updates-ubuntu-2404-arm64.yaml | 13 ++----------- 6 files changed, 7 insertions(+), 61 deletions(-) diff --git a/.woodpecker/process-updates-alpine-320-arm64.yaml b/.woodpecker/process-updates-alpine-320-arm64.yaml index f815dec..91a69bc 100644 --- a/.woodpecker/process-updates-alpine-320-arm64.yaml +++ b/.woodpecker/process-updates-alpine-320-arm64.yaml @@ -57,17 +57,8 @@ steps: limits: memory: 14Gi cpu: 3000m - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: node.kubernetes.io/instance-type - operator: In - values: - - cax31 - - cax41 nodeSelector: + node.kubernetes.io/instance-type: cax31 kubernetes.io/arch: arm64 tolerations: - key: 'CI' diff --git a/.woodpecker/process-updates-alpine-321-arm64.yaml b/.woodpecker/process-updates-alpine-321-arm64.yaml index 17f8703..de75c08 100644 --- a/.woodpecker/process-updates-alpine-321-arm64.yaml +++ b/.woodpecker/process-updates-alpine-321-arm64.yaml @@ -55,17 +55,8 @@ steps: limits: memory: 14Gi cpu: 3000m - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: node.kubernetes.io/instance-type - operator: In - values: - - cax31 - - cax41 nodeSelector: + node.kubernetes.io/instance-type: cax31 kubernetes.io/arch: arm64 tolerations: - key: 'CI' diff --git a/.woodpecker/process-updates-redhat-8-arm64.yaml b/.woodpecker/process-updates-redhat-8-arm64.yaml index 11c297a..a972071 100644 --- a/.woodpecker/process-updates-redhat-8-arm64.yaml +++ b/.woodpecker/process-updates-redhat-8-arm64.yaml @@ -55,17 +55,8 @@ steps: limits: memory: 14Gi cpu: 3000m - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: node.kubernetes.io/instance-type - operator: In - values: - - cax31 - - cax41 nodeSelector: + node.kubernetes.io/instance-type: cax31 kubernetes.io/arch: arm64 tolerations: - key: 'CI' diff --git a/.woodpecker/process-updates-redhat-9-arm64.yaml b/.woodpecker/process-updates-redhat-9-arm64.yaml index e17f5ad..4f390a4 100644 --- a/.woodpecker/process-updates-redhat-9-arm64.yaml +++ b/.woodpecker/process-updates-redhat-9-arm64.yaml @@ -54,17 +54,8 @@ steps: limits: memory: 14Gi cpu: 3000m - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: node.kubernetes.io/instance-type - operator: In - values: - - cax31 - - cax41 nodeSelector: + node.kubernetes.io/instance-type: cax31 kubernetes.io/arch: arm64 tolerations: - key: 'CI' diff --git a/.woodpecker/process-updates-ubuntu-2204-arm64.yaml b/.woodpecker/process-updates-ubuntu-2204-arm64.yaml index 86aeabf..9484940 100644 --- a/.woodpecker/process-updates-ubuntu-2204-arm64.yaml +++ b/.woodpecker/process-updates-ubuntu-2204-arm64.yaml @@ -54,17 +54,8 @@ steps: limits: memory: 14Gi cpu: 3000m - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: node.kubernetes.io/instance-type - operator: In - values: - - cax31 - - cax41 nodeSelector: + node.kubernetes.io/instance-type: cax31 kubernetes.io/arch: arm64 tolerations: - key: 'CI' diff --git a/.woodpecker/process-updates-ubuntu-2404-arm64.yaml b/.woodpecker/process-updates-ubuntu-2404-arm64.yaml index 83e3893..859a08c 100644 --- a/.woodpecker/process-updates-ubuntu-2404-arm64.yaml +++ b/.woodpecker/process-updates-ubuntu-2404-arm64.yaml @@ -54,18 +54,9 @@ steps: limits: memory: 14Gi cpu: 3000m - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: node.kubernetes.io/instance-type - operator: In - values: - - cax31 - - cax41 nodeSelector: - kubernetes.io/arch: 'arm64' + node.kubernetes.io/instance-type: cax31 + kubernetes.io/arch: arm64 tolerations: - key: 'CI' operator: 'Equal'