Skip to content

[release-4.12] OCPBUGS-4805: Do not allow empty system reserved values#3453

Merged
openshift-merge-robot merged 1 commit intoopenshift:release-4.12from
openshift-cherrypick-robot:cherry-pick-3439-to-release-4.12
Dec 15, 2022
Merged

[release-4.12] OCPBUGS-4805: Do not allow empty system reserved values#3453
openshift-merge-robot merged 1 commit intoopenshift:release-4.12from
openshift-cherrypick-robot:cherry-pick-3439-to-release-4.12

Conversation

@openshift-cherrypick-robot
Copy link
Copy Markdown

This is an automated cherry-pick of #3439

/assign harche

Signed-off-by: Harshal Patil <harpatil@redhat.com>
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@openshift-cherrypick-robot: Jira Issue OCPBUGS-4101 has been cloned as Jira Issue OCPBUGS-4805. Retitling PR to link against new bug.
/retitle [release-4.12] OCPBUGS-4805: Do not allow empty system reserved values

Details

In response to this:

This is an automated cherry-pick of #3439

/assign harche

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-ci openshift-ci Bot changed the title [release-4.12] OCPBUGS-4101: Do not allow empty system reserved values [release-4.12] OCPBUGS-4805: Do not allow empty system reserved values Dec 13, 2022
@openshift-ci-robot openshift-ci-robot added jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Dec 13, 2022
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-4805, 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.12.0) matches configured target version for branch (4.12.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-4101 is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-4101 targets the "4.13.0" version, which is one of the valid target versions: 4.13.0
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (schoudha@redhat.com), skipping review request.

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

Details

In response to this:

This is an automated cherry-pick of #3439

/assign harche

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-ci-robot openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Dec 13, 2022
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Dec 13, 2022

@openshift-cherrypick-robot: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

Retaining the bugzilla/valid-bug label as it was manually added.

Details

In response to this:

[release-4.12] OCPBUGS-4805: Do not allow empty system reserved values

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.

Copy link
Copy Markdown
Contributor

@yuqi-zhang yuqi-zhang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/label backport-risk-assessed

Clean cherry-pick, should carry no risk. Adding a

/hold

in case anyone want to have a last look and/or pre-merge test, since lgtm isn't required for some reason...

@openshift-ci openshift-ci Bot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. labels Dec 13, 2022
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 13, 2022
@rioliu-rh
Copy link
Copy Markdown

/label cherry-pick-approved

@openshift-ci openshift-ci Bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Dec 14, 2022
@rioliu-rh
Copy link
Copy Markdown

apply below machine config with empty value of ephemeral-storage

cat system-reserved-config.yaml
apiVersion: machineconfiguration.openshift.io/v1
kind: KubeletConfig
metadata:
  name: system-reserved-config
spec:
  machineConfigPoolSelector:
    matchLabels:
      pools.operator.machineconfiguration.openshift.io/worker: ""
  kubeletConfig:
    systemReserved:
      cpu: 500m
      memory: 1500Mi
      ephemeral-storage: ""

oc create -f system-reserved-config.yaml
kubeletconfig.machineconfiguration.openshift.io/system-reserved-config created

check kubelet.conf and node-sizing-enabled.env for reserved setting

 oc debug --quiet node/rioliu-1214a-g8bjz-worker-a-68nh4.c.openshift-qe.internal -- chroot /host cat /etc/kubernetes/kubelet.conf | jq .systemReserved
{
  "ephemeral-storage": ""
}

oc debug --quiet node/rioliu-1214a-g8bjz-worker-a-68nh4.c.openshift-qe.internal -- chroot /host cat /etc/node-sizing-enabled.env
NODE_SIZING_ENABLED=false
SYSTEM_RESERVED_MEMORY=1500Mi
SYSTEM_RESERVED_CPU=500m

trigger upgrade

 oc adm upgrade --to-image registry.build05.ci.openshift.org/ci-ln-wlmnz6k/release:latest --force --allow-explicit-upgrade
warning: Using by-tag pull specs is dangerous, and while we still allow it in combination with --force for backward compatibility, it would be much safer to pass a by-digest pull spec instead
warning: The requested upgrade image is not one of the available updates.You have used --allow-explicit-upgrade for the update to proceed anyway
warning: --force overrides cluster verification of your supplied release image and waives any update precondition failures.
Requesting update to release image registry.build05.ci.openshift.org/ci-ln-wlmnz6k/release:latest

upgrade is completed successfully

cv -o yaml | yq -y '.items[].status.history'
- completionTime: '2022-12-14T11:06:35Z'
  image: registry.build05.ci.openshift.org/ci-ln-wlmnz6k/release:latest
  startedTime: '2022-12-14T10:02:10Z'
  state: Completed
  verified: false
  version: 4.12.0-0.ci.test-2022-12-14-083054-ci-ln-wlmnz6k-latest
- completionTime: '2022-12-14T09:25:41Z'
  image: quay.io/openshift-release-dev/ocp-release@sha256:01c9ef7f802f0ba254847c22e960cd6453ed9f61d9296fdda8bd497712f53e23
  startedTime: '2022-12-14T09:04:38Z'
  state: Completed
  verified: false
  version: 4.11.16

check node-sizing-enabled.env on worker node to make sure SYSTEM_RESERVED_ES has default value

oc debug --quiet node/rioliu-1214a-g8bjz-worker-a-68nh4.c.openshift-qe.internal -- chroot /host cat /etc/node-sizing-enabled.env
NODE_SIZING_ENABLED=false
SYSTEM_RESERVED_MEMORY=1500Mi
SYSTEM_RESERVED_CPU=500m
SYSTEM_RESERVED_ES=1Gi

/label qe-approved
/unhold

@openshift-ci openshift-ci Bot added qe-approved Signifies that QE has signed off on this PR and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Dec 14, 2022
@yuqi-zhang
Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Dec 15, 2022
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Dec 15, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: openshift-cherrypick-robot, 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:

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

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Dec 15, 2022

@openshift-cherrypick-robot: 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-merge-robot openshift-merge-robot merged commit 2f02dcc into openshift:release-4.12 Dec 15, 2022
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@openshift-cherrypick-robot: All pull requests linked via external trackers have merged:

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

Details

In response to this:

This is an automated cherry-pick of #3439

/assign harche

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.

@harche
Copy link
Copy Markdown
Contributor

harche commented Dec 15, 2022

/cherry-pick release-4.11

@openshift-cherrypick-robot
Copy link
Copy Markdown
Author

@harche: new pull request created: #3459

Details

In response to this:

/cherry-pick release-4.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/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. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged. qe-approved Signifies that QE has signed off on this PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.