[release-4.14]OCPBUGS-27178: use *resource.Quantity to not automatically set 0

[QiWang19]

Backport API fix openshift/api#1656
- What I did
Change the type of OverlaySize and LogSizeMax resource.Quantity to pointer *resource.Quantity.
the struct type will be set as 0 automatically when retrieving the ctrcfg object.
- How to verify it

# apply the containerruntimeconfig CR
apiVersion: machineconfiguration.openshift.io/v1
kind: ContainerRuntimeConfig
metadata:
 name: pidlimit
spec:
 machineConfigPoolSelector:
   matchLabels:
     pools.operator.machineconfiguration.openshift.io/worker: '' 
 containerRuntimeConfig:
   pidsLimit: 4096 
   logLevel: debug

# current result:
$ oc get containerruntimeconfig  pidlimit -o json | jq '.spec.containerRuntimeConfig'
{
  "logLevel": "debug",
  "logSizeMax": "0",
  "overlaySize": "0",
  "pidsLimit": 4096
}

# after this patch, it will be 
$ oc get containerruntimeconfig  pidlimit -o json | jq '.spec.containerRuntimeConfig'
{
  "logLevel": "debug",
  "pidsLimit": 4096
}

- Description for the changelog

[openshift-ci]

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-robot]

@QiWang19: This pull request references Jira Issue OCPBUGS-27178, which is valid. The bug has been moved to the POST state.

6 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.14.z) matches configured target version for branch (4.14.z)
• bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
• dependent bug Jira Issue OCPBUGS-15934 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
• dependent Jira Issue OCPBUGS-15934 targets the "4.15.0" version, which is one of the valid target versions: 4.15.0
• bug has dependents

Requesting review from QA contact:
/cc @lyman9966

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

- What I did
Change the type of OverlaySize and LogSizeMax resource.Quantity to pointer *resource.Quantity.
the struct type will be set as 0 automatically when retrieving the ctrcfg object.
- How to verify it

# apply the containerruntimeconfig CR
apiVersion: machineconfiguration.openshift.io/v1
kind: ContainerRuntimeConfig
metadata:
name: pidlimit
spec:
machineConfigPoolSelector:
  matchLabels:
    pools.operator.machineconfiguration.openshift.io/worker: '' 
containerRuntimeConfig:
  pidsLimit: 4096 
  logLevel: debug

# current result:
$ oc get containerruntimeconfig  pidlimit -o json | jq '.spec.containerRuntimeConfig'
{
 "logLevel": "debug",
 "logSizeMax": "0",
 "overlaySize": "0",
 "pidsLimit": 4096
}

# after this patch, it will be 
$ oc get containerruntimeconfig  pidlimit -o json | jq '.spec.containerRuntimeConfig'
{
 "logLevel": "debug",
 "pidsLimit": 4096
}

- Description for the changelog

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 openshift-eng/jira-lifecycle-plugin repository.

[QiWang19]

/cherry-pick release-4.13

[openshift-cherrypick-robot]

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

Details

In response to this:

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

[QiWang19]

/retest

[openshift-ci-robot]

@QiWang19: This pull request references Jira Issue OCPBUGS-27178, which is valid.

6 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.14.z) matches configured target version for branch (4.14.z)
• bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
• dependent bug Jira Issue OCPBUGS-15934 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
• dependent Jira Issue OCPBUGS-15934 targets the "4.15.0" version, which is one of the valid target versions: 4.15.0
• bug has dependents

Requesting review from QA contact:
/cc @lyman9966

Details

In response to this:

Backport API fix openshift/api#1656
- What I did
Change the type of OverlaySize and LogSizeMax resource.Quantity to pointer *resource.Quantity.
the struct type will be set as 0 automatically when retrieving the ctrcfg object.
- How to verify it

# apply the containerruntimeconfig CR
apiVersion: machineconfiguration.openshift.io/v1
kind: ContainerRuntimeConfig
metadata:
name: pidlimit
spec:
machineConfigPoolSelector:
  matchLabels:
    pools.operator.machineconfiguration.openshift.io/worker: '' 
containerRuntimeConfig:
  pidsLimit: 4096 
  logLevel: debug

# current result:
$ oc get containerruntimeconfig  pidlimit -o json | jq '.spec.containerRuntimeConfig'
{
 "logLevel": "debug",
 "logSizeMax": "0",
 "overlaySize": "0",
 "pidsLimit": 4096
}

# after this patch, it will be 
$ oc get containerruntimeconfig  pidlimit -o json | jq '.spec.containerRuntimeConfig'
{
 "logLevel": "debug",
 "pidsLimit": 4096
}

