Skip to content

Commit

Permalink
Forward Logs
Browse files Browse the repository at this point in the history
  • Loading branch information
engedaam committed Apr 23, 2024
1 parent 67a88b7 commit 6605a34
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 7 deletions.
15 changes: 10 additions & 5 deletions .github/actions/e2e/setup-cluster/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ inputs:
default: "1.29"
eksctl_version:
description: "Version of eksctl to install"
default: v0.169.0
default: v0.175.0
ip_family:
description: "IP Family of the cluster. Valid values are IPv4 or IPv6"
default: "IPv4"
Expand Down Expand Up @@ -152,11 +152,9 @@ runs:
minSize: 2
maxSize: 2
iam:
withAddonPolicies:
cloudWatch: true
instanceRolePermissionsBoundary: "arn:aws:iam::$ACCOUNT_ID:policy/GithubActionsPermissionsBoundary"
taints:
- key: CriticalAddonsOnly
value: "true"
effect: NoSchedule
cloudWatch:
clusterLogging:
enableTypes: ["*"]
Expand All @@ -175,6 +173,8 @@ runs:
$KARPENTER_IAM
withOIDC: true
addons:
- name: amazon-cloudwatch-observability
permissionsBoundary: "arn:aws:iam::$ACCOUNT_ID:policy/GithubActionsPermissionsBoundary"
- name: vpc-cni
permissionsBoundary: "arn:aws:iam::$ACCOUNT_ID:policy/GithubActionsPermissionsBoundary"
- name: coredns
Expand Down Expand Up @@ -211,6 +211,11 @@ runs:
else
eksctl ${cmd} cluster -f clusterconfig.yaml
fi
# Adding taints after all necessary pods have scheduled to the manged node group nodes
# amazon-cloudwatch-observability pods do no not tolerate CriticalAddonsOnly=true:NoSchedule and
# EKS addons does not allow to add tolerations to the addon pods as part of the advanced configuration
kubectl taint nodes CriticalAddonsOnly=true:NoSchedule --all
- name: tag oidc provider of the cluster
if: always()
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-upgrade.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ jobs:
region: ${{ inputs.region }}
cluster_name: ${{ steps.generate-cluster-name.outputs.CLUSTER_NAME }}
k8s_version: ${{ inputs.k8s_version }}
eksctl_version: v0.169.0
eksctl_version: v0.175.0
ip_family: IPv4 # Set the value to IPv6 if IPv6 suite, else IPv4
git_ref: ${{ inputs.from_git_ref }}
ecr_account_id: ${{ vars.SNAPSHOT_ACCOUNT_ID }}
Expand Down
11 changes: 10 additions & 1 deletion .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ jobs:
region: ${{ inputs.region }}
cluster_name: ${{ steps.generate-cluster-name.outputs.CLUSTER_NAME }}
k8s_version: ${{ inputs.k8s_version }}
eksctl_version: v0.169.0
eksctl_version: v0.175.0
ip_family: ${{ contains(inputs.suite, 'IPv6') && 'IPv6' || 'IPv4' }} # Set the value to IPv6 if IPv6 suite, else IPv4
private_cluster: ${{ inputs.workflow_trigger == 'private_cluster' }}
git_ref: ${{ inputs.git_ref }}
Expand Down Expand Up @@ -187,6 +187,15 @@ jobs:
suite: ${{ inputs.suite }}
git_ref: ${{ inputs.git_ref }}
workflow_trigger: ${{ inputs.workflow_trigger }}
- name: log retention policy
if: ${{ inputs.workflow_trigger != 'private_cluster' }}
env:
CLUSTER_NAME: ${{ inputs.cluster_name }}
run: |

Check failure on line 194 in .github/workflows/e2e.yaml

View workflow job for this annotation

GitHub Actions / ci

shellcheck reported issue in this script: SC2086:info:1:71: Double quote to prevent globbing and word splitting

Check failure on line 194 in .github/workflows/e2e.yaml

View workflow job for this annotation

GitHub Actions / ci

shellcheck reported issue in this script: SC2086:info:2:71: Double quote to prevent globbing and word splitting

Check failure on line 194 in .github/workflows/e2e.yaml

View workflow job for this annotation

GitHub Actions / ci

shellcheck reported issue in this script: SC2086:info:3:71: Double quote to prevent globbing and word splitting

Check failure on line 194 in .github/workflows/e2e.yaml

View workflow job for this annotation

GitHub Actions / ci

shellcheck reported issue in this script: SC2086:info:4:71: Double quote to prevent globbing and word splitting
aws logs put-retention-policy --log-group-name /aws/containerinsights/$CLUSTER_NAME/application --retention-in-days 30
aws logs put-retention-policy --log-group-name /aws/containerinsights/$CLUSTER_NAME/dataplane --retention-in-days 30
aws logs put-retention-policy --log-group-name /aws/containerinsights/$CLUSTER_NAME/host --retention-in-days 30
aws logs put-retention-policy --log-group-name /aws/containerinsights/$CLUSTER_NAME/performance --retention-in-days 30
- name: dump logs on failure
uses: ./.github/actions/e2e/dump-logs
if: (failure() || cancelled()) && inputs.workflow_trigger != 'private_cluster'
Expand Down

0 comments on commit 6605a34

Please sign in to comment.