Skip to content
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.

Sign up for GitHub

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

Add fips canaries #1988

Merged
merged 2 commits into from
Jan 10, 2025
Merged

Add fips canaries #1988

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c91f233
Add fips canaries
alvarocabanas Jan 9, 2025
8261196
Condition Fips canary previous to have a second release
alvarocabanas Jan 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/component_canaries.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ jobs:
runs-on: ubuntu-20.04
if: ${{ inputs.PLATFORM == 'macos' }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1
uses: aws-actions/configure-aws-credentials@v4
with:
role-to-assume: ${{ env.AWS_ASSUME_ROLE }}
aws-region: us-east-2
Expand Down Expand Up @@ -68,10 +68,10 @@ jobs:
runs-on: ubuntu-20.04
if: ${{ inputs.PLATFORM == 'linux' }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1
uses: aws-actions/configure-aws-credentials@v4
with:
role-to-assume: ${{ env.AWS_ASSUME_ROLE }}
aws-region: us-east-2
Expand Down Expand Up @@ -130,10 +130,10 @@ jobs:
runs-on: ubuntu-20.04
if: ${{ inputs.PLATFORM == 'windows' }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1
uses: aws-actions/configure-aws-credentials@v4
with:
role-to-assume: ${{ env.AWS_ASSUME_ROLE }}
aws-region: us-east-2
Expand Down
10 changes: 6 additions & 4 deletions test/canaries/deploy_canaries.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,27 +19,29 @@
block:

- name: install latest agent on host
include_role:
ansible.builtin.include_role:
name: caos.ansible_roles.infra_agent
vars:
target_version: "{{ current_version }}"
repo_endpoint: "http://nr-downloads-ohai-staging.s3-website-us-east-1.amazonaws.com/infrastructure_agent"
fips_enabled: "{{ '-fips' in inventory_hostname }}"
alvarocabanas marked this conversation as resolved.
Show resolved Hide resolved

- name: install latest agent in container
include_role:
ansible.builtin.include_role:
name: caos.ansible_roles.infra_agent
vars:
is_containerized: true
target_version: "{{ current_version }}-rc"
display_name: "{{ inventory_hostname }}-current"
fips_enabled: "{{ '-fips' in inventory_hostname }}"

- name: install previous agent in container
rajrohanyadav marked this conversation as resolved.
Show resolved Hide resolved
include_role:
ansible.builtin.include_role:
name: caos.ansible_roles.infra_agent
vars:
is_containerized: true
target_version: "{{ previous_version }}"
display_name: "{{ inventory_hostname }}-previous"
fips_enabled: "{{ '-fips' in inventory_hostname }}"

# Windows
- name: installation-agent-no-clean
Expand Down
12 changes: 1 addition & 11 deletions test/packaging/ansible/installation-pinned.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,12 @@

block:
- name: Install agent
# when: "'-fips' not in inventory_hostname"
ansible.builtin.include_role:
name: caos.ansible_roles.infra_agent
vars:
target_version: "{{ target_agent_version }}"
repo_endpoint: "http://nr-downloads-ohai-staging.s3-website-us-east-1.amazonaws.com/infrastructure_agent"

# TODO: https://new-relic.atlassian.net/browse/NR-355845 Uncomment when FIPS version is available for the minimum version
# - name: Install agent - FIPS
# when: "'-fips' in inventory_hostname"
# ansible.builtin.include_role:
# name: caos.ansible_roles.infra_agent
# vars:
# target_version: "{{ target_agent_version }}"
# repo_endpoint: "http://nr-downloads-ohai-staging.s3-website-us-east-1.amazonaws.com/infrastructure_agent"
# fips_enabled: true
fips_enabled: "{{ '-fips' in inventory_hostname }}"
rajrohanyadav marked this conversation as resolved.
Show resolved Hide resolved

- name: Assert version
ansible.builtin.include_role:
Expand Down
10 changes: 1 addition & 9 deletions test/packaging/ansible/installation-privileged.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,11 @@

block:
- name: Install agent
when: "'-fips' not in inventory_hostname"
ansible.builtin.include_role:
name: caos.ansible_roles.infra_agent
vars:
repo_endpoint: "http://nr-downloads-ohai-staging.s3-website-us-east-1.amazonaws.com/infrastructure_agent"

- name: Install agent - FIPS
when: "'-fips' in inventory_hostname"
ansible.builtin.include_role:
name: caos.ansible_roles.infra_agent
vars:
repo_endpoint: "http://nr-downloads-ohai-staging.s3-website-us-east-1.amazonaws.com/infrastructure_agent"
fips_enabled: true
fips_enabled: "{{ '-fips' in inventory_hostname }}"

- name: Assert privileged caps
ansible.builtin.include_role:
Expand Down
10 changes: 1 addition & 9 deletions test/packaging/ansible/installation-root.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,11 @@
block:

- name: Install agent
when: "'-fips' not in inventory_hostname"
ansible.builtin.include_role:
name: caos.ansible_roles.infra_agent
vars:
repo_endpoint: "http://nr-downloads-ohai-staging.s3-website-us-east-1.amazonaws.com/infrastructure_agent"

- name: Install agent - FIPS
when: "'-fips' in inventory_hostname"
ansible.builtin.include_role:
name: caos.ansible_roles.infra_agent
vars:
repo_endpoint: "http://nr-downloads-ohai-staging.s3-website-us-east-1.amazonaws.com/infrastructure_agent"
fips_enabled: true
fips_enabled: "{{ '-fips' in inventory_hostname }}"

- name: Assert root
ansible.builtin.include_role:
Expand Down
9 changes: 1 addition & 8 deletions test/packaging/ansible/installation-unprivileged.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,7 @@
name: caos.ansible_roles.infra_agent
vars:
repo_endpoint: "http://nr-downloads-ohai-staging.s3-website-us-east-1.amazonaws.com/infrastructure_agent"

- name: Install agent - FIPS
when: "'-fips' in inventory_hostname"
ansible.builtin.include_role:
name: caos.ansible_roles.infra_agent
vars:
repo_endpoint: "http://nr-downloads-ohai-staging.s3-website-us-east-1.amazonaws.com/infrastructure_agent"
fips_enabled: true
fips_enabled: "{{ '-fips' in inventory_hostname }}"

- name: Assert no privileged caps
ansible.builtin.include_role:
Expand Down
11 changes: 1 addition & 10 deletions test/packaging/ansible/shutdown-and-terminate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,12 @@

tasks:
- name: Install agent
when: "'-fips' not in inventory_hostname"
ansible.builtin.include_role:
name: caos.ansible_roles.infra_agent
vars:
display_name: "{{ iid }}:{{ inventory_hostname }}"
repo_endpoint: "http://nr-downloads-ohai-staging.s3-website-us-east-1.amazonaws.com/infrastructure_agent"

- name: Install agent - FIPS
when: "'-fips' in inventory_hostname"
ansible.builtin.include_role:
name: caos.ansible_roles.infra_agent
vars:
display_name: "{{ iid }}:{{ inventory_hostname }}"
repo_endpoint: "http://nr-downloads-ohai-staging.s3-website-us-east-1.amazonaws.com/infrastructure_agent"
fips_enabled: true
fips_enabled: "{{ '-fips' in inventory_hostname }}"

- name: Install agent windows (HNR)
hosts: testing_hosts_windows
Expand Down
Loading