Merge manifests based on clusterProfile and featureSet #1791
Conversation
openshift-ci
bot
added
the
do-not-merge/hold
|
Hello @deads2k! Some important instructions when contributing to openshift/api: |
openshift-ci
bot
added
the
size/XXL
openshift-ci
bot
added
the
approved
openshift-merge-robot
added
the
needs-rebase
deads2k
force-pushed
the
by-gate-05-crd-by-clusterprofile
branch
from
3fbb499
to
825616e
Compare
openshift-merge-robot
removed
the
needs-rebase
|
/hold cancel This is now ready. |
openshift-ci
bot
removed
the
do-not-merge/hold
|
/override ci/prow/e2e-gcp |
|
@deads2k: Overrode contexts on behalf of deads2k: ci/prow/e2e-gcp In response to this:
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/test-infra repository. |
|
@deads2k: all tests passed! Full PR test history. Your PR dashboard. 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/test-infra repository. I understand the commands that are listed here. |
| return true, nil | ||
| } | ||
|
|
||
| func (f *Everything) UseCRD(metadata crdForFeatureSet) (bool, error) { |
There was a problem hiding this comment.
Currently the error return appears unused on all cases of this filter, that I can see in this diff, is this a new interface?
| if outputFilenamePattern := resultingCRD.GetAnnotations()["api.openshift.io/filename-pattern"]; len(outputFilenamePattern) > 0 { | ||
| if !strings.Contains(outputFilenamePattern, "MARKERS") { | ||
| errs = append(errs, fmt.Errorf("crd %q is missing featureset/%q MARKERS from '// +openshift:file-pattern=' %q", crdName, featureSetName, outputFilenamePattern)) |
There was a problem hiding this comment.
Discrepancy in filename-pattern vs file-pattern
| for _, clusterProfile := range exception.ClusterProfilesToInject { | ||
| annotations[clusterProfile] = "true" | ||
| if len(outputFileBaseName) == 0 { | ||
| errs = append(errs, fmt.Errorf("crd %q needs '// +openshift:file-pattern=' %v", crdName, resultingCRD.GetAnnotations())) |
There was a problem hiding this comment.
And here, marker is looking for filename, error is file
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: deads2k, JoelSpeed The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
[ART PR BUILD NOTIFIER] This PR has been included in build ose-cluster-config-api-container-v4.16.0-202403121554.p0.g1d50a97.assembly.stream.el9 for distgit ose-cluster-config-api. |
Adds clusterProfile as a dimension for determining featureset. this is used by hypershift today to manage external OIDC.