OCPBUGS-57952 changed agentSocketPath to agentSocketName

[wgabor0427]

Version(s):
4.18+

Issue:
https://issues.redhat.com/browse/OCPBUGS-57952

Link to docs preview:
https://95106--ocpdocs-pr.netlify.app/openshift-enterprise/latest/security/zero_trust_workload_identity_manager/zero-trust-manager-configuration.html

QE review:

• QE has approved this change.

Additional information:

[ocpdocs-previewbot]

🤖 Mon Jun 23 14:44:34 - Prow CI generated the docs preview:

https://95106--ocpdocs-pr.netlify.app/openshift-enterprise/latest/security/zero_trust_workload_identity_manager/zero-trust-manager-configuration.html

[openshift-ci]

@wgabor0427: all tests passed!

Full PR test history. Your PR dashboard.

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

[lunarwhite]

/lgtm

[lunarwhite]

Please note that on "enterprise-4.18", we need also to fix the indentation:

openshift-docs/modules/zero-trust-manager-oidc-config.adoc

Lines 32 to 34 in e2604f4

	trustDomain: <trust_domain> #<1>
	agentSocketPath: 'spire-agent.sock' #<2>
	jwtIssuer: <jwt_issuer_domain> #<3>

should be:

  trustDomain: <trust_domain> #<1>
  agentSocketName: 'spire-agent.sock' #<2>
  jwtIssuer: <jwt_issuer_domain> #<3>

[anirudhAgniRedhat]

/lgtm

[wgabor0427]

/label peer-review-needed

[mburke5678]

/lgtm

[wgabor0427]

/label merge-review-needed

[ShaunaDiaz]

/lgtm

[ShaunaDiaz]

/cherrypick enterprise-4.20

[ShaunaDiaz]

/cherrypick enterprise-4.19

[ShaunaDiaz]

/cherrypick enterprise-4.18

[openshift-cherrypick-robot]

@ShaunaDiaz: new pull request created: #95176

In response to this:

/cherrypick enterprise-4.20

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.

[openshift-cherrypick-robot]

@ShaunaDiaz: new pull request created: #95177

In response to this:

/cherrypick enterprise-4.19

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.

[openshift-cherrypick-robot]

@ShaunaDiaz: #95106 failed to apply on top of branch "enterprise-4.18":

Applying: OCPBUGS-57952 changed agentSocketPath to agentSocketName
Using index info to reconstruct a base tree...
M	modules/zero-trust-manager-oidc-config.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/zero-trust-manager-oidc-config.adoc
CONFLICT (content): Merge conflict in modules/zero-trust-manager-oidc-config.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 OCPBUGS-57952 changed agentSocketPath to agentSocketName

In response to this:

/cherrypick enterprise-4.18

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.

[ShaunaDiaz]

@ShaunaDiaz: #95106 failed to apply on top of branch "enterprise-4.18":

Applying: OCPBUGS-57952 changed agentSocketPath to agentSocketName
Using index info to reconstruct a base tree...
M	modules/zero-trust-manager-oidc-config.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/zero-trust-manager-oidc-config.adoc
CONFLICT (content): Merge conflict in modules/zero-trust-manager-oidc-config.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 OCPBUGS-57952 changed agentSocketPath to agentSocketName

@wgabor0427 Looks like this one will need a manual cherry-pick. You can put it back in queue when you have it ready.

[wgabor0427]

/cherrypick enterprise-4.18

[openshift-cherrypick-robot]

@wgabor0427: #95106 failed to apply on top of branch "enterprise-4.18":

Applying: OCPBUGS-57952 changed agentSocketPath to agentSocketName
Using index info to reconstruct a base tree...
M	modules/zero-trust-manager-oidc-config.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/zero-trust-manager-oidc-config.adoc
CONFLICT (content): Merge conflict in modules/zero-trust-manager-oidc-config.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 OCPBUGS-57952 changed agentSocketPath to agentSocketName

In response to this:

/cherrypick enterprise-4.18

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.