- Description for the changelog

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 openshift-eng/jira-lifecycle-plugin repository.

[QiWang19]

@yuqi-zhang @lyman9966 PTAL

[yuqi-zhang]

I guess this is kind of a weird case where we're changing the API in different places based on the version.

I'm fine with this offhand since it should be a safe change anyways. It doesn't map as well from a backport perspective to a singular PR but so long as it's not breaking anything I think we should be good?

[lyman9966]

/label qe-approved

test passed:
$ oc get containerruntimeconfig parameter-testing -o json | jq '.spec.containerRuntimeConfig'
{
"logLevel": "debug",
"pidsLimit": 2049
}

[rphillips]

/lgtm

[rphillips]

/label backport-risk-assessed

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: QiWang19, rphillips, yuqi-zhang

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

• OWNERS [yuqi-zhang]

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

[sunilcio]

/label cherry-pick-approved

[openshift-ci-robot]

/retest-required

Remaining retests: 0 against base HEAD acc2d27 and 2 for PR HEAD d26c41f in total

[openshift-ci]

@QiWang19: all tests passed!

Full PR test history. Your PR dashboard.

Details

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. I understand the commands that are listed here.

[openshift-ci-robot]

@QiWang19: Jira Issue OCPBUGS-27178: All pull requests linked via external trackers have merged:

• openshift/machine-config-operator#4121

Jira Issue OCPBUGS-27178 has been moved to the MODIFIED state.

Details

In response to this:

Backport API fix openshift/api#1656
- What I did
Change the type of OverlaySize and LogSizeMax resource.Quantity to pointer *resource.Quantity.
the struct type will be set as 0 automatically when retrieving the ctrcfg object.
- How to verify it

# apply the containerruntimeconfig CR
apiVersion: machineconfiguration.openshift.io/v1
kind: ContainerRuntimeConfig
metadata:
name: pidlimit
spec:
machineConfigPoolSelector:
  matchLabels:
    pools.operator.machineconfiguration.openshift.io/worker: '' 
containerRuntimeConfig:
  pidsLimit: 4096 
  logLevel: debug

# current result:
$ oc get containerruntimeconfig  pidlimit -o json | jq '.spec.containerRuntimeConfig'
{
 "logLevel": "debug",
 "logSizeMax": "0",
 "overlaySize": "0",
 "pidsLimit": 4096
}

# after this patch, it will be 
$ oc get containerruntimeconfig  pidlimit -o json | jq '.spec.containerRuntimeConfig'
{
 "logLevel": "debug",
 "pidsLimit": 4096
}

- Description for the changelog

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 openshift-eng/jira-lifecycle-plugin repository.

[openshift-cherrypick-robot]

@QiWang19: #4121 failed to apply on top of branch "release-4.13":

Applying: use *resource.Quantity to not automatically set 0
Using index info to reconstruct a base tree...
M	pkg/apis/machineconfiguration.openshift.io/v1/types.go
M	pkg/apis/machineconfiguration.openshift.io/v1/zz_generated.deepcopy.go
M	pkg/controller/container-runtime-config/container_runtime_config_bootstrap.go
M	pkg/controller/container-runtime-config/container_runtime_config_controller.go
M	pkg/controller/container-runtime-config/container_runtime_config_controller_test.go
M	pkg/controller/container-runtime-config/helpers.go
M	pkg/controller/container-runtime-config/helpers_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/controller/container-runtime-config/helpers_test.go
Auto-merging pkg/controller/container-runtime-config/helpers.go
Auto-merging pkg/controller/container-runtime-config/container_runtime_config_controller_test.go
CONFLICT (content): Merge conflict in pkg/controller/container-runtime-config/container_runtime_config_controller_test.go
Auto-merging pkg/controller/container-runtime-config/container_runtime_config_controller.go
Auto-merging pkg/controller/container-runtime-config/container_runtime_config_bootstrap.go
Auto-merging pkg/apis/machineconfiguration.openshift.io/v1/zz_generated.deepcopy.go
Auto-merging pkg/apis/machineconfiguration.openshift.io/v1/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 *resource.Quantity to not automatically set 0
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".

Details

In response to this:

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

[openshift-bot]

[ART PR BUILD NOTIFIER]

This PR has been included in build openshift-proxy-pull-test-container-v4.14.0-202401231409.p0.ga4b8a7c.assembly.stream for distgit openshift-proxy-pull-test.
All builds following this will include this PR.