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: Correct fargate-fluentbit example usage #1131

Merged
merged 1 commit into from
Nov 4, 2022

Conversation

bryantbiggs
Copy link
Contributor

What does this PR do?

  • Remove self-managed node group and Fargate profile from complete-kubernetes-addons
  • Remove fargate-fluentbit example usage; this is shown in the fargate-serverless example

Motivation

More

  • Yes, I have tested the PR using my local account setup (Provide any test evidence report under Additional Notes)
  • Yes, I have added a new example under examples to support my PR
  • Yes, I have created another PR for add-ons under add-ons repo (if applicable)
  • Yes, I have updated the docs for this feature
  • Yes, I ran pre-commit run -a with this PR

Note: Not all the PRs require a new example and/or doc page. In general:

  • Use an existing example when possible to demonstrate a new addons usage
  • A new docs page under docs/add-ons/* is required for new a new addon

For Moderators

  • E2E Test successfully complete before merge?

Additional Notes

@bryantbiggs bryantbiggs temporarily deployed to EKS Blueprints Test November 4, 2022 17:38 Inactive
@@ -96,35 +96,6 @@ module "eks_blueprints" {
}
}

self_managed_node_groups = {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not necessary to have all 3 compute types here for "complete addons"

@@ -159,13 +130,6 @@ module "eks_blueprints_kubernetes_addons" {
enable_aws_for_fluentbit = true
aws_for_fluentbit_cw_log_group_retention = 30
aws_for_fluentbit_helm_config = {
name = "aws-for-fluent-bit"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just showing the bits that are custom

@@ -178,41 +142,6 @@ module "eks_blueprints_kubernetes_addons" {
]
}

enable_fargate_fluentbit = true
fargate_fluentbit_addon_config = {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is nearly (99.9%) identical to the defaults so removing entirely. usage of this addon is still shown though in the fargate-serverless example

@@ -268,12 +197,3 @@ module "vpc" {

tags = local.tags
}

data "aws_ami" "eks" {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

was used on self-managed node group thats removed

@@ -121,6 +121,9 @@ module "eks_blueprints_kubernetes_addons" {

# Enable Fargate logging
enable_fargate_fluentbit = true
fargate_fluentbit_addon_config = {
flb_log_cw = true
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

from recent PR #1129

Copy link
Contributor

@askulkarni2 askulkarni2 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lgtm!

@bryantbiggs bryantbiggs merged commit e6cc26a into main Nov 4, 2022
@bryantbiggs bryantbiggs deleted the fix/fargate-fluentbig-logs branch November 4, 2022 18:04
allamand pushed a commit to allamand/terraform-aws-eks-blueprints that referenced this pull request Dec 15, 2022
allamand pushed a commit to allamand/terraform-aws-eks-blueprints that referenced this pull request Jan 10, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Cannot Create Log Stream due to Double Quote
3 participants