From 5875dc6d3bde064db8382f90579a8aa39dbf0f98 Mon Sep 17 00:00:00 2001
From: Webster Mudge <wmudge@cloudera.com>
Date: Wed, 30 Aug 2023 09:56:31 -0400
Subject: [PATCH] Update dependencies for optional functions (#116)

* Update dependencies for optional functions
* Update README, galaxy.yml, and requirements.yml for optional dependencies

Signed-off-by: Webster Mudge <wmudge@cloudera.com>
---
 README.md        | 20 +++++++++++++++++++-
 galaxy.yml       |  7 +++----
 requirements.yml |  6 +++---
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 475d1694..f6c105ae 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Ansible Collection for Cloudera Private Cloud
+# Ansible Collection for Cloudera (CDP) Private Cloud
 
 ## Requirements
 
@@ -6,6 +6,24 @@
 - [Ansible](http://docs.ansible.com/ansible/intro_installation.html)
 - [JMESPath](https://jmespath.org/)
 
+### Dependencies
+
+| Name | Type | Version |
+| `ansible.posix` | collection | `1.3.0` |
+| `community.crypto` | collection | `2.2.1` |
+| `community.general` | collection | `4.5.0` |
+
+### Optional Dependencies
+
+| Name | Type | Version |
+| `community.mysql` | collection | `3.1.0` |
+| `community.postgresql` | collection | `1.6.1` |
+| `freeipa.ansible_freeipa` | collection | `1.6.2` |
+| `geerlingguy.postgresql` | role | `2.2.0` |
+| `geerlingguy.mysql` (patched) | role | `master` |
+
+All dependencies, required and optional, are found in `requirements.yml`. Only the required dependencies are in `galaxy.yml` and thus installed by `ansible-builder` when creating an Environment Execution container.
+
 **Do not use Ansible 2.9.0**. This version has an [issue with templating](https://github.com/ansible/ansible/issues/64745) which causes the playbook execution to fail. Instead, use any 2.8.x version or a later 2.9.x version as these are not affected.
 
 ## Usage
diff --git a/galaxy.yml b/galaxy.yml
index 8c62b214..593849aa 100644
--- a/galaxy.yml
+++ b/galaxy.yml
@@ -1,3 +1,5 @@
+---
+
 # Copyright 2023 Cloudera, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,7 +16,7 @@
 
 namespace: cloudera
 name: cluster
-version: 3.4.2
+version: 4.0.0-rc1
 
 authors: []
 readme: README.md
@@ -26,9 +28,6 @@ dependencies:
   'ansible.posix': '1.3.0'
   'community.crypto': '2.2.1'
   'community.general': '4.5.0'
-  'community.mysql': '3.1.0'
-  'community.postgresql': '1.6.1'
-  'freeipa.ansible_freeipa': '1.6.2'
 
 repository: https://github.com/cloudera-labs/cloudera.cluster
 documentation: https://github.com/cloudera-labs/cloudera.cluster
diff --git a/requirements.yml b/requirements.yml
index 2aa5dfad..c3609a75 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -1,4 +1,6 @@
-# Copyright 2021 Cloudera, Inc.
+---
+
+# Copyright 2023 Cloudera, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,8 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
----
-
 roles:
   - name: geerlingguy.postgresql
     version: 2.2.0