-
Notifications
You must be signed in to change notification settings - Fork 182
feat: Ansible Automation Platform Updates for 2.5/2.6 #418
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
BBGrimmett2
wants to merge
3
commits into
redhat-cop:main
Choose a base branch
from
BBGrimmett2:main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,4 +4,3 @@ kind: Kustomization | |
|
|
||
| resources: | ||
| - automationcontroller.yaml | ||
| - console-link.yaml | ||
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| # Ansible Automation Platform instances | ||
|
|
||
| Installs the Event Driven Ansible Controller | ||
|
|
||
| ## Prerequisites | ||
|
|
||
| The current *overlays* available are: | ||
|
|
||
| * [default](overlays/default) | ||
|
|
||
| ## Usage | ||
|
|
||
| If you have cloned the `gitops-catalog` repository, you can install Logging infrastructure by running from the root `gitops-catalog` directory | ||
|
|
||
| ```bash | ||
| oc apply -k ansible-automation-platform/eda-instance/overlays/default | ||
| ``` | ||
|
|
||
| Or, without cloning: | ||
|
|
||
| ```bash | ||
| oc apply -k https://github.com/redhat-cop/gitops-catalog/ansible-automation-platform/eda-instance/overlays/default | ||
| ``` | ||
|
|
||
| As part of a different overlay in your own GitOps repo: | ||
|
|
||
| ```yaml | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
| resources: | ||
| - github.com/redhat-cop/gitops-catalog/ansible-automation-platform/eda-instance/overlays/default?ref=main | ||
| ``` |
33 changes: 33 additions & 0 deletions
33
ansible-automation-platform/eda-instance/base/automationeda.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| --- | ||
| apiVersion: eda.ansible.com/v1alpha1 | ||
| kind: EDA | ||
| metadata: | ||
| name: automation-eda | ||
| namespace: ansible-automation-platform | ||
| spec: | ||
| ingress_type: Route | ||
| event_stream: | ||
| gunicorn_workers: 2 | ||
| mtls: true | ||
| replicas: 1 | ||
| no_log: true | ||
| activation_worker: | ||
| replicas: 2 | ||
| image_pull_policy: IfNotPresent | ||
| ui: | ||
| replicas: 1 | ||
| api: | ||
| gunicorn_workers: 2 | ||
| replicas: 1 | ||
| scheduler: | ||
| replicas: 2 | ||
| database: | ||
| postgres_data_volume_init: false | ||
| redis: | ||
| replicas: 1 | ||
| admin_user: admin | ||
| default_worker: | ||
| replicas: 2 | ||
| worker: | ||
| replicas: 2 | ||
| automation_server_url: http://aap-controller.example.com # Change to URL of the Automation Controller instance to run ansible jobs against (connect directly) |
6 changes: 6 additions & 0 deletions
6
ansible-automation-platform/eda-instance/base/kustomization.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| --- | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
|
|
||
| resources: | ||
| - automationeda.yaml |
6 changes: 6 additions & 0 deletions
6
ansible-automation-platform/eda-instance/overlays/default/kustomization.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| --- | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
|
|
||
| resources: | ||
| - ../../base |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 0 additions & 11 deletions
11
ansible-automation-platform/hub-instance/base/console-link.yaml
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,4 +4,3 @@ kind: Kustomization | |
|
|
||
| resources: | ||
| - automationhub.yaml | ||
| - console-link.yaml | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| # Ansible Automation Platform instances | ||
|
|
||
| Installs the Automation Platform | ||
|
|
||
| ## Prerequisites | ||
|
|
||
| Do not use the `base` directory directly, as you will need to patch | ||
|
|
||
| * the `ConsoleLink` | ||
|
|
||
| The current *overlays* available are: | ||
|
|
||
| * [default](overlays/default) | ||
|
|
||
| ## Usage | ||
| This is using the default deploy all component CR, please refer to [Ansible Automation Platform 2.6 Docs](https://docs.redhat.com/en/documentation/red_hat_ansible_automation_platform/2.6/html/installing_on_openshift_container_platform/appendix-operator-crs_appendix-operator-crs#operator-crs) for example custom resources for connecting existing components | ||
|
|
||
| If you have cloned the `gitops-catalog` repository, you can install Logging infrastructure by running from the root `gitops-catalog` directory | ||
|
|
||
| ```bash | ||
| oc apply -k ansible-automation-platform/platform-instance/overlays/default | ||
| ``` | ||
|
|
||
| Or, without cloning: | ||
|
|
||
| ```bash | ||
| oc apply -k https://github.com/redhat-cop/gitops-catalog/ansible-automation-platform/platform-instance/overlays/default | ||
| ``` | ||
|
|
||
| As part of a different overlay in your own GitOps repo: | ||
|
|
||
| ```yaml | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
| resources: | ||
| - github.com/redhat-cop/gitops-catalog/ansible-automation-platform/platform-instance/overlays/default?ref=main | ||
| ``` |
16 changes: 16 additions & 0 deletions
16
ansible-automation-platform/platform-instance/base/automationplatform.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| --- | ||
| apiVersion: aap.ansible.com/v1alpha1 | ||
| kind: AnsibleAutomationPlatform | ||
| metadata: | ||
| name: automation-platform | ||
| namespace: ansible-automation-platform | ||
| spec: | ||
| route_tls_termination_mechanism: Edge | ||
| no_log: true | ||
| redis_mode: standalone | ||
| api: | ||
| log_level: INFO | ||
| replicas: 1 | ||
| database: | ||
| postgres_data_volume_init: false | ||
| idle_disabled: false |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What is the goal of renaming from instance to controller-instance?
Instance is a common pattern we use throughout the catalog so i am hesitant to deviate from the current pattern without a reason.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
My thought behind this was the AnsibleAutomationPlatform custom resource is now the full deployment with AAP 2.5+. Changing the name to
controller-instancematches the "plumping in" that we document in adding existing/separate controller instances into the AnsibleAutomationPlatform CR (see here)Open to changing the names to match the pattern; however I would then change
platform-instanceto justinstanceto match the default CR (here)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, I think that
instancewould be my preference.Inside of instance I would recommend something like this:
Based off of what you have described you could have the separate examples for each deployment method in the overlays folder. If you have "common" features for those different examples you may consider adding the
componentsfolder. The intention of components is that it is a reusable set of patches that you can reuse for many different overlays. Instead of trying to apply the same patch in every overlay you can instead apply the component and keep features more modular.You can see an example of how I use the components feature here:
https://github.com/redhat-cop/gitops-catalog/tree/main/openshift-ai/instance