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: Extend image tests. #12025

Merged
merged 1 commit into from
Sep 28, 2024
Merged

Chart: Extend image tests. #12025

merged 1 commit into from
Sep 28, 2024

Conversation

Gacko
Copy link
Member

@Gacko Gacko commented Sep 28, 2024

What this PR does / why we need it:

This PR extends the existing chart unit tests around images.

/triage accepted
/kind cleanup
/priority backlog
/cc @strongjz @rikatz @tao12345666333 @cpanato

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

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 triage/accepted Indicates an issue or PR is ready to be actively worked on. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. priority/backlog Higher priority than priority/awaiting-more-evidence. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. area/helm Issues or PRs related to helm charts labels Sep 28, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Gacko

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 added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 28, 2024
@Gacko
Copy link
Member Author

Gacko commented Sep 28, 2024

/cherry-pick release-1.11

@k8s-infra-cherrypick-robot
Copy link
Contributor

@Gacko: once the present PR merges, I will cherry-pick it on top of release-1.11 in a new PR and assign it to you.

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.

@Gacko
Copy link
Member Author

Gacko commented Sep 28, 2024

/cherry-pick release-1.10

@k8s-infra-cherrypick-robot
Copy link
Contributor

@Gacko: once the present PR merges, I will cherry-pick it on top of release-1.10 in a new PR and assign it to you.

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-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Sep 28, 2024
Copy link

netlify bot commented Sep 28, 2024

Deploy Preview for kubernetes-ingress-nginx canceled.

Name Link
🔨 Latest commit 65eb579
🔍 Latest deploy log https://app.netlify.com/sites/kubernetes-ingress-nginx/deploys/66f7e1eba323620008018028

@Gacko Gacko merged commit 24a9f97 into kubernetes:main Sep 28, 2024
12 of 13 checks passed
@Gacko Gacko deleted the ujkvn branch September 28, 2024 11:03
@k8s-infra-cherrypick-robot
Copy link
Contributor

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

Applying: Chart: Extend image tests.
Using index info to reconstruct a base tree...
M	charts/ingress-nginx/tests/controller-daemonset_test.yaml
M	charts/ingress-nginx/tests/controller-deployment_test.yaml
M	charts/ingress-nginx/tests/default-backend-deployment_test.yaml
Falling back to patching base and 3-way merge...
Auto-merging charts/ingress-nginx/tests/default-backend-deployment_test.yaml
CONFLICT (content): Merge conflict in charts/ingress-nginx/tests/default-backend-deployment_test.yaml
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
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: Extend image tests.
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.

@k8s-infra-cherrypick-robot
Copy link
Contributor

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

Applying: Chart: Extend image tests.
Using index info to reconstruct a base tree...
M	charts/ingress-nginx/tests/controller-daemonset_test.yaml
M	charts/ingress-nginx/tests/controller-deployment_test.yaml
M	charts/ingress-nginx/tests/default-backend-deployment_test.yaml
Falling back to patching base and 3-way merge...
Auto-merging charts/ingress-nginx/tests/default-backend-deployment_test.yaml
CONFLICT (content): Merge conflict in charts/ingress-nginx/tests/default-backend-deployment_test.yaml
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
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: Extend image tests.
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.

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/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. 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.

3 participants