[2.11 Manual Backport] Use the actual expiration date rather than a relative time in status

[mprahl]

The conflict was in test/e2e/case1_expiration_test.go.

Backport of:

• Use the actual expiration date rather than a relative time in status #396

[mprahl]

/cherry-pick release-2.10

[openshift-cherrypick-robot]

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

In response to this:

/cherry-pick release-2.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.

[sonarcloud]

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
100.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JustinKuli, mprahl

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 [JustinKuli,mprahl]

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

[openshift-cherrypick-robot]

@mprahl: #397 failed to apply on top of branch "release-2.10":

Applying: Use the actual expiration date rather than a relative time in status
Using index info to reconstruct a base tree...
M	api/v1/certificatepolicy_types.go
M	deploy/crds/kustomize/policy.open-cluster-management.io_certificatepolicies.yaml
M	deploy/crds/policy.open-cluster-management.io_certificatepolicies.yaml
M	test/e2e/case1_expiration_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/case1_expiration_test.go
CONFLICT (content): Merge conflict in test/e2e/case1_expiration_test.go
Auto-merging deploy/crds/policy.open-cluster-management.io_certificatepolicies.yaml
CONFLICT (content): Merge conflict in deploy/crds/policy.open-cluster-management.io_certificatepolicies.yaml
Auto-merging deploy/crds/kustomize/policy.open-cluster-management.io_certificatepolicies.yaml
CONFLICT (content): Merge conflict in deploy/crds/kustomize/policy.open-cluster-management.io_certificatepolicies.yaml
Auto-merging api/v1/certificatepolicy_types.go
CONFLICT (content): Merge conflict in api/v1/certificatepolicy_types.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Use the actual expiration date rather than a relative time in status
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-2.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.