mirror of
https://github.com/ansible/awx-operator.git
synced 2026-05-07 22:02:53 +00:00
Add support for spec overrides when restoring AWX (#1862)
This commit is contained in:
@@ -94,6 +94,11 @@ spec:
|
|||||||
postgres_image_version:
|
postgres_image_version:
|
||||||
description: PostgreSQL container image version to use
|
description: PostgreSQL container image version to use
|
||||||
type: string
|
type: string
|
||||||
|
spec_overrides:
|
||||||
|
description: Overrides for the AWX spec
|
||||||
|
# type: string
|
||||||
|
type: object
|
||||||
|
x-kubernetes-preserve-unknown-fields: true
|
||||||
image_pull_policy:
|
image_pull_policy:
|
||||||
description: The image pull policy
|
description: The image pull policy
|
||||||
type: string
|
type: string
|
||||||
|
|||||||
@@ -218,6 +218,10 @@ spec:
|
|||||||
path: postgres_image_version
|
path: postgres_image_version
|
||||||
x-descriptors:
|
x-descriptors:
|
||||||
- urn:alm:descriptor:com.tectonic.ui:hidden
|
- urn:alm:descriptor:com.tectonic.ui:hidden
|
||||||
|
- displayName: AWX Spec Overrides
|
||||||
|
path: spec_overrides
|
||||||
|
x-descriptors:
|
||||||
|
- urn:alm:descriptor:com.tectonic.ui:advanced
|
||||||
- displayName: Image Pull Policy
|
- displayName: Image Pull Policy
|
||||||
path: image_pull_policy
|
path: image_pull_policy
|
||||||
x-descriptors:
|
x-descriptors:
|
||||||
|
|||||||
@@ -39,4 +39,6 @@ additional_labels: []
|
|||||||
|
|
||||||
# Maintain some of the recommended `app.kubernetes.io/*` labels on the resource (self)
|
# Maintain some of the recommended `app.kubernetes.io/*` labels on the resource (self)
|
||||||
set_self_labels: true
|
set_self_labels: true
|
||||||
|
|
||||||
|
spec_overrides: {}
|
||||||
...
|
...
|
||||||
|
|||||||
@@ -1,5 +1,10 @@
|
|||||||
---
|
---
|
||||||
|
|
||||||
|
- name: Combine spec_overrides with spec
|
||||||
|
set_fact:
|
||||||
|
spec: "{{ spec | default({}) | combine(spec_overrides) }}"
|
||||||
|
no_log: "{{ no_log }}"
|
||||||
|
|
||||||
- name: Deploy AWX
|
- name: Deploy AWX
|
||||||
k8s:
|
k8s:
|
||||||
state: "{{ state | default('present') }}"
|
state: "{{ state | default('present') }}"
|
||||||
|
|||||||
Reference in New Issue
Block a user