diff --git a/Ansible/ansible_collections/jfrog/platform/CHANGELOG.md b/Ansible/ansible_collections/jfrog/platform/CHANGELOG.md index 2db573d0..63e90308 100644 --- a/Ansible/ansible_collections/jfrog/platform/CHANGELOG.md +++ b/Ansible/ansible_collections/jfrog/platform/CHANGELOG.md @@ -1,6 +1,37 @@ # JFrog Platform Ansible Collection Changelog All changes to this collection will be documented in this file. +## [10.16.5] - Jan 05, 2024 +* Postgres - change to the new location of the RPM GPG key URL. [GH-362](https://github.com/jfrog/JFrog-Cloud-Installers/pull/362) +* Product Updates/fixes + +## [10.16.4] - Dec 21, 2023 +* Artifactory - Upgrade version when tar is already present [GH-356](https://github.com/jfrog/JFrog-Cloud-Installers/pull/356) +* Product Updates/fixes + +## [10.16.3] - Dec 6, 2023 +* Added How to avoid IPv6 binding in Readme [GH-349](https://github.com/jfrog/JFrog-Cloud-Installers/pull/349) +* Product Updates/fixes + +## [10.16.2] - Nov 10, 2023 +* Postgres - Change postgres_apt_repository_repo url for ubuntu 18 +* Product Updates/fixes + +## [10.16.1] - Nov 3, 2023 +* Artifactory - Fix bootstrap template issue [GH-340](https://github.com/jfrog/JFrog-Cloud-Installers/pull/340) + +## [10.16.0] - Oct 26, 2023 +* Artifactory - Configure admin credentials [GH-335](https://github.com/jfrog/JFrog-Cloud-Installers/pull/335) +* Postgres - Assert that database username and password are defined [GH-336](https://github.com/jfrog/JFrog-Cloud-Installers/pull/336) +* Xray - Added a condition to check if socat already exists in rabbitmq +* Product Updates/fixes + +## [10.15.3] - Oct 16, 2023 +* Product Updates/fixes + +## [10.15.2] - Sep 28, 2023 +* Product Updates/fixes + ## [10.15.0] - Sep 12, 2023 * Increase heap space in artifactory java opts [GH-329](https://github.com/jfrog/JFrog-Cloud-Installers/issues/329) * Product Updates/fixes diff --git a/Ansible/ansible_collections/jfrog/platform/README.md b/Ansible/ansible_collections/jfrog/platform/README.md index 79b06932..ba7a6a72 100644 --- a/Ansible/ansible_collections/jfrog/platform/README.md +++ b/Ansible/ansible_collections/jfrog/platform/README.md @@ -1,29 +1,29 @@ # JFrog Platform Ansible Collection This Ansible directory consists of the following directories that support the JFrog Platform collection. - + * ansible_collections directory - This directory contains the Ansible collection package that has the Ansible roles for Artifactory, Distribution, Insight and Xray. See the roles README for details on the product roles and variables. * examples directory - This directory contains example playbooks for various architectures. - + ## Getting Started ## Prerequisites From 10.11.x collection and above, Using fully qualified collection name (FQCN) , This is required for installing collection dependencies -``` +```bash ansible-galaxy collection install community.postgresql community.general ansible.posix ``` - + 1. Install this collection from Ansible Galaxy. - + ``` ansible-galaxy collection install jfrog.platform ``` - + Ensure you reference the collection in your playbook when using these roles. - - ``` + + ```yaml --- - hosts: artifactory_servers collections: @@ -31,19 +31,19 @@ ansible-galaxy collection install community.postgresql community.general ansible - community.general roles: - artifactory - + ``` - - 2. Ansible uses SSH to connect to hosts. Ensure that your SSH private key is on your client and the public keys are installed on your Ansible hosts. - + + 2. Ansible uses SSH to connect to hosts. Ensure that your SSH private key is on your client and the public keys are installed on your Ansible hosts. + 3. Create your inventory file. Use one of the examples from the examples directory to construct an inventory file (hosts.ini) with the host addresses - + 4. Create your playbook. Use one of the examples from the examples directory to construct a playbook using the JFrog Ansible roles. These roles will be applied to your inventory and provision software. - + 5. Then execute with the following command to provision the JFrog Platform with Ansible. - -``` -ansible-playbook -vv platform.yml -i hosts.ini" + +```bash +ansible-playbook -vv platform.yml -i hosts.ini ``` ## Generating Master and Join Keys @@ -51,7 +51,7 @@ ansible-playbook -vv platform.yml -i hosts.ini" For production deployments,You may want to generate your master and join keys and apply it to all the nodes. **IMPORTANT** : Save below generated master and join keys for future upgrades -``` +```bash MASTER_KEY_VALUE=$(openssl rand -hex 32) JOIN_KEY_VALUE=$(openssl rand -hex 32) ansible-playbook -vv platform.yml -i hosts.ini --extra-vars "master_key=$MASTER_KEY_VALUE join_key=$JOIN_KEY_VALUE" @@ -60,13 +60,21 @@ ansible-playbook -vv platform.yml -i hosts.ini --extra-vars "master_key=$MASTER_ ## Using [Ansible Vault](https://docs.ansible.com/ansible/latest/user_guide/vault.html) to Encrypt Vars Some vars you may want to keep secret. You may put these vars into a separate file and encrypt them using [Ansible Vault](https://docs.ansible.com/ansible/latest/user_guide/vault.html). +For example, you will probably change the default password for the admin user using an encrypted file. + +```yaml +# Default password +artifactory_admin_password: password ``` + + +```bash ansible-vault encrypt secret-vars.yml --vault-password-file ~/.vault_pass.txt ``` then in your playbook include the secret vars file. -``` +```yaml - hosts: artifactory_servers collections: - community.general @@ -81,7 +89,7 @@ then in your playbook include the secret vars file. ## Upgrades All JFrog product roles support software updates. To use a role to perform a software update only, use the __upgrade_only_ variable and specify the version. See the following example. -``` +```yaml - hosts: artifactory_servers collections: - community.general @@ -108,7 +116,7 @@ Create an external database as documented [here](https://www.jfrog.com/confluenc For example, for artifactory, these below values needs to be set for using external postgresql -``` +```yaml postgres_enabled: false artifactory_db_type: postgresql @@ -124,21 +132,38 @@ artifactory_db_url: jdbc:postgresql://:5432/{{ artifactory_ 1. Go to the ansible_collections/jfrog/platform directory. 2. Update the galaxy.yml meta file as needed. Update the version. 3. Build the archive. (Requires Ansible 2.9+) -``` +```bash ansible-galaxy collection build ``` -## OS support +## OS support The JFrog Platform Ansible Collection can be installed on the following operating systems: -* Ubuntu LTS versions (18.04/20.4/22.04) +* Ubuntu LTS versions (18.04/20.04/22.04) * Centos/RHEL 7.x/8.x/9.x * Debian 10.x/11.x * Amazon Linux 2 +## How to avoid IPv6 binding + +Some distributions have two entries for localhost in `/etc/hosts`: + +``` +127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 +::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 +``` + +This can cause Java apps trying binding using IPv6, which fails when that's disabled. This causes some tcp ports not listening, like the Artifactory router service. + +Solution: add an extra JAVA_OPTION: `-Djava.net.preferIPv4Stack=true` to this variable: + +``` +artifactory_extra_java_opts: '-server -Xms512m -Xmx4g -Xss256k -XX:+UseG1GC -Djava.net.preferIPv4Stack=true' +``` + ## Known issues * Refer [here](https://github.com/jfrog/JFrog-Cloud-Installers/issues?q=is%3Aopen+is%3Aissue+label%3AAnsible) * By default, ansible_python_interpreter: "/usr/bin/python3" used , For Centos/RHEL-7, Set this to "/usr/bin/python" . For example -``` +```bash ansible-playbook -vv platform.yml -i hosts.ini -e 'ansible_python_interpreter=/usr/bin/python' ``` \ No newline at end of file diff --git a/Ansible/ansible_collections/jfrog/platform/artifactory.yml b/Ansible/ansible_collections/jfrog/platform/artifactory.yml index d65070d9..891291dc 100644 --- a/Ansible/ansible_collections/jfrog/platform/artifactory.yml +++ b/Ansible/ansible_collections/jfrog/platform/artifactory.yml @@ -6,4 +6,5 @@ - 1 - 100% roles: - - artifactory + - role: artifactory + when: artifactory_enabled | bool diff --git a/Ansible/ansible_collections/jfrog/platform/distribution.yml b/Ansible/ansible_collections/jfrog/platform/distribution.yml index 57dbe387..01dfa266 100644 --- a/Ansible/ansible_collections/jfrog/platform/distribution.yml +++ b/Ansible/ansible_collections/jfrog/platform/distribution.yml @@ -3,4 +3,5 @@ collections: - community.general roles: - - distribution + - role: distribution + when: distribution_enabled | bool diff --git a/Ansible/ansible_collections/jfrog/platform/galaxy.yml b/Ansible/ansible_collections/jfrog/platform/galaxy.yml index 2f044356..d2ba43ad 100644 --- a/Ansible/ansible_collections/jfrog/platform/galaxy.yml +++ b/Ansible/ansible_collections/jfrog/platform/galaxy.yml @@ -9,7 +9,7 @@ namespace: "jfrog" name: "platform" # The version of the collection. Must be compatible with semantic versioning -version: "10.15.0" +version: "10.16.5" # The path to the Markdown (.md) readme file. This path is relative to the root of the collection readme: "README.md" diff --git a/Ansible/ansible_collections/jfrog/platform/insight.yml b/Ansible/ansible_collections/jfrog/platform/insight.yml index b2254285..8ef0702c 100644 --- a/Ansible/ansible_collections/jfrog/platform/insight.yml +++ b/Ansible/ansible_collections/jfrog/platform/insight.yml @@ -4,4 +4,5 @@ - community.general - ansible.posix roles: - - insight + - role: insight + when: insight_enabled | bool \ No newline at end of file diff --git a/Ansible/ansible_collections/jfrog/platform/postgres.yml b/Ansible/ansible_collections/jfrog/platform/postgres.yml index 61f742df..63872452 100644 --- a/Ansible/ansible_collections/jfrog/platform/postgres.yml +++ b/Ansible/ansible_collections/jfrog/platform/postgres.yml @@ -1,7 +1,8 @@ - name: Play for postgres_servers - hosts: postgres + hosts: postgres_servers collections: - community.postgresql - community.general roles: - - postgres + - role: postgres + when: postgres_enabled | bool \ No newline at end of file diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory/defaults/main.yml b/Ansible/ansible_collections/jfrog/platform/roles/artifactory/defaults/main.yml index 825ede7b..63f93bfb 100644 --- a/Ansible/ansible_collections/jfrog/platform/roles/artifactory/defaults/main.yml +++ b/Ansible/ansible_collections/jfrog/platform/roles/artifactory/defaults/main.yml @@ -1,7 +1,7 @@ # Defaults file for artifactory # The version of artifactory to install -artifactory_version: 7.68.7 +artifactory_version: 7.71.11 # Set this to true when SSL is enabled (to use artifactory_nginx_ssl role), default to false (implies artifactory uses artifactory_nginx role ) artifactory_nginx_ssl_enabled: false @@ -64,9 +64,9 @@ artifactory_gid: 1030 # If this is an upgrade artifactory_upgrade_only: false -# Default username and password -artifactory_admin_username: admin -artifactory_admin_password: password +# Default username and password, uncomment and change to manage with ansible +# artifactory_admin_username: admin +# artifactory_admin_password: password artifactory_service_file: /lib/systemd/system/artifactory.service @@ -112,4 +112,4 @@ artifactory_binarystore: |- artifactory_systemyaml_override: false # Allow artifactory user to create crontab rules -artifactory_allow_crontab: false +artifactory_allow_crontab: false \ No newline at end of file diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory/tasks/install.yml b/Ansible/ansible_collections/jfrog/platform/roles/artifactory/tasks/install.yml index 078dc2c0..a45d897f 100644 --- a/Ansible/ansible_collections/jfrog/platform/roles/artifactory/tasks/install.yml +++ b/Ansible/ansible_collections/jfrog/platform/roles/artifactory/tasks/install.yml @@ -159,6 +159,19 @@ - artifactory_licenses | length > 0 notify: Restart artifactory +- name: Set up Artifactory admin account + become: true + ansible.builtin.template: + src: bootstrap.creds.j2 + dest: "{{ artifactory_home }}/var/etc/access/bootstrap.creds" + owner: "{{ artifactory_user }}" + group: "{{ artifactory_group }}" + mode: 0600 + when: + - artifactory_admin_username is defined + - artifactory_admin_password is defined + notify: Restart artifactory + - name: Check if included database driver is the correct version become: true ansible.builtin.stat: diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory/tasks/upgrade.yml b/Ansible/ansible_collections/jfrog/platform/roles/artifactory/tasks/upgrade.yml index 2ff3a108..b1531fc0 100644 --- a/Ansible/ansible_collections/jfrog/platform/roles/artifactory/tasks/upgrade.yml +++ b/Ansible/ansible_collections/jfrog/platform/roles/artifactory/tasks/upgrade.yml @@ -56,17 +56,28 @@ path: "{{ jfrog_home_directory }}" state: directory +- name: Check artifactory version + ansible.builtin.shell: | + set -o pipefail; + grep artifactory.product.version "{{ artifactory_home }}/app/artifactory.product.version.properties" |cut -d= -f2 + register: check_version_cmd + changed_when: false + +- name: Set running_version + ansible.builtin.set_fact: + running_version: "{{ check_version_cmd.stdout }}" + - name: Delete artifactory app directory become: true ansible.builtin.file: path: "{{ artifactory_home }}/app" state: absent - when: (download_artifactory.changed) or (unarchived_artifactory.changed) + when: running_version != artifactory_version - name: Copy new app to artifactory app become: true ansible.builtin.command: "cp -r {{ artifactory_untar_home }}/app/. {{ artifactory_home }}/app" - when: (download_artifactory.changed) or (unarchived_artifactory.changed) + when: running_version != artifactory_version notify: Restart artifactory - name: Configure artifactory license(s) @@ -168,4 +179,4 @@ delay: 5 when: - not ansible_check_mode - - artifactory_start_service | bool + - artifactory_start_service | bool \ No newline at end of file diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory/templates/bootstrap.creds.j2 b/Ansible/ansible_collections/jfrog/platform/roles/artifactory/templates/bootstrap.creds.j2 new file mode 100644 index 00000000..e2dadac0 --- /dev/null +++ b/Ansible/ansible_collections/jfrog/platform/roles/artifactory/templates/bootstrap.creds.j2 @@ -0,0 +1 @@ +{{ artifactory_admin_username }}@*={{ artifactory_admin_password }} \ No newline at end of file diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory/vars/main.yml b/Ansible/ansible_collections/jfrog/platform/roles/artifactory/vars/main.yml index dec3e84d..574db1ff 100644 --- a/Ansible/ansible_collections/jfrog/platform/roles/artifactory/vars/main.yml +++ b/Ansible/ansible_collections/jfrog/platform/roles/artifactory/vars/main.yml @@ -1,5 +1,5 @@ # platform collection version -platform_collection_version: 10.15.0 +platform_collection_version: 10.16.5 # indicates where this collection was downloaded from (galaxy, automation_hub, standalone) ansible_marketplace: galaxy diff --git a/Ansible/ansible_collections/jfrog/platform/roles/distribution/defaults/main.yml b/Ansible/ansible_collections/jfrog/platform/roles/distribution/defaults/main.yml index fa11ac38..24e24a4a 100644 --- a/Ansible/ansible_collections/jfrog/platform/roles/distribution/defaults/main.yml +++ b/Ansible/ansible_collections/jfrog/platform/roles/distribution/defaults/main.yml @@ -1,7 +1,7 @@ # defaults file for distribution # The version of distribution to install -distribution_version: 2.20.1 +distribution_version: 2.21.3 # whether to enable HA distribution_ha_enabled: false diff --git a/Ansible/ansible_collections/jfrog/platform/roles/distribution/vars/main.yml b/Ansible/ansible_collections/jfrog/platform/roles/distribution/vars/main.yml index 1374cb9b..97870aac 100644 --- a/Ansible/ansible_collections/jfrog/platform/roles/distribution/vars/main.yml +++ b/Ansible/ansible_collections/jfrog/platform/roles/distribution/vars/main.yml @@ -1,5 +1,5 @@ # platform collection version -platform_collection_version: 10.15.0 +platform_collection_version: 10.16.5 # indicates were this collection was downlaoded from (galaxy, automation_hub, standalone) ansible_marketplace: galaxy diff --git a/Ansible/ansible_collections/jfrog/platform/roles/insight/defaults/main.yml b/Ansible/ansible_collections/jfrog/platform/roles/insight/defaults/main.yml index f29fcd69..767f0fb0 100644 --- a/Ansible/ansible_collections/jfrog/platform/roles/insight/defaults/main.yml +++ b/Ansible/ansible_collections/jfrog/platform/roles/insight/defaults/main.yml @@ -1,7 +1,7 @@ # defaults file for insight # The version of insight to install -insight_version: 1.15.3 +insight_version: 1.16.5 # whether to enable HA insight_ha_enabled: false diff --git a/Ansible/ansible_collections/jfrog/platform/roles/insight/vars/main.yml b/Ansible/ansible_collections/jfrog/platform/roles/insight/vars/main.yml index 1374cb9b..97870aac 100644 --- a/Ansible/ansible_collections/jfrog/platform/roles/insight/vars/main.yml +++ b/Ansible/ansible_collections/jfrog/platform/roles/insight/vars/main.yml @@ -1,5 +1,5 @@ # platform collection version -platform_collection_version: 10.15.0 +platform_collection_version: 10.16.5 # indicates were this collection was downlaoded from (galaxy, automation_hub, standalone) ansible_marketplace: galaxy diff --git a/Ansible/ansible_collections/jfrog/platform/roles/postgres/defaults/main.yml b/Ansible/ansible_collections/jfrog/platform/roles/postgres/defaults/main.yml index 7772a8b1..9a729efb 100644 --- a/Ansible/ansible_collections/jfrog/platform/roles/postgres/defaults/main.yml +++ b/Ansible/ansible_collections/jfrog/platform/roles/postgres/defaults/main.yml @@ -7,6 +7,9 @@ postgres_listen_addresses: 0.0.0.0 # Default port of Postgres server postgres_port: 5432 +# Location of GPG key used to sign the RPMs +postgres_rpmkey_url: "https://download.postgresql.org/pub/repos/yum/keys/PGDG-RPM-GPG-KEY-RHEL" + # Server version in package: postgres_server_pkg_version: "{{ postgres_version | replace('.', '') }}" diff --git a/Ansible/ansible_collections/jfrog/platform/roles/postgres/tasks/RedHat.yml b/Ansible/ansible_collections/jfrog/platform/roles/postgres/tasks/RedHat.yml index db98a20d..110ebf34 100644 --- a/Ansible/ansible_collections/jfrog/platform/roles/postgres/tasks/RedHat.yml +++ b/Ansible/ansible_collections/jfrog/platform/roles/postgres/tasks/RedHat.yml @@ -37,7 +37,7 @@ - name: Import PostgreSQL GPG public key become: true ansible.builtin.rpm_key: - key: https://download.postgresql.org/pub/repos/yum/RPM-GPG-KEY-PGDG + key: "{{ postgres_rpmkey_url }}" state: present register: download_postgresql_key until: download_postgresql_key is success diff --git a/Ansible/ansible_collections/jfrog/platform/roles/postgres/tasks/install.yml b/Ansible/ansible_collections/jfrog/platform/roles/postgres/tasks/install.yml index d8b0c941..e6b9700b 100644 --- a/Ansible/ansible_collections/jfrog/platform/roles/postgres/tasks/install.yml +++ b/Ansible/ansible_collections/jfrog/platform/roles/postgres/tasks/install.yml @@ -1,3 +1,13 @@ +- name: Assert database username and password are defined + ansible.builtin.assert: + that: + - curr_user.username is defined + - curr_user.password is defined + loop: "{{ database | dict2items | map(attribute='value') | list }}" + loop_control: + loop_var: curr_user + when: curr_user.enabled | bool + - name: Define OS-specific variables ansible.builtin.include_vars: "{{ ansible_os_family }}.yml" diff --git a/Ansible/ansible_collections/jfrog/platform/roles/postgres/vars/Debian.yml b/Ansible/ansible_collections/jfrog/platform/roles/postgres/vars/Debian.yml index ebfeae85..ee4d18d3 100644 --- a/Ansible/ansible_collections/jfrog/platform/roles/postgres/vars/Debian.yml +++ b/Ansible/ansible_collections/jfrog/platform/roles/postgres/vars/Debian.yml @@ -6,4 +6,9 @@ default_postgresql_external_pid_file: /var/run/postgresql/{{ postgres_version }} default_postgres_apt_key_id: '0x7FCC7D46ACCC4CF8' default_postgres_apt_key_url: https://www.postgresql.org/media/keys/ACCC4CF8.asc -default_postgres_apt_repository_repo: deb https://apt.postgresql.org/pub/repos/apt/ {{ ansible_distribution_release }}-pgdg main +default_postgres_apt_repository_repo: >- + {%- if ansible_distribution_release == 'bionic' -%} + deb https://apt-archive.postgresql.org/pub/repos/apt {{ ansible_distribution_release }}-pgdg main + {%- else -%} + deb https://apt.postgresql.org/pub/repos/apt/ {{ ansible_distribution_release }}-pgdg main + {%- endif -%} \ No newline at end of file diff --git a/Ansible/ansible_collections/jfrog/platform/roles/xray/defaults/main.yml b/Ansible/ansible_collections/jfrog/platform/roles/xray/defaults/main.yml index b04d6050..56594190 100644 --- a/Ansible/ansible_collections/jfrog/platform/roles/xray/defaults/main.yml +++ b/Ansible/ansible_collections/jfrog/platform/roles/xray/defaults/main.yml @@ -1,7 +1,7 @@ # Defaults file for xray # The version of xray to install -xray_version: 3.82.6 +xray_version: 3.86.10 # Whether to enable HA xray_ha_enabled: false diff --git a/Ansible/ansible_collections/jfrog/platform/roles/xray/tasks/rabbitmq/setup/Debian.yml b/Ansible/ansible_collections/jfrog/platform/roles/xray/tasks/rabbitmq/setup/Debian.yml index 4c7b1143..ce1f4224 100644 --- a/Ansible/ansible_collections/jfrog/platform/roles/xray/tasks/rabbitmq/setup/Debian.yml +++ b/Ansible/ansible_collections/jfrog/platform/roles/xray/tasks/rabbitmq/setup/Debian.yml @@ -20,6 +20,15 @@ - ansible_distribution_release == 'xenial' - check_libssl_package_result.matched > 0 +- name: Gather the package facts + ansible.builtin.package_facts: + manager: auto + +- name: Check whether a package called socat is installed + ansible.builtin.debug: + msg: "{{ ansible_facts.packages['socat'] | length }} versions of socat are installed!" + when: "'socat' in ansible_facts.packages" + - name: Find socat package ansible.builtin.find: paths: "{{ xray_home }}/app/third-party/rabbitmq/" @@ -27,11 +36,14 @@ use_regex: true file_type: file register: check_socat_package_result + when: "'socat' not in ansible_facts.packages" - name: Set socat package file name ansible.builtin.set_fact: xray_socat_package: "{{ check_socat_package_result.files[0].path }}" - when: check_socat_package_result.matched > 0 + when: + - "'socat' not in ansible_facts.packages" + - check_socat_package_result.matched > 0 - name: Install socat package become: true @@ -39,7 +51,9 @@ ansible.builtin.apt: deb: "{{ xray_socat_package }}" register: install_socat_package_result - when: check_socat_package_result.matched > 0 + when: + - "'socat' not in ansible_facts.packages" + - check_socat_package_result.matched > 0 - name: Find erlang package ansible.builtin.find: diff --git a/Ansible/ansible_collections/jfrog/platform/roles/xray/vars/main.yml b/Ansible/ansible_collections/jfrog/platform/roles/xray/vars/main.yml index 1374cb9b..97870aac 100644 --- a/Ansible/ansible_collections/jfrog/platform/roles/xray/vars/main.yml +++ b/Ansible/ansible_collections/jfrog/platform/roles/xray/vars/main.yml @@ -1,5 +1,5 @@ # platform collection version -platform_collection_version: 10.15.0 +platform_collection_version: 10.16.5 # indicates were this collection was downlaoded from (galaxy, automation_hub, standalone) ansible_marketplace: galaxy diff --git a/Ansible/ansible_collections/jfrog/platform/xray.yml b/Ansible/ansible_collections/jfrog/platform/xray.yml index 026bdd35..dfe584e0 100644 --- a/Ansible/ansible_collections/jfrog/platform/xray.yml +++ b/Ansible/ansible_collections/jfrog/platform/xray.yml @@ -3,4 +3,5 @@ collections: - community.general roles: - - xray + - role: xray + when: xray_enabled | bool diff --git a/Openshift4/helm/openshift-artifactory-ha/CHANGELOG.md b/Openshift4/helm/openshift-artifactory-ha/CHANGELOG.md index 507bfc73..bac10f5f 100755 --- a/Openshift4/helm/openshift-artifactory-ha/CHANGELOG.md +++ b/Openshift4/helm/openshift-artifactory-ha/CHANGELOG.md @@ -1,6 +1,9 @@ # JFrog Openshift Artifactory-ha Chart Changelog All changes to this chart will be documented in this file. +## [107.71.5] - Nov 22, 2023 +* Updating to latest jfrog/artifactory-ha helm chart version 107.71.5 artifactory version 7.71.5 + ## [107.59.11] - Jul 01, 2023 * Updating to latest jfrog/artifactory-ha helm chart version 107.59.11 artifactory version 7.59.11 diff --git a/Openshift4/helm/openshift-artifactory-ha/Chart.lock b/Openshift4/helm/openshift-artifactory-ha/Chart.lock index 4b7cca91..cb590108 100644 --- a/Openshift4/helm/openshift-artifactory-ha/Chart.lock +++ b/Openshift4/helm/openshift-artifactory-ha/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: artifactory-ha repository: https://charts.jfrog.io/ - version: 107.59.11 -digest: sha256:db297e6303ab99e3020c22f4de8b2993923f8f65efeb67e610a1883b2c394f2d -generated: "2023-07-01T07:19:21.566291+05:30" + version: 107.71.5 +digest: sha256:aefe89dd52b41feab8744741683df1d01e2ab6bc289ca039a1640b901d16e1f4 +generated: "2023-11-22T14:42:06.928341+05:30" diff --git a/Openshift4/helm/openshift-artifactory-ha/Chart.yaml b/Openshift4/helm/openshift-artifactory-ha/Chart.yaml index 77fb3e1f..1f7b61cb 100755 --- a/Openshift4/helm/openshift-artifactory-ha/Chart.yaml +++ b/Openshift4/helm/openshift-artifactory-ha/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: 7.59.11 +appVersion: 7.71.5 dependencies: - name: artifactory-ha - version: 107.59.11 + version: 107.71.5 repository: https://charts.jfrog.io/ description: Openshift JFrog Artifactory HA subcharting Artifactory HA to work in Openshift environment home: https://www.jfrog.com/artifactory/ @@ -20,4 +20,4 @@ name: openshift-artifactory-ha sources: - https://bintray.com/jfrog/product/JFrog-Artifactory-Pro/view - https://github.com/jfrog/charts -version: 107.59.11 +version: 107.71.5 diff --git a/Openshift4/helm/openshift-artifactory-ha/values.yaml b/Openshift4/helm/openshift-artifactory-ha/values.yaml index ec8343a9..7194ab33 100755 --- a/Openshift4/helm/openshift-artifactory-ha/values.yaml +++ b/Openshift4/helm/openshift-artifactory-ha/values.yaml @@ -10,7 +10,7 @@ artifactory-ha: url: "OVERRIDE" user: "OVERRIDE" password: "OVERRIDE" - initContainerImage: registry.connect.redhat.com/jfrog/init:7.59.11 + initContainerImage: registry.connect.redhat.com/jfrog/init:7.71.5 waitForDatabase: true installerInfo: '{ "productId": "Openshift_artifactory-ha/{{ .Chart.Version }}", "features": [ { "featureId": "ArtifactoryVersion/{{ default .Chart.AppVersion .Values.artifactory.image.version }}" }, { "featureId": "{{ if .Values.postgresql.enabled }}postgresql{{ else }}{{ .Values.database.type }}{{ end }}/0.0.0" }, { "featureId": "Platform/Openshift" }, { "featureId": "Partner/ACC-006983" }, { "featureId": "Channel/Openshift" } ] }' artifactory: @@ -19,7 +19,7 @@ artifactory-ha: image: registry: registry.connect.redhat.com repository: jfrog/artifactory-pro - tag: 7.59.11 + tag: 7.71.5 node: replicaCount: 2 waitForPrimaryStartup: diff --git a/Openshift4/helm/openshift-xray/CHANGELOG.md b/Openshift4/helm/openshift-xray/CHANGELOG.md index 58082dc3..7c12c322 100644 --- a/Openshift4/helm/openshift-xray/CHANGELOG.md +++ b/Openshift4/helm/openshift-xray/CHANGELOG.md @@ -1,6 +1,9 @@ # JFrog Openshift Artifactory-Xray Chart Changelog All changes to this chart will be documented in this file. +## [103.85.5] Nov 22, 2023 +* Updating to Xray chart version 103.85.5 and Xray app version 3.85.5 + ## [103.76.7] Jul 01, 2023 * Updating to Xray chart version 103.76.7 and Xray app version 3.76.7 diff --git a/Openshift4/helm/openshift-xray/Chart.lock b/Openshift4/helm/openshift-xray/Chart.lock index f270bdb0..819af7e6 100644 --- a/Openshift4/helm/openshift-xray/Chart.lock +++ b/Openshift4/helm/openshift-xray/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: xray repository: https://charts.jfrog.io/ - version: 103.76.7 -digest: sha256:89b1379dc0987f379a119587927e4d83b96435b17b6521834e2ba1597619b0fc -generated: "2023-07-01T07:16:53.336316+05:30" + version: 103.85.5 +digest: sha256:67c63c7a5fd0b3b16c9b93d568184a4693b76034148924c9509a559707edab9d +generated: "2023-11-22T14:47:02.076277+05:30" diff --git a/Openshift4/helm/openshift-xray/Chart.yaml b/Openshift4/helm/openshift-xray/Chart.yaml index 85a55101..a82e16e6 100644 --- a/Openshift4/helm/openshift-xray/Chart.yaml +++ b/Openshift4/helm/openshift-xray/Chart.yaml @@ -1,9 +1,9 @@ apiVersion: v2 -appVersion: 3.76.7 +appVersion: 3.85.5 description: Universal component scan for security and license inventory and impact analysis dependencies: - name: xray - version: 103.76.7 + version: 103.85.5 repository: https://charts.jfrog.io/ sources: - https://bintray.com/jfrog/product/xray/view @@ -17,4 +17,4 @@ maintainers: - email: johnp@jfrog.com name: John Peterson name: openshift-xray -version: 103.76.7 +version: 103.85.5 diff --git a/Openshift4/helm/openshift-xray/values.yaml b/Openshift4/helm/openshift-xray/values.yaml index 382a8906..3f42e0c0 100755 --- a/Openshift4/helm/openshift-xray/values.yaml +++ b/Openshift4/helm/openshift-xray/values.yaml @@ -11,13 +11,13 @@ xray: url: "OVERRIDE" user: "OVERRIDE" password: "OVERRIDE" - initContainerImage: registry.connect.redhat.com/jfrog/init:7.59.11 + initContainerImage: registry.connect.redhat.com/jfrog/init:7.71.5 common: rabbitmq: connectionConfigFromEnvironment: true xrayUserId: "1000721035" xrayGroupId: "1000721035" - xrayVersion: "3.76.7" + xrayVersion: "3.85.5" customInitContainers: | - name: "prepare-uid-persistent-volume" image: "{{ .Values.initContainerImage }}" @@ -71,7 +71,7 @@ xray: registry: registry.connect.redhat.com repository: jfrog/xray-router imagePullPolicy: IfNotPresent - tag: 3.76.7 + tag: 3.85.5 # RabbitMQ ## Configuration values for the rabbitmq dependency @@ -85,7 +85,7 @@ xray: image: registry: registry.connect.redhat.com repository: jfrog/xray-rabbitmq - tag: 3.71.6 + tag: 3.85.5 podSecurityContext: fsGroup: 1000721001 diff --git a/Openshift4/operator/artifactory-ha-operator/CHANGELOG.md b/Openshift4/operator/artifactory-ha-operator/CHANGELOG.md index 05d975f7..a0185844 100755 --- a/Openshift4/operator/artifactory-ha-operator/CHANGELOG.md +++ b/Openshift4/operator/artifactory-ha-operator/CHANGELOG.md @@ -2,6 +2,10 @@ All changes to this chart will be documented in this file. +## [1.2.5] - Nov 22, 2023 + +- Updating Operator to latest jfrog/artifactory-ha helm chart version 107.71.5 artifactory version 7.71.5 + ## [1.2.4] - Mar 06, 2023 - Updating Operator to latest jfrog/artifactory-ha helm chart version 107.59.11 artifactory version 7.59.11 diff --git a/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/CHANGELOG.md b/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/CHANGELOG.md index 507bfc73..bac10f5f 100755 --- a/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/CHANGELOG.md +++ b/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/CHANGELOG.md @@ -1,6 +1,9 @@ # JFrog Openshift Artifactory-ha Chart Changelog All changes to this chart will be documented in this file. +## [107.71.5] - Nov 22, 2023 +* Updating to latest jfrog/artifactory-ha helm chart version 107.71.5 artifactory version 7.71.5 + ## [107.59.11] - Jul 01, 2023 * Updating to latest jfrog/artifactory-ha helm chart version 107.59.11 artifactory version 7.59.11 diff --git a/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/Chart.lock b/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/Chart.lock index 4b7cca91..cb590108 100644 --- a/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/Chart.lock +++ b/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: artifactory-ha repository: https://charts.jfrog.io/ - version: 107.59.11 -digest: sha256:db297e6303ab99e3020c22f4de8b2993923f8f65efeb67e610a1883b2c394f2d -generated: "2023-07-01T07:19:21.566291+05:30" + version: 107.71.5 +digest: sha256:aefe89dd52b41feab8744741683df1d01e2ab6bc289ca039a1640b901d16e1f4 +generated: "2023-11-22T14:42:06.928341+05:30" diff --git a/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/Chart.yaml b/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/Chart.yaml index 77fb3e1f..1f7b61cb 100755 --- a/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/Chart.yaml +++ b/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: 7.59.11 +appVersion: 7.71.5 dependencies: - name: artifactory-ha - version: 107.59.11 + version: 107.71.5 repository: https://charts.jfrog.io/ description: Openshift JFrog Artifactory HA subcharting Artifactory HA to work in Openshift environment home: https://www.jfrog.com/artifactory/ @@ -20,4 +20,4 @@ name: openshift-artifactory-ha sources: - https://bintray.com/jfrog/product/JFrog-Artifactory-Pro/view - https://github.com/jfrog/charts -version: 107.59.11 +version: 107.71.5 diff --git a/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/values.yaml b/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/values.yaml index ec8343a9..7194ab33 100755 --- a/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/values.yaml +++ b/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/values.yaml @@ -10,7 +10,7 @@ artifactory-ha: url: "OVERRIDE" user: "OVERRIDE" password: "OVERRIDE" - initContainerImage: registry.connect.redhat.com/jfrog/init:7.59.11 + initContainerImage: registry.connect.redhat.com/jfrog/init:7.71.5 waitForDatabase: true installerInfo: '{ "productId": "Openshift_artifactory-ha/{{ .Chart.Version }}", "features": [ { "featureId": "ArtifactoryVersion/{{ default .Chart.AppVersion .Values.artifactory.image.version }}" }, { "featureId": "{{ if .Values.postgresql.enabled }}postgresql{{ else }}{{ .Values.database.type }}{{ end }}/0.0.0" }, { "featureId": "Platform/Openshift" }, { "featureId": "Partner/ACC-006983" }, { "featureId": "Channel/Openshift" } ] }' artifactory: @@ -19,7 +19,7 @@ artifactory-ha: image: registry: registry.connect.redhat.com repository: jfrog/artifactory-pro - tag: 7.59.11 + tag: 7.71.5 node: replicaCount: 2 waitForPrimaryStartup: diff --git a/Openshift4/operator/xray-operator/CHANGELOG.md b/Openshift4/operator/xray-operator/CHANGELOG.md index 5a2d2c0b..85e7ea82 100644 --- a/Openshift4/operator/xray-operator/CHANGELOG.md +++ b/Openshift4/operator/xray-operator/CHANGELOG.md @@ -2,6 +2,10 @@ All changes to this chart will be documented in this file. +## [2.1.4] Nov 22, 2023 + +- Deploying JFrog Xray 3.85.5 as an Operator into Openshift + ## [2.1.3] Jul 06, 2023 - Deploying JFrog Xray 3.76.7 as an Operator into Openshift diff --git a/Openshift4/operator/xray-operator/helm-charts/openshift-xray/CHANGELOG.md b/Openshift4/operator/xray-operator/helm-charts/openshift-xray/CHANGELOG.md index 58082dc3..7c12c322 100644 --- a/Openshift4/operator/xray-operator/helm-charts/openshift-xray/CHANGELOG.md +++ b/Openshift4/operator/xray-operator/helm-charts/openshift-xray/CHANGELOG.md @@ -1,6 +1,9 @@ # JFrog Openshift Artifactory-Xray Chart Changelog All changes to this chart will be documented in this file. +## [103.85.5] Nov 22, 2023 +* Updating to Xray chart version 103.85.5 and Xray app version 3.85.5 + ## [103.76.7] Jul 01, 2023 * Updating to Xray chart version 103.76.7 and Xray app version 3.76.7 diff --git a/Openshift4/operator/xray-operator/helm-charts/openshift-xray/Chart.lock b/Openshift4/operator/xray-operator/helm-charts/openshift-xray/Chart.lock index f270bdb0..819af7e6 100644 --- a/Openshift4/operator/xray-operator/helm-charts/openshift-xray/Chart.lock +++ b/Openshift4/operator/xray-operator/helm-charts/openshift-xray/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: xray repository: https://charts.jfrog.io/ - version: 103.76.7 -digest: sha256:89b1379dc0987f379a119587927e4d83b96435b17b6521834e2ba1597619b0fc -generated: "2023-07-01T07:16:53.336316+05:30" + version: 103.85.5 +digest: sha256:67c63c7a5fd0b3b16c9b93d568184a4693b76034148924c9509a559707edab9d +generated: "2023-11-22T14:47:02.076277+05:30" diff --git a/Openshift4/operator/xray-operator/helm-charts/openshift-xray/Chart.yaml b/Openshift4/operator/xray-operator/helm-charts/openshift-xray/Chart.yaml index 85a55101..a82e16e6 100644 --- a/Openshift4/operator/xray-operator/helm-charts/openshift-xray/Chart.yaml +++ b/Openshift4/operator/xray-operator/helm-charts/openshift-xray/Chart.yaml @@ -1,9 +1,9 @@ apiVersion: v2 -appVersion: 3.76.7 +appVersion: 3.85.5 description: Universal component scan for security and license inventory and impact analysis dependencies: - name: xray - version: 103.76.7 + version: 103.85.5 repository: https://charts.jfrog.io/ sources: - https://bintray.com/jfrog/product/xray/view @@ -17,4 +17,4 @@ maintainers: - email: johnp@jfrog.com name: John Peterson name: openshift-xray -version: 103.76.7 +version: 103.85.5 diff --git a/Openshift4/operator/xray-operator/helm-charts/openshift-xray/values.yaml b/Openshift4/operator/xray-operator/helm-charts/openshift-xray/values.yaml index 382a8906..3f42e0c0 100755 --- a/Openshift4/operator/xray-operator/helm-charts/openshift-xray/values.yaml +++ b/Openshift4/operator/xray-operator/helm-charts/openshift-xray/values.yaml @@ -11,13 +11,13 @@ xray: url: "OVERRIDE" user: "OVERRIDE" password: "OVERRIDE" - initContainerImage: registry.connect.redhat.com/jfrog/init:7.59.11 + initContainerImage: registry.connect.redhat.com/jfrog/init:7.71.5 common: rabbitmq: connectionConfigFromEnvironment: true xrayUserId: "1000721035" xrayGroupId: "1000721035" - xrayVersion: "3.76.7" + xrayVersion: "3.85.5" customInitContainers: | - name: "prepare-uid-persistent-volume" image: "{{ .Values.initContainerImage }}" @@ -71,7 +71,7 @@ xray: registry: registry.connect.redhat.com repository: jfrog/xray-router imagePullPolicy: IfNotPresent - tag: 3.76.7 + tag: 3.85.5 # RabbitMQ ## Configuration values for the rabbitmq dependency @@ -85,7 +85,7 @@ xray: image: registry: registry.connect.redhat.com repository: jfrog/xray-rabbitmq - tag: 3.71.6 + tag: 3.85.5 podSecurityContext: fsGroup: 1000721001