From bbf4412ff3e495abe2326ca56d67aab71db800d9 Mon Sep 17 00:00:00 2001 From: Ryan Richard Date: Thu, 5 Oct 2023 15:17:36 -0700 Subject: [PATCH] tolerate arm64 in tools deployments and jobs --- test/deploy/tools/cert-issuer.yaml | 11 ++++++++++- test/deploy/tools/dex.yaml | 11 ++++++++++- test/deploy/tools/ldap.yaml | 9 +++++++++ test/deploy/tools/proxy.yaml | 9 +++++++++ 4 files changed, 38 insertions(+), 2 deletions(-) diff --git a/test/deploy/tools/cert-issuer.yaml b/test/deploy/tools/cert-issuer.yaml index 120da099..b777e64a 100644 --- a/test/deploy/tools/cert-issuer.yaml +++ b/test/deploy/tools/cert-issuer.yaml @@ -1,4 +1,4 @@ -#! Copyright 2020-2021 the Pinniped contributors. All Rights Reserved. +#! Copyright 2020-2023 the Pinniped contributors. All Rights Reserved. #! SPDX-License-Identifier: Apache-2.0 #@ load("@ytt:data", "data") @@ -126,3 +126,12 @@ spec: - name: certs emptyDir: {} restartPolicy: Never + tolerations: + - key: kubernetes.io/arch + effect: NoSchedule + operator: Equal + value: amd64 #! Allow running on amd64 nodes. + - key: kubernetes.io/arch + effect: NoSchedule + operator: Equal + value: arm64 #! Also allow running on arm64 nodes. diff --git a/test/deploy/tools/dex.yaml b/test/deploy/tools/dex.yaml index ceb7543d..06c266de 100644 --- a/test/deploy/tools/dex.yaml +++ b/test/deploy/tools/dex.yaml @@ -1,4 +1,4 @@ -#! Copyright 2020-2022 the Pinniped contributors. All Rights Reserved. +#! Copyright 2020-2023 the Pinniped contributors. All Rights Reserved. #! SPDX-License-Identifier: Apache-2.0 #@ load("@ytt:data", "data") @@ -94,6 +94,15 @@ spec: - name: certs secret: secretName: certs + tolerations: + - key: kubernetes.io/arch + effect: NoSchedule + operator: Equal + value: amd64 #! Allow running on amd64 nodes. + - key: kubernetes.io/arch + effect: NoSchedule + operator: Equal + value: arm64 #! Also allow running on arm64 nodes. --- apiVersion: v1 kind: Service diff --git a/test/deploy/tools/ldap.yaml b/test/deploy/tools/ldap.yaml index 38a6042d..b1720a94 100644 --- a/test/deploy/tools/ldap.yaml +++ b/test/deploy/tools/ldap.yaml @@ -277,6 +277,15 @@ spec: - name: additional-schema secret: secretName: ldap-server-additional-schema-ldif-files + tolerations: + - key: kubernetes.io/arch + effect: NoSchedule + operator: Equal + value: amd64 #! Allow running on amd64 nodes. + - key: kubernetes.io/arch + effect: NoSchedule + operator: Equal + value: arm64 #! Also allow running on arm64 nodes. --- apiVersion: v1 kind: Service diff --git a/test/deploy/tools/proxy.yaml b/test/deploy/tools/proxy.yaml index 05617394..c7ea0a20 100644 --- a/test/deploy/tools/proxy.yaml +++ b/test/deploy/tools/proxy.yaml @@ -51,6 +51,15 @@ spec: volumeMounts: - name: log-dir mountPath: "/var/log/squid/" + tolerations: + - key: kubernetes.io/arch + effect: NoSchedule + operator: Equal + value: amd64 #! Allow running on amd64 nodes. + - key: kubernetes.io/arch + effect: NoSchedule + operator: Equal + value: arm64 #! Also allow running on arm64 nodes. --- apiVersion: v1 kind: Service