🌱 Update containers/image to v5.34.1 #1827
Conversation
✅ Deploy Preview for olmv1 ready!
To edit notification comments on pull requests, go to your Netlify site configuration. |
tmshort
force-pushed
the
update-containters
branch
7 times, most recently
from
3fe8072 to
1d6d327
Compare
Makefile
Outdated
| @@ -133,14 +133,15 @@ manifests: $(CONTROLLER_GEN) #EXHELP Generate WebhookConfiguration, ClusterRole, | |||
| mv $(CRD_WORKING_DIR)/olm.operatorframework.io_clustercatalogs.yaml $(KUSTOMIZE_CATD_CRDS_DIR) | |||
| rmdir $(CRD_WORKING_DIR) | |||
| # Generate the remaining operator-controller manifests | |||
| $(CONTROLLER_GEN) rbac:roleName=manager-role paths="./internal/operator-controller/..." output:rbac:artifacts:config=$(KUSTOMIZE_OPCON_RBAC_DIR) | |||
| $(CONTROLLER_GEN) rbac:roleName=manager-role paths="./internal/operator-controller/controllers/..." output:rbac:artifacts:config=$(KUSTOMIZE_OPCON_RBAC_DIR) | |||
There was a problem hiding this comment.
The problematic dep is called in the controller :-(
I thought in extra in a utils and then do something like that
it might works
There was a problem hiding this comment.
That might just be my crazy idea I mentioned earlier
tmshort
force-pushed
the
update-containters
branch
from
f485f89 to
872ec2f
Compare
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #1827 +/- ##
==========================================
+ Coverage 68.39% 68.52% +0.12%
==========================================
Files 63 65 +2
Lines 5136 5138 +2
==========================================
+ Hits 3513 3521 +8
+ Misses 1392 1388 -4
+ Partials 231 229 -2
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
tmshort
force-pushed
the
update-containters
branch
from
872ec2f to
8dcfbc2
Compare
|
Replacement for #1692 |
|
I think we need to be going to the controller-tools repo to get this fixed there. |
Problem is that it doesn't seem to be controller-tools, specifically. It works fine locally, this seems to be a problem with gpgme somehow. |
Could it be working locally because CGO_ENABLED=1? The issue is the build tags don't get passed down to controller-gen when its loading the packages (somewhere around here). I've done local test hard-coding the We need a way to configure controller-gen to pass build tags to the loader =S |
|
@perdasilva To be blunt, this PR does work, because it avoids pulling in gpgme code by isolating the RBAC directives. Admittedly, fixing controler-gen would be great, but how long would that take and when would that happen? |
tmshort
force-pushed
the
update-containters
branch
from
8dcfbc2 to
4569ead
Compare
| @@ -13,8 +13,6 @@ import ( | |||
|
|
|||
| // +kubebuilder:webhook:admissionReviewVersions={v1},failurePolicy=Fail,groups=olm.operatorframework.io,mutating=true,name=inject-metadata-name.olm.operatorframework.io,path=/mutate-olm-operatorframework-io-v1-clustercatalog,resources=clustercatalogs,verbs=create;update,versions=v1,sideEffects=None,timeoutSeconds=10 | |||
|
|
|||
| // +kubebuilder:rbac:groups=olm.operatorframework.io,resources=clustercatalogs,verbs=get;list;watch;patch;update | |||
There was a problem hiding this comment.
That is interesting, we fail to get the RBAC but not to generate the webhook config based on the markers?
There was a problem hiding this comment.
controller-gen also has a limitation that it cannot use multiple directories (as discovered in my earlier merging of the API directories).
So, I pulled all the RBAC into one place.
The webhook generation still looks at this one directory.
tmshort
force-pushed
the
update-containters
branch
from
4569ead to
91c16b3
Compare
However, due to some incompatibility between controller-gen and github.com/proglottis/[email protected], we need to move the kubebuilder comments so controller-gen doesn't try to access gpgme. This meant moving the kubebuilder:rbac comments into their own package, and focusing the webhook generation the just one directory. Signed-off-by: Todd Short <[email protected]>
perdasilva
force-pushed
the
update-containters
branch
from
91c16b3 to
22199fb
Compare
openshift-merge-robot
added
the
needs-rebase
|
PR needs rebase. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. |
However, due to some incompatibility between controller-gen and
github.com/proglottis/[email protected], we need to move the kubebuilder
comments so controller-gen doesn't try to access gpgme.
This meant moving the kubebuilder:rbac comments into their own
package, and focusing the webhook generation the just one directory.
Description
Reviewer Checklist