Skip to content

Commit

Permalink
Merge pull request #78 from AniruddhaNayek/main
Browse files Browse the repository at this point in the history
Add check to global pull secret for FIO
  • Loading branch information
ppc64le-cloud-bot authored Aug 26, 2024
2 parents c2e4270 + a74755a commit f78251e
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
5 changes: 3 additions & 2 deletions examples/fio_vars.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@
# ocp-fio vars
fio_enabled: false
fio_install_operator: true
fio_enable_global_secret: false
fio_catalogsource_image: "" # brew.registry.redhat.io/rh-osbs/iib:276833
fio_upgrade_channel: "release-0.1"
fio_upgrade_channel: "stable"
fio_directory: "/tmp/fio"
fio_config_name: ""
fio_config_key: ""
Expand All @@ -14,7 +15,7 @@ fio_config_max_backups: ""
fio_default_config: true
fio_node_selector: ""
fio_debug: false
fio_golang_tarball: "https://dl.google.com/go/go1.19.6.linux-ppc64le.tar.gz"
fio_golang_tarball: "https://dl.google.com/go/go1.22.4.linux-ppc64le.tar.gz"
fio_e2e: false
fio_e2e_git_repository: ""
fio_git_username: ""
Expand Down
3 changes: 2 additions & 1 deletion playbooks/roles/ocp-fio/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ Role Variables
|--------------------------|----------|-------------|-------------------------------------------------------|
| fio_enabled | no | false | Set it to true to run this playbook |
| fio_install_operator | no | true | Set it to true to install the File Integrity Operator |
| fio_enable_global_secret | no | false | Role var to update the global pull-secret. |
| fio_catalogsource_image | no | "" | Custom catalog source index image for File Integrity Operator. If not defined, default `redhat-operators` catalog source will be used |
| fio_upgrade_channel | no | stable | Operator upgrade channel |
| fio_directory | no | `/tmp/fio` | Working directory for File Integrity Operator |
Expand All @@ -28,7 +29,7 @@ Role Variables
| fio_node_selector | no | "" | Selector for nodes to schedule the scan instances on |
| fio_default_config | no | true | Flag is set to true to use default configuration |
| fio_debug | no | false | If set to true, the daemon running in the AIDE deamon set's pods would output extra information |
| fio_golang_tarball | no | https://dl.google.com/go/go1.18.2.linux-ppc64le.tar.gz | HTTPS URL for golang tarball |
| fio_golang_tarball | no | https://go.dev/dl/go1.22.4.linux-ppc64le.tar.gz | HTTPS URL for golang tarball |
| fio_e2e | no | false | Set it to true to run e2e |
| fio_e2e_git_repository | no | "" | Git respository for e2e tests |
| fio_git_username | no | "" | Github username |
Expand Down
3 changes: 2 additions & 1 deletion playbooks/roles/ocp-fio/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

fio_enabled: false
fio_install_operator: true
fio_enable_global_secret: false
fio_catalogsource_image: "" # brew.registry.redhat.io/rh-osbs/iib:276833
fio_catalogsource: "redhat-operators"
fio_upgrade_channel: "stable"
Expand All @@ -13,7 +14,7 @@ fio_config_max_backups: ""
fio_default_config: true
fio_node_selector: ""
fio_debug: false
fio_golang_tarball: "https://dl.google.com/go/go1.20.5.linux-ppc64le.tar.gz"
fio_golang_tarball: "https://dl.google.com/go/go1.22.4.linux-ppc64le.tar.gz"
fio_e2e: false
fio_e2e_git_repository: ""
fio_git_username: ""
Expand Down
1 change: 1 addition & 0 deletions playbooks/roles/ocp-fio/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@
- name: Include the global-secret-update role
include_role:
name: global-secret-update
when: fio_enable_global_secret

- name: Set fact variable for CatalogSource name
set_fact:
Expand Down

0 comments on commit f78251e

Please sign in to comment.