Add architecture tolerations to bundleUnpacker job (#2958)

Signed-off-by: James Bartlett <[email protected]>
operator-framework · Jul 14, 2023 · 4564b26 · 4564b26
1 parent f8b1721
commit 4564b26
Show file tree

Hide file tree

Showing 2 changed files with 154 additions and 0 deletions.
diff --git a/pkg/controller/bundle/bundle_unpacker.go b/pkg/controller/bundle/bundle_unpacker.go
@@ -211,6 +211,28 @@ func (c *ConfigMapUnpacker) job(cmRef *corev1.ObjectReference, bundlePath string
  NodeSelector: map[string]string{
  "kubernetes.io/os": "linux",
  },
+ Tolerations: []corev1.Toleration{
+ {
+ Key: "kubernetes.io/arch",
+ Value: "amd64",
+ Operator: "Equal",
+ },
+ {
+ Key: "kubernetes.io/arch",
+ Value: "arm64",
+ Operator: "Equal",
+ },
+ {
+ Key: "kubernetes.io/arch",
+ Value: "ppc64le",
+ Operator: "Equal",
+ },
+ {
+ Key: "kubernetes.io/arch",
+ Value: "s390x",
+ Operator: "Equal",
+ },
+ },
  },
  },
  },

diff --git a/pkg/controller/bundle/bundle_unpacker_test.go b/pkg/controller/bundle/bundle_unpacker_test.go
@@ -337,6 +337,28 @@ func TestConfigMapUnpacker(t *testing.T) {
  NodeSelector: map[string]string{
  "kubernetes.io/os": "linux",
  },
+ Tolerations: []corev1.Toleration{
+ {
+ Key: "kubernetes.io/arch",
+ Value: "amd64",
+ Operator: "Equal",
+ },
+ {
+ Key: "kubernetes.io/arch",
+ Value: "arm64",
+ Operator: "Equal",
+ },
+ {
+ Key: "kubernetes.io/arch",
+ Value: "ppc64le",
+ Operator: "Equal",
+ },
+ {
+ Key: "kubernetes.io/arch",
+ Value: "s390x",
+ Operator: "Equal",
+ },
+ },
  },
  },
  },
@@ -542,6 +564,28 @@ func TestConfigMapUnpacker(t *testing.T) {
  NodeSelector: map[string]string{
  "kubernetes.io/os": "linux",
  },
+ Tolerations: []corev1.Toleration{
+ {
+ Key: "kubernetes.io/arch",
+ Value: "amd64",
+ Operator: "Equal",
+ },
+ {
+ Key: "kubernetes.io/arch",
+ Value: "arm64",
+ Operator: "Equal",
+ },
+ {
+ Key: "kubernetes.io/arch",
+ Value: "ppc64le",
+ Operator: "Equal",
+ },
+ {
+ Key: "kubernetes.io/arch",
+ Value: "s390x",
+ Operator: "Equal",
+ },
+ },
  },
  },
  },
@@ -788,6 +832,28 @@ func TestConfigMapUnpacker(t *testing.T) {
  NodeSelector: map[string]string{
  "kubernetes.io/os": "linux",
  },
+ Tolerations: []corev1.Toleration{
+ {
+ Key: "kubernetes.io/arch",
+ Value: "amd64",
+ Operator: "Equal",
+ },
+ {
+ Key: "kubernetes.io/arch",
+ Value: "arm64",
+ Operator: "Equal",
+ },
+ {
+ Key: "kubernetes.io/arch",
+ Value: "ppc64le",
+ Operator: "Equal",
+ },
+ {
+ Key: "kubernetes.io/arch",
+ Value: "s390x",
+ Operator: "Equal",
+ },
+ },
  },
  },
  },
@@ -1028,6 +1094,28 @@ func TestConfigMapUnpacker(t *testing.T) {
  NodeSelector: map[string]string{
  "kubernetes.io/os": "linux",
  },
+ Tolerations: []corev1.Toleration{
+ {
+ Key: "kubernetes.io/arch",
+ Value: "amd64",
+ Operator: "Equal",
+ },
+ {
+ Key: "kubernetes.io/arch",
+ Value: "arm64",
+ Operator: "Equal",
+ },
+ {
+ Key: "kubernetes.io/arch",
+ Value: "ppc64le",
+ Operator: "Equal",
+ },
+ {
+ Key: "kubernetes.io/arch",
+ Value: "s390x",
+ Operator: "Equal",
+ },
+ },
  },
  },
  },
@@ -1238,6 +1326,28 @@ func TestConfigMapUnpacker(t *testing.T) {
  NodeSelector: map[string]string{
  "kubernetes.io/os": "linux",
  },
+ Tolerations: []corev1.Toleration{
+ {
+ Key: "kubernetes.io/arch",
+ Value: "amd64",
+ Operator: "Equal",
+ },
+ {
+ Key: "kubernetes.io/arch",
+ Value: "arm64",
+ Operator: "Equal",
+ },
+ {
+ Key: "kubernetes.io/arch",
+ Value: "ppc64le",
+ Operator: "Equal",
+ },
+ {
+ Key: "kubernetes.io/arch",
+ Value: "s390x",
+ Operator: "Equal",
+ },
+ },
  },
  },
  },
@@ -1459,6 +1569,28 @@ func TestConfigMapUnpacker(t *testing.T) {
  NodeSelector: map[string]string{
  "kubernetes.io/os": "linux",
  },
+ Tolerations: []corev1.Toleration{
+ {
+ Key: "kubernetes.io/arch",
+ Value: "amd64",
+ Operator: "Equal",
+ },
+ {
+ Key: "kubernetes.io/arch",
+ Value: "arm64",
+ Operator: "Equal",
+ },
+ {
+ Key: "kubernetes.io/arch",
+ Value: "ppc64le",
+ Operator: "Equal",
+ },
+ {
+ Key: "kubernetes.io/arch",
+ Value: "s390x",
+ Operator: "Equal",
+ },
+ },
  },
  },
  },