OSSM-6247 Add Kiali and OSSMC plugin attributes to common-attributes.adoc

[gwynnemonahan]

OSSM-6247 Add Kiali and OSSMC plugin attributes to common-attributes.adoc

Version(s):
4.12+

Issue:
https://issues.redhat.com/browse/OSSM-6247

Link to docs preview:
N/A

QE review:
QE review is not needed for this PR.

Additional information:
Adds 3 attributes under //service mesh v2:

:KialiProduct: Kiali Operator provided by Red Hat
:SMPlugin: OpenShift Service Mesh Console (OSSMC) plugin
:SMPluginShort: OSSMC plugin

[ocpdocs-previewbot]

🤖 Tue Apr 02 17:06:20 - Prow CI generated the docs preview:
https://74066--ocpdocs-pr.netlify.app
Complete list of updated preview URLs: artifacts/updated_preview_urls.txt

[openshift-ci]

@gwynnemonahan: 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.

[gwynnemonahan]

/label peer-review-needed

[mburke5678]

@gwynnemonahan The format of the attributes LGTM

[gwynnemonahan]

/label merge-review-needed

[opayne1]

lgtm

[opayne1]

/cherrypick enterprise-4.12

[opayne1]

/cherrypick enterprise-4.13

[opayne1]

/cherrypick enterprise-4.14

[opayne1]

/cherrypick enterprise-4.15

[opayne1]

/cherrypick enterprise-4.16

[openshift-cherrypick-robot]

@opayne1: #74066 failed to apply on top of branch "enterprise-4.12":

Applying: OSSM-6247 Add Kiali and OSSMC plugin attributes to common-attributes.adoc
Using index info to reconstruct a base tree...
M	_attributes/common-attributes.adoc
Falling back to patching base and 3-way merge...
Auto-merging _attributes/common-attributes.adoc
CONFLICT (content): Merge conflict in _attributes/common-attributes.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 OSSM-6247 Add Kiali and OSSMC plugin attributes to common-attributes.adoc
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.12

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]

@opayne1: #74066 failed to apply on top of branch "enterprise-4.13":

Applying: OSSM-6247 Add Kiali and OSSMC plugin attributes to common-attributes.adoc
Using index info to reconstruct a base tree...
M	_attributes/common-attributes.adoc
Falling back to patching base and 3-way merge...
Auto-merging _attributes/common-attributes.adoc
CONFLICT (content): Merge conflict in _attributes/common-attributes.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 OSSM-6247 Add Kiali and OSSMC plugin attributes to common-attributes.adoc
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.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-cherrypick-robot]

@opayne1: #74066 failed to apply on top of branch "enterprise-4.14":

Applying: OSSM-6247 Add Kiali and OSSMC plugin attributes to common-attributes.adoc
Using index info to reconstruct a base tree...
M	_attributes/common-attributes.adoc
Falling back to patching base and 3-way merge...
Auto-merging _attributes/common-attributes.adoc
CONFLICT (content): Merge conflict in _attributes/common-attributes.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 OSSM-6247 Add Kiali and OSSMC plugin attributes to common-attributes.adoc
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.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.

[openshift-cherrypick-robot]

@opayne1: new pull request created: #74091

Details

In response to this:

/cherrypick enterprise-4.15

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]

@opayne1: new pull request created: #74092

Details

In response to this:

/cherrypick enterprise-4.16

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.

[opayne1]

@gwynnemonahan looks like you will need to do a manual CP for 4.12-4.14

[gwynnemonahan]

@opayne1 Wait...so the common-attributes file doesn't exist on 4.12, 4.13, or 4.14?

[opayne1]

It exists there is just a conflict on the lines you are trying to add to in those branches.

[libander]

Manual CPs:
4.12: #74093
4.13: #74094
4.14: #74095