Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: remove yaml merge tag #3654

Merged

Conversation

converge
Copy link
Member

Fixes #

Merge keys are not officially supported in YAML according to its specifications. These keys are associated with an older version of YAML (1.1), which is now considered obsolete. Additionally, these merge keys haven't been updated or included in the current YAML version (1.2), so there's no guarantee that they will function as expected or be supported. In summary, using merge keys in YAML might not work reliably and is not recommended due to these limitations and lack of support in the latest YAML version.

I attempted to install the YAML mentioned using Kustomize, but the installation failed because Kustomize couldn't properly interpret or render the YAML file.

Proposed Changes

  • I suggest that we avoid utilizing merge tags to ensure compliance with YAML specifications, particularly in the latest versions like 1.2.x.

Copy link

knative-prow bot commented Jan 31, 2024

Hi @converge. Thanks for your PR.

I'm waiting for a knative-extensions member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@knative-prow knative-prow bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. area/control-plane labels Jan 31, 2024
Copy link

knative-prow bot commented Jan 31, 2024

Welcome @converge! It looks like this is your first PR to knative-extensions/eventing-kafka-broker 🎉

Copy link

codecov bot commented Feb 1, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (02a879b) 61.99% compared to head (2440de3) 62.19%.
Report is 6 commits behind head on main.

Additional details and impacted files
@@             Coverage Diff              @@
##               main    #3654      +/-   ##
============================================
+ Coverage     61.99%   62.19%   +0.19%     
- Complexity      845      846       +1     
============================================
  Files           188      188              
  Lines         12634    12690      +56     
  Branches        273      273              
============================================
+ Hits           7833     7892      +59     
+ Misses         4187     4185       -2     
+ Partials        614      613       -1     
Flag Coverage Δ
java-unittests 74.49% <ø> (+0.03%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@@ -109,7 +109,13 @@ spec:
- name: k-kubelet-probe
value: "webhook"
livenessProbe:
<<: *probe
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we do use these in eventing core as well

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we do use these in eventing core as well

do you mean custom tag? that's true, only the source is different. in eventing-core, it comes from eventing-core.yaml and the mentioned tag comes from https://github.com/knative-extensions/eventing-kafka-broker/blob/main/control-plane/config/eventing-kafka-broker/200-webhook/500-webhook.yaml#L103

@matzew
Copy link
Contributor

matzew commented Feb 1, 2024

I think at general knative level we use these. Not just here
/cc @dprotaso

@knative-prow knative-prow bot requested a review from dprotaso February 1, 2024 14:27
@dprotaso
Copy link
Contributor

dprotaso commented Feb 1, 2024

We dropped these in serving since we only have one version - so we don't have any usage there

Copy link
Contributor

@matzew matzew left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/ok-to-test

/lgtm
/approve

@knative-prow knative-prow bot added the ok-to-test Indicates a non-member PR verified by an org member that is safe to test. label Feb 2, 2024
@knative-prow knative-prow bot added lgtm Indicates that a PR is ready to be merged. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Feb 2, 2024
Copy link

knative-prow bot commented Feb 2, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: converge, matzew

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@knative-prow knative-prow bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 2, 2024
@matzew
Copy link
Contributor

matzew commented Feb 2, 2024

Thanks for the PR, @converge

@pierDipi
Copy link
Member

pierDipi commented Feb 2, 2024

/test upgrade-tests

@knative-prow knative-prow bot merged commit 6380b7b into knative-extensions:main Feb 2, 2024
33 checks passed
creydr pushed a commit to creydr/knative-eventing-kafka-broker that referenced this pull request Feb 4, 2024
@Cali0707
Copy link
Member

Cali0707 commented Feb 7, 2024

/cherry-pick release-1.13

@knative-prow-robot
Copy link
Contributor

@Cali0707: new pull request created: #3679

In response to this:

/cherry-pick release-1.13

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/control-plane lgtm Indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants