Mark deprecated spec properties.

[bdunne]

All of these should use XImage rather than the combination of: xImage xImageName (sometimes) xImageNamespace xImageTag

[miq-bot]

Checked commit https://github.com/bdunne/manageiq-pods/commit/2a0e92179679390fd603e1dd0eade10a93a73c5c with ruby 2.6.10, rubocop 1.28.2, haml-lint 0.35.0, and yamllint 1 file checked, 1 offense detected

**

• [ ] :bomb: :boom: :fire: :fire_engine: - Linter/Yaml - missing config files

[Fryguy]

@bdunne A conflict occurred during the backport of this pull request to petrosian.

If this pull request is based on another pull request that has not been marked for backport, add the appropriate labels to the other pull request. Otherwise, please create a new pull request direct to the petrosian branch in order to resolve this.

Conflict details:

diff --cc manageiq-operator/api/v1alpha1/manageiq_types.go
index d645287,e40be5c..0000000
--- a/manageiq-operator/api/v1alpha1/manageiq_types.go
+++ b/manageiq-operator/api/v1alpha1/manageiq_types.go
@@@ -260,7 -260,7 +260,11 @@@ type ManageIQSpec struct 
    // +optional
    OrchestratorImageNamespace string `json:"orchestratorImageNamespace,omitempty"`

++<<<<<<< HEAD
 +  // Image tag used for the orchestrator and worker deployments (default: latest-petrosian)
++=======
+   // Deprecated: Image tag used for the orchestrator and worker deployments (default: latest)
++>>>>>>> b4934f4 (Merge pull request #971 from bdunne/mark_deprecated_spec_properties)
    // +optional
    OrchestratorImageTag string `json:"orchestratorImageTag,omitempty"`

diff --cc manageiq-operator/config/crd/bases/manageiq.org_manageiqs.yaml
index 6b343c9,f6837ea..0000000
--- a/manageiq-operator/config/crd/bases/manageiq.org_manageiqs.yaml
+++ b/manageiq-operator/config/crd/bases/manageiq.org_manageiqs.yaml
@@@ -227,16 -231,16 +231,21 @@@ spec
                    <OrchestratorImageNamespace>/<OrchestratorImageName>:<OrchestratorImageTag>)'
                  type: string
                orchestratorImageName:
-                 description: 'Image name used for the orchestrator deployment (default:
-                   manageiq-orchestrator)'
+                 description: 'Deprecated: Image name used for the orchestrator deployment
+                   (default: manageiq-orchestrator)'
                  type: string
                orchestratorImageNamespace:
-                 description: 'Image namespace used for the orchestrator and worker
-                   deployments (default: manageiq)'
+                 description: 'Deprecated: Image namespace used for the orchestrator
+                   and worker deployments (default: manageiq)'
                  type: string
                orchestratorImageTag:
++<<<<<<< HEAD
 +                description: 'Image tag used for the orchestrator and worker deployments
 +                  (default: latest-petrosian)'
++=======
+                 description: 'Deprecated: Image tag used for the orchestrator and
+                   worker deployments (default: latest)'
++>>>>>>> b4934f4 (Merge pull request #971 from bdunne/mark_deprecated_spec_properties)
                  type: string
                orchestratorInitialDelay:
                  description: 'Number of seconds to wait before starting the orchestrator

[Fryguy]

Backported in https://github.com/ManageIQ/manageiq-pods/pull/972