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

Chart: Remove isControllerTagValid. #11710

Merged
merged 1 commit into from
Aug 1, 2024
Merged

Chart: Remove isControllerTagValid. #11710

merged 1 commit into from
Aug 1, 2024

Conversation

Gacko
Copy link
Member

@Gacko Gacko commented Jul 31, 2024

What this PR does / why we need it:

This PR removes the isControllerTagValid template from the chart. According to its description, it should prevent users from installing old controller image versions, but this would require us to bump it with releases. Since nobody cared about it for a long time, I'd rather remove it and give users the possibility to define whatever image they want - even non-semver compliant ones.

Keep in mind: With the current implementation you could easily use v0.28.0 without that template complaining. I don't think this is adding any value and only takes users the possibility of using custom tags.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • CVE Report (Scanner found CVE and adding report)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Documentation only

Which issue/s this PR fixes

Fixes #11708.

Checklist:

  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I've read the CONTRIBUTION guide
  • I have added unit and/or e2e tests to cover my changes.
  • All new and existing tests passed.

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-priority labels Jul 31, 2024
@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jul 31, 2024
Copy link

netlify bot commented Jul 31, 2024

Deploy Preview for kubernetes-ingress-nginx canceled.

Name Link
🔨 Latest commit 54575a0
🔍 Latest deploy log https://app.netlify.com/sites/kubernetes-ingress-nginx/deploys/66aa5485961cb800084c8305

@k8s-ci-robot k8s-ci-robot added the area/helm Issues or PRs related to helm charts label Jul 31, 2024
@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 31, 2024
@Gacko
Copy link
Member Author

Gacko commented Jul 31, 2024

/triage accepted
/kind bug
/priority backlog
/cc @strongjz @rikatz @cpanato @tamalsaha

@k8s-ci-robot k8s-ci-robot requested review from cpanato and strongjz July 31, 2024 15:14
@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. kind/bug Categorizes issue or PR as related to a bug. priority/backlog Higher priority than priority/awaiting-more-evidence. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-priority labels Jul 31, 2024
@k8s-ci-robot k8s-ci-robot requested review from rikatz and tamalsaha July 31, 2024 15:18
@ubergesundheit
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 1, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Gacko, ubergesundheit

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

@k8s-ci-robot k8s-ci-robot merged commit e972a35 into kubernetes:main Aug 1, 2024
46 checks passed
@Gacko Gacko deleted the wyijv branch August 1, 2024 09:55
@Gacko
Copy link
Member Author

Gacko commented Aug 1, 2024

/cherry-pick release-1.10

@Gacko
Copy link
Member Author

Gacko commented Aug 1, 2024

/cherry-pick release-1.11

@k8s-infra-cherrypick-robot
Copy link
Contributor

@Gacko: #11710 failed to apply on top of branch "release-1.10":

Applying: Chart: Remove `isControllerTagValid`.
Using index info to reconstruct a base tree...
M	charts/ingress-nginx/templates/_helpers.tpl
M	charts/ingress-nginx/templates/controller-daemonset.yaml
M	charts/ingress-nginx/templates/controller-deployment.yaml
M	charts/ingress-nginx/tests/controller-daemonset_test.yaml
M	charts/ingress-nginx/tests/controller-deployment_test.yaml
Falling back to patching base and 3-way merge...
Auto-merging charts/ingress-nginx/tests/controller-deployment_test.yaml
CONFLICT (content): Merge conflict in charts/ingress-nginx/tests/controller-deployment_test.yaml
Auto-merging charts/ingress-nginx/tests/controller-daemonset_test.yaml
CONFLICT (content): Merge conflict in charts/ingress-nginx/tests/controller-daemonset_test.yaml
Auto-merging charts/ingress-nginx/templates/controller-deployment.yaml
Auto-merging charts/ingress-nginx/templates/controller-daemonset.yaml
Auto-merging charts/ingress-nginx/templates/_helpers.tpl
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Chart: Remove `isControllerTagValid`.
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.10

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.

@k8s-infra-cherrypick-robot
Copy link
Contributor

@Gacko: #11710 failed to apply on top of branch "release-1.11":

Applying: Chart: Remove `isControllerTagValid`.
Using index info to reconstruct a base tree...
M	charts/ingress-nginx/templates/_helpers.tpl
M	charts/ingress-nginx/tests/controller-daemonset_test.yaml
M	charts/ingress-nginx/tests/controller-deployment_test.yaml
Falling back to patching base and 3-way merge...
Auto-merging charts/ingress-nginx/tests/controller-deployment_test.yaml
CONFLICT (content): Merge conflict in charts/ingress-nginx/tests/controller-deployment_test.yaml
Auto-merging charts/ingress-nginx/tests/controller-daemonset_test.yaml
CONFLICT (content): Merge conflict in charts/ingress-nginx/tests/controller-daemonset_test.yaml
Auto-merging charts/ingress-nginx/templates/_helpers.tpl
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Chart: Remove `isControllerTagValid`.
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.11

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.

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/helm Issues or PRs related to helm charts cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/backlog Higher priority than priority/awaiting-more-evidence. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Remove isControllerTagValid or make it optional
4 participants