Skip to content

Conversation

@lbscorpio
Copy link
Contributor

@lbscorpio lbscorpio commented Apr 29, 2021

@vikram-redhat There are two issues on the examples of machineconfig, minimum version that the change applies to should be 4.7 in my opinion, could you arrange someone to review them? Thanks.

  1. post_installation_configuration/machine-configuration-tasks.adoc

    The ignition version should be 3.2.0 for OCP 4.7, except 99-master-ssh and 99-worker-ssh which should be 3.1.0. Provided the real outputs on an OCP 4.7.3 environment as below:

    # date; oc get clusterversions
    Thu Apr 29 11:20:13 CST 2021
    NAME      VERSION   AVAILABLE   PROGRESSING   SINCE   STATUS
    version   4.7.3     True        False         34d     Cluster version is 4.7.3
    # date; oc get mc
    Thu Apr 29 11:20:20 CST 2021
    NAME                                               GENERATEDBYCONTROLLER                      IGNITIONVERSION   AGE
    00-master                                          39de2f3d075d84c945f02d209c02c17b24d5dd71   3.2.0             35d
    00-worker                                          39de2f3d075d84c945f02d209c02c17b24d5dd71   3.2.0             35d
    01-master-container-runtime                        39de2f3d075d84c945f02d209c02c17b24d5dd71   3.2.0             35d
    01-master-kubelet                                  39de2f3d075d84c945f02d209c02c17b24d5dd71   3.2.0             35d
    01-worker-container-runtime                        39de2f3d075d84c945f02d209c02c17b24d5dd71   3.2.0             35d
    01-worker-kubelet                                  39de2f3d075d84c945f02d209c02c17b24d5dd71   3.2.0             35d
    99-master-generated-registries                     39de2f3d075d84c945f02d209c02c17b24d5dd71   3.2.0             35d
    99-master-ssh                                                                                 3.1.0             35d
    99-worker-generated-registries                     39de2f3d075d84c945f02d209c02c17b24d5dd71   3.2.0             35d
    99-worker-ssh                                                                                 3.1.0             35d
    rendered-master-fbe30527ca52a5b3552486c84173b50e   39de2f3d075d84c945f02d209c02c17b24d5dd71   3.2.0             35d
    rendered-worker-09d941014c5651a44a7ddd31564bdd79   39de2f3d075d84c945f02d209c02c17b24d5dd71   3.2.0             35d
    
  2. installing/installing_vmc/modules/installation-disk-partitioning.adoc

@openshift-ci-robot openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Apr 29, 2021
@netlify
Copy link

netlify bot commented Apr 29, 2021

✔️ Deploy Preview for osdocs ready!

🔨 Explore the source changes: 883489e

🔍 Inspect the deploy log: https://app.netlify.com/sites/osdocs/deploys/60dfbe14ab3d940009dfed86

😎 Browse the preview: https://deploy-preview-32038--osdocs.netlify.app

@vikram-redhat
Copy link
Contributor

@ahardin-rh PTAL

@lbscorpio
Copy link
Contributor Author

@ahardin-rh Any update? Thanks.

@openshift-ci openshift-ci bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jun 30, 2021
@lbscorpio
Copy link
Contributor Author

Solved the conflict files and updated other files which have the same issue.

@ahardin-rh Could you have a look at this PR when available? Thanks.

@lbscorpio
Copy link
Contributor Author

@vikram-redhat Could you re-assign someone to review this PR? Because previous assigner not response almost 3 months so far, thanks.

@ahardin-rh ahardin-rh self-assigned this Jul 24, 2021
@ahardin-rh ahardin-rh added this to the Next Release milestone Jul 24, 2021
@ahardin-rh ahardin-rh added branch/enterprise-4.8 peer-review-done Signifies that the peer review team has reviewed this PR labels Jul 24, 2021
@ahardin-rh
Copy link
Contributor

@lbscorpio So sorry for the delay! I have no idea how I missed this. This looks good. Thank you!

@ahardin-rh ahardin-rh merged commit 7afc5a7 into openshift:master Jul 24, 2021
@ahardin-rh
Copy link
Contributor

/cherrypick enterprise-4.7

@ahardin-rh
Copy link
Contributor

/cherrypick enterprise-4.8

@openshift-cherrypick-robot

@ahardin-rh: #32038 failed to apply on top of branch "enterprise-4.7":

Applying: Update ignition spec version on the MachineConfig examples
Using index info to reconstruct a base tree...
M	modules/installation-user-infra-machines-advanced.adoc
A	modules/ipi-install-configure-network-components-to-run-on-the-control-plane.adoc
M	modules/nodes-nodes-kernel-arguments.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/nodes-nodes-kernel-arguments.adoc
CONFLICT (modify/delete): modules/ipi-install-configure-network-components-to-run-on-the-control-plane.adoc deleted in HEAD and modified in Update ignition spec version on the MachineConfig examples. Version Update ignition spec version on the MachineConfig examples of modules/ipi-install-configure-network-components-to-run-on-the-control-plane.adoc left in tree.
Auto-merging modules/installation-user-infra-machines-advanced.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Update ignition spec version on the MachineConfig examples
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:

/cherrypick enterprise-4.7

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

@ahardin-rh: new pull request created: #34823

Details

In response to this:

/cherrypick enterprise-4.8

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

branch/enterprise-4.7 branch/enterprise-4.8 peer-review-done Signifies that the peer review team has reviewed this PR size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants