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

*: add support for specifying timezone for pod/container #7589

Merged
merged 3 commits into from
Feb 9, 2024

Conversation

sohankunkerkar
Copy link
Member

@sohankunkerkar sohankunkerkar commented Dec 13, 2023

Addresses #7550

What type of PR is this?

/kind feature

What this PR does / why we need it:

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Add support for specifying timezone for pods and containers

@openshift-ci openshift-ci bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels Dec 13, 2023
Copy link
Contributor

openshift-ci bot commented Dec 13, 2023

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@openshift-ci openshift-ci bot added dco-signoff: yes Indicates the PR's author has DCO signed all their commits. kind/feature Categorizes issue or PR as related to a new feature. labels Dec 13, 2023
Copy link

codecov bot commented Dec 13, 2023

Codecov Report

Merging #7589 (a38b9b9) into main (efff37a) will increase coverage by 0.00%.
Report is 6 commits behind head on main.
The diff coverage is 51.42%.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #7589   +/-   ##
=======================================
  Coverage   48.05%   48.05%           
=======================================
  Files         148      148           
  Lines       16339    16374   +35     
=======================================
+ Hits         7851     7868   +17     
- Misses       7532     7546   +14     
- Partials      956      960    +4     

docs/crio.conf.5.md Outdated Show resolved Hide resolved
pkg/config/reload.go Outdated Show resolved Hide resolved
@sohankunkerkar sohankunkerkar marked this pull request as ready for review December 14, 2023 13:49
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 14, 2023
@sohankunkerkar
Copy link
Member Author

/retest

@sohankunkerkar sohankunkerkar force-pushed the add-timezone-support branch 4 times, most recently from d217184 to a82ddfd Compare December 19, 2023 17:49
@sohankunkerkar
Copy link
Member Author

/retest

test/image.bats Outdated Show resolved Hide resolved
@sohankunkerkar
Copy link
Member Author

/retest

@haircommander
Copy link
Member

/approve

LGTM, @cri-o/cri-o-maintainers PTAL

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 19, 2023
pkg/config/config.go Outdated Show resolved Hide resolved
test/image.bats Outdated Show resolved Hide resolved
server/container_create_linux.go Outdated Show resolved Hide resolved
pkg/config/config.go Outdated Show resolved Hide resolved
pkg/config/config.go Outdated Show resolved Hide resolved
internal/oci/oci.go Outdated Show resolved Hide resolved
pkg/config/template.go Outdated Show resolved Hide resolved
docs/crio.8.md Outdated Show resolved Hide resolved
@sohankunkerkar sohankunkerkar force-pushed the add-timezone-support branch 2 times, most recently from 47eb307 to 401c959 Compare February 9, 2024 02:20
Fixes #cri-o#7550

Signed-off-by: Sohan Kunkerkar <sohank2602@gmail.com>
Signed-off-by: Sohan Kunkerkar <sohank2602@gmail.com>
Increase the gocyclo until we refactor the createSandboxContainer
function.

Signed-off-by: Sohan Kunkerkar <sohank2602@gmail.com>
@sohankunkerkar
Copy link
Member Author

/retest

@kwilczynski
Copy link
Member

/retest-required

@kwilczynski
Copy link
Member

/approve
/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 9, 2024
Copy link
Contributor

openshift-ci bot commented Feb 9, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: haircommander, kannon92, kwilczynski, sohankunkerkar

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:
  • OWNERS [haircommander,kwilczynski,sohankunkerkar]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kwilczynski
Copy link
Member

@sohankunkerkar, thank you for working on this! Looks amazing! 🎉

@sohankunkerkar
Copy link
Member Author

/retest

3 similar comments
@sohankunkerkar
Copy link
Member Author

/retest

@sohankunkerkar
Copy link
Member Author

/retest

@sohankunkerkar
Copy link
Member Author

/retest

@openshift-merge-bot openshift-merge-bot bot merged commit b4bd55d into cri-o:main Feb 9, 2024
59 of 64 checks passed
@sohankunkerkar sohankunkerkar deleted the add-timezone-support branch February 9, 2024 20:45
@sohankunkerkar
Copy link
Member Author

/cherry-pick release-1.29

@openshift-cherrypick-robot

@sohankunkerkar: #7589 failed to apply on top of branch "release-1.29":

Applying: *: add support for specifying timezone for pod/container
Using index info to reconstruct a base tree...
M	completions/fish/crio.fish
M	docs/crio.8.md
M	docs/crio.conf.5.md
M	go.mod
M	go.sum
M	internal/criocli/criocli.go
M	internal/oci/oci.go
M	pkg/config/config.go
M	pkg/config/config_test.go
M	pkg/config/template.go
M	server/container_create_linux.go
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Auto-merging server/container_create_linux.go
Auto-merging pkg/config/template.go
Auto-merging pkg/config/config_test.go
Auto-merging pkg/config/config.go
Auto-merging internal/oci/oci.go
CONFLICT (content): Merge conflict in internal/oci/oci.go
Auto-merging internal/criocli/criocli.go
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging docs/crio.conf.5.md
Auto-merging docs/crio.8.md
Auto-merging completions/fish/crio.fish
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 *: add support for specifying timezone for pod/container
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.29

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. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. kind/feature Categorizes issue or PR as related to a new feature. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants