-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
wip: reapply tigera operator workaround
- Loading branch information
1 parent
0ea99fb
commit 93997df
Showing
2 changed files
with
31 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
From d358aa98f1c82171af5afe815909a6d8ade0168a Mon Sep 17 00:00:00 2001 | ||
From: Lucian Petrut <[email protected]> | ||
Date: Thu, 12 Sep 2024 13:58:24 +0000 | ||
Subject: [PATCH] quick hack: disable image set check | ||
|
||
Calico currently checks if the image set that it received matches | ||
the upstream images, which prevents us from using custom images. | ||
|
||
This quick hack will just ignore unknown images. However, we should | ||
use the Installation spec to parse the images, just like GetReference | ||
does. | ||
--- | ||
pkg/controller/utils/imageset/imageset.go | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/pkg/controller/utils/imageset/imageset.go b/pkg/controller/utils/imageset/imageset.go | ||
index a825ddb9..b21aa693 100644 | ||
--- a/pkg/controller/utils/imageset/imageset.go | ||
+++ b/pkg/controller/utils/imageset/imageset.go | ||
@@ -122,7 +122,7 @@ func ValidateImageSet(is *operator.ImageSet) error { | ||
} | ||
} | ||
|
||
- if len(unknownImages) == 0 && len(invalidDigests) == 0 { | ||
+ if len(invalidDigests) == 0 { | ||
return nil | ||
} | ||
|
||
-- | ||
2.43.0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters