internet/awx-operator
3
0
Fork 0
mirror of https://github.com/ansible/awx-operator.git synced 2026-05-08 14:22:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix retry for checking postgres pod & fix secrets template

Browse Source 
- fixed a lot of typos & updated the README.md files
This commit is contained in:
Christian M. Adams
2021-04-13 14:47:38 -04:00
parent fb612c24df
commit 5b32c41277
24 changed files with 97 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
deploy/awx-operator.yaml
View File

@@ -457,7 +457,7 @@ spec:
openAPIV3Schema:
type: object
x-kubernetes-preserve-unknown-fields: true
description: Schema validation for the AWXBackup CRD
description: Schema validation for the AWXRestore CRD
properties:
spec:
type: object
@@ -466,10 +466,10 @@ spec:
description: Name of the deployment to be restored to
type: string
tower_backup_pvc:
description: Name of the PVC to be used for storing the backup
description: Name of the PVC to be restored from
type: string
tower_backup_pvc_namespace:
description: Namespace PVC is in
description: Namespace the PVC is in
type: string
tower_backup_dir:
description: Backup directory name, a status found on the awxbackup object (towerBackupComplete)
@@ -487,7 +487,7 @@ spec:
description: Custom postgres_configuration secret name
type: string
oneOf:
- required: ["tower_name", "tower_backup_pvc"]
- required: ["tower_name", "tower_backup_pvc", "tower_backup_dir"]
---
apiVersion: rbac.authorization.k8s.io/v1
@@ -570,6 +570,7 @@ rules:
resources:
- '*'
- awxbackups
- awxrestores
verbs:
- '*'
@@ -612,7 +613,7 @@ spec:
serviceAccountName: awx-operator
containers:
- name: awx-operator
image: "quay.io/chadams/awx-operator:new-crd"
image: "quay.io/ansible/awx-operator:0.8.0"
imagePullPolicy: "Always"
volumeMounts:
- mountPath: /tmp/ansible-operator/runner

8
deploy/crds/awxrestore_v1beta1_crd.yaml
View File

@@ -21,7 +21,7 @@ spec:
openAPIV3Schema:
type: object
x-kubernetes-preserve-unknown-fields: true
description: Schema validation for the AWXBackup CRD
description: Schema validation for the AWXRestore CRD
properties:
spec:
type: object
@@ -30,10 +30,10 @@ spec:
description: Name of the deployment to be restored to
type: string
tower_backup_pvc:
description: Name of the PVC to be used for storing the backup
description: Name of the PVC to be restored from
type: string
tower_backup_pvc_namespace:
description: Namespace PVC is in
description: Namespace the PVC is in
type: string
tower_backup_dir:
description: Backup directory name, a status found on the awxbackup object (towerBackupComplete)
@@ -51,4 +51,4 @@ spec:
description: Custom postgres_configuration secret name
type: string
oneOf:
- required: ["tower_name", "tower_backup_pvc"]
- required: ["tower_name", "tower_backup_pvc", "tower_backup_dir"]