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.

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

Fix Organizational Azure ARM template #2028

Merged
merged 11 commits into from
Mar 13, 2024

Conversation

kubasobon
Copy link
Member

Summary of your changes

Fix colliding role UUIDs and a couple of minor issues.

Related Issues

Related to #1974

Checklist

  • I have added tests that prove my fix is effective or that my feature works
  • I have added the necessary README/documentation (if appropriate)

Introducing a new rule?

@kubasobon kubasobon requested a review from a team as a code owner March 11, 2024 15:32
@kubasobon kubasobon self-assigned this Mar 11, 2024
Copy link

mergify bot commented Mar 11, 2024

This pull request does not have a backport label. Could you fix it @kubasobon? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-v./d./d./d is the label to automatically backport to the 8./d branch. /d is the digit
    NOTE: backport-skip has been added to this pull request.

Copy link

github-actions bot commented Mar 11, 2024

❌ No tests were run ❌

@mergify mergify bot removed the backport-skip label Mar 11, 2024
@kubasobon
Copy link
Member Author

Tested on Azure:
image
image

@orouz
Copy link
Collaborator

orouz commented Mar 12, 2024

i'll leave commenting/approving on the main changes for someone more knowledgeable about the specifics, but note that for the backport to 8.13, this:

"https://raw.githubusercontent.com/elastic/cloudbeat/main/deploy/azure/install-agent.sh"

will need to be changed to this:

"https://raw.githubusercontent.com/elastic/cloudbeat/8.13/deploy/azure/install-agent.sh"

main -> 8.13

@kubasobon
Copy link
Member Author

kubasobon commented Mar 12, 2024

@orouz I'll make sure to check. Since I don't touch that line and it is set correctly in the 8.13 branch, I think we will be fine.

https://github.com/elastic/cloudbeat/blob/8.13/deploy/azure/ARM-for-organization-account.json#L375

@kubasobon kubasobon enabled auto-merge (squash) March 13, 2024 09:07
@kubasobon kubasobon disabled auto-merge March 13, 2024 15:16
@kubasobon kubasobon merged commit 36b608b into elastic:main Mar 13, 2024
27 checks passed
@kubasobon kubasobon deleted the fix-azure-arm-org branch March 13, 2024 15:41
mergify bot pushed a commit that referenced this pull request Mar 13, 2024
kubasobon added a commit that referenced this pull request Mar 13, 2024
Fix Organizational Azure ARM template (#2028)

(cherry picked from commit 36b608b)

Co-authored-by: Kuba Soboń <wtty.fool@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants