Skip to content

Conversation

@Ultimate-etamitlU
Copy link
Contributor

Fixing up issues for bad sshKey declaration in install-config.yaml
and removing additional spaces before "EOF" for sample configs files
of agent-config.yaml and install-config.yaml
Signed-off-by: Ultimate-etamitlU [email protected]

Version(s): 4.13 and above

Issue:
In https://github.com/openshift/openshift-docs/edit/main/modules/installing-ocp-agent-inputs.adoc
we have sample install-config as,
..
..
pullSecret: '<pull_secret>' <4>
sshKey: |
'<ssh_pub_key>' <5>
..
..
But when we add ssh key like that if fails to start services that creates initial cluster and infraenv though the node gets IP but we can't do ssh.
Changing it to something like below fixes it.
What needs fixing?

From this,

..
..
pullSecret: '<pull_secret>' <4>
sshKey: |
'<ssh_pub_key>' <5>
..
..

To this,

..
..
pullSecret: '<pull_secret>' <4>
sshKey: '<ssh_pub_key>' <5>
..
..

Tested this to my environment and seems not working with ABI somehow.

Also there are white spaces before "EOF" which break the copy paste operation of
the sample configs for user and needs that's adjusted manually so removing those.

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:

Earlier had separate PR for each of it and messed up with that by trying it by GUI so
correcting everything in a single commit to avoid kids noise!

and removing additional spaces before "EOF" for sample configs files
of agent-config.yaml and install-config.yaml
Signed-off-by: Ultimate-etamitlU <[email protected]>
@openshift-ci openshift-ci bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Oct 12, 2023
@ocpdocs-previewbot
Copy link

@Ultimate-etamitlU
Copy link
Contributor Author

@skopacz1 Erased all of the separates PR's I had and combined them all to one with this fresh one, can you please review this one.
Apologies as I thought using GUI would be easy to do this and it ended up in a lot work.

Copy link
Contributor

@skopacz1 skopacz1 left a comment

Choose a reason for hiding this comment

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

LGTM. This is a redo of #66032 which was QE approved, so I believe this PR itself won't need QE review. Let me know if I need it reviewed anyways.

@skopacz1
Copy link
Contributor

/label merge-review-needed

@openshift-ci openshift-ci bot added the merge-review-needed Signifies that the merge review team needs to review this PR label Oct 13, 2023
@kalexand-rh
Copy link
Contributor

Since QE approved the other PR, it's fine to merge this one - it does appear to be the same change.

@kcarmichael08 kcarmichael08 added merge-review-in-progress Signifies that the merge review team is reviewing this PR branch/enterprise-4.13 branch/enterprise-4.14 labels Oct 13, 2023
@kcarmichael08 kcarmichael08 merged commit 9b43b40 into openshift:main Oct 13, 2023
@kcarmichael08
Copy link
Contributor

/cherrypick enterprise-4.14

@openshift-cherrypick-robot

@kcarmichael08: new pull request created: #66207

In response to this:

/cherrypick enterprise-4.14

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.

@kcarmichael08
Copy link
Contributor

/cherrypick enterprise-4.13

@openshift-cherrypick-robot

@kcarmichael08: #66190 failed to apply on top of branch "enterprise-4.13":

Applying: fixing up issues for bad sshKey declaration in install-config.yaml and removing additional spaces before "EOF" for sample configs files of agent-config.yaml and install-config.yaml Signed-off-by: Ultimate-etamitlU <[email protected]>
Using index info to reconstruct a base tree...
M	modules/installing-ocp-agent-inputs.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/installing-ocp-agent-inputs.adoc
CONFLICT (content): Merge conflict in modules/installing-ocp-agent-inputs.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 fixing up issues for bad sshKey declaration in install-config.yaml and removing additional spaces before "EOF" for sample configs files of agent-config.yaml and install-config.yaml Signed-off-by: Ultimate-etamitlU <[email protected]>
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:

/cherrypick enterprise-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.

@Ultimate-etamitlU Ultimate-etamitlU restored the update_agent_doc branch October 13, 2023 13:56
@Ultimate-etamitlU Ultimate-etamitlU deleted the update_agent_doc branch October 13, 2023 14:14
@kcarmichael08 kcarmichael08 removed merge-review-in-progress Signifies that the merge review team is reviewing this PR merge-review-needed Signifies that the merge review team needs to review this PR labels Oct 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

branch/enterprise-4.13 branch/enterprise-4.14 size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants