Skip to content

Commit dfc135f

Browse files
aimichelletmshort
authored andcommitted
Add linux node selector to bundleUnpacker job (#2685)
* add node selector Signed-off-by: Michelle Nguyen <[email protected]> * fix tests Signed-off-by: Michelle Nguyen <[email protected]> --------- Signed-off-by: Michelle Nguyen <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: c24d256098a460d28d05f2a5f58224bb88b4a070
1 parent 84bfea2 commit dfc135f

File tree

4 files changed

+26
-2
lines changed

4 files changed

+26
-2
lines changed

pkg/manifests/csv.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
name: packageserver
66
namespace: openshift-operator-lifecycle-manager
77
labels:
8-
olm.version: 0.0.0-217690510e70ed60e8837fafd2dcc5d700e40f2a
8+
olm.version: 0.0.0-51a041d76ccf8931d739b857cc6af67ab41662f5
99
olm.clusteroperator.name: operator-lifecycle-manager-packageserver
1010
annotations:
1111
include.release.openshift.io/self-managed-high-availability: "true"
@@ -159,7 +159,7 @@ spec:
159159
- packageserver
160160
topologyKey: "kubernetes.io/hostname"
161161
maturity: alpha
162-
version: 0.0.0-217690510e70ed60e8837fafd2dcc5d700e40f2a
162+
version: 0.0.0-51a041d76ccf8931d739b857cc6af67ab41662f5
163163
apiservicedefinitions:
164164
owned:
165165
- group: packages.operators.coreos.com

staging/operator-lifecycle-manager/pkg/controller/bundle/bundle_unpacker.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,9 @@ func (c *ConfigMapUnpacker) job(cmRef *corev1.ObjectReference, bundlePath string
211211
},
212212
},
213213
},
214+
NodeSelector: map[string]string{
215+
"kubernetes.io/os": "linux",
216+
},
214217
},
215218
},
216219
},

staging/operator-lifecycle-manager/pkg/controller/bundle/bundle_unpacker_test.go

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,9 @@ func TestConfigMapUnpacker(t *testing.T) {
329329
},
330330
},
331331
},
332+
NodeSelector: map[string]string{
333+
"kubernetes.io/os": "linux",
334+
},
332335
},
333336
},
334337
},
@@ -531,6 +534,9 @@ func TestConfigMapUnpacker(t *testing.T) {
531534
},
532535
},
533536
},
537+
NodeSelector: map[string]string{
538+
"kubernetes.io/os": "linux",
539+
},
534540
},
535541
},
536542
},
@@ -774,6 +780,9 @@ func TestConfigMapUnpacker(t *testing.T) {
774780
},
775781
},
776782
},
783+
NodeSelector: map[string]string{
784+
"kubernetes.io/os": "linux",
785+
},
777786
},
778787
},
779788
},
@@ -1011,6 +1020,9 @@ func TestConfigMapUnpacker(t *testing.T) {
10111020
},
10121021
},
10131022
},
1023+
NodeSelector: map[string]string{
1024+
"kubernetes.io/os": "linux",
1025+
},
10141026
},
10151027
},
10161028
},
@@ -1218,6 +1230,9 @@ func TestConfigMapUnpacker(t *testing.T) {
12181230
},
12191231
},
12201232
},
1233+
NodeSelector: map[string]string{
1234+
"kubernetes.io/os": "linux",
1235+
},
12211236
},
12221237
},
12231238
},
@@ -1436,6 +1451,9 @@ func TestConfigMapUnpacker(t *testing.T) {
14361451
},
14371452
},
14381453
},
1454+
NodeSelector: map[string]string{
1455+
"kubernetes.io/os": "linux",
1456+
},
14391457
},
14401458
},
14411459
},

vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/bundle/bundle_unpacker.go

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)