Skip to content

Commit

Permalink
Merge pull request #56 from clouddrove/feat/issue-229
Browse files Browse the repository at this point in the history
features and bugfix
  • Loading branch information
anmolnagpal authored Aug 7, 2023
2 parents 0bb4afa + cbeab87 commit 4c616f2
Show file tree
Hide file tree
Showing 25 changed files with 993 additions and 518 deletions.
6 changes: 3 additions & 3 deletions .github/dependbot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ updates:
reviewers:
- "approvers"
- package-ecosystem: "terraform" # See documentation for possible values
directory: "example/aws_managed" # Location of package manifests
directory: "_example/aws_managed" # Location of package manifests
schedule:
interval: "weekly"
# Add assignees
Expand All @@ -25,7 +25,7 @@ updates:
reviewers:
- "approvers"
- package-ecosystem: "terraform" # See documentation for possible values
directory: "example/complete" # Location of package manifests
directory: "_example/complete" # Location of package manifests
schedule:
interval: "weekly"
# Add assignees
Expand All @@ -35,7 +35,7 @@ updates:
reviewers:
- "approvers"
- package-ecosystem: "terraform" # See documentation for possible values
directory: "example/self_managed" # Location of package manifests
directory: "_example/self_managed" # Location of package manifests
schedule:
interval: "weekly"
# Add assignees
Expand Down
12 changes: 12 additions & 0 deletions .github/workflows/auto_assignee.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: Auto Assign PRs
on:
pull_request:
types: [opened, reopened]
workflow_dispatch:
jobs:
assignee:
uses: clouddrove/github-shared-workflows/.github/workflows/auto_assignee.yml@master
secrets:
GITHUB: ${{ secrets.GITHUB }}
with:
assignees: 'clouddrove-ci'
15 changes: 7 additions & 8 deletions .github/workflows/readme.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,35 +3,34 @@ on:
push:
branches:
- master

jobs:
readme-create:
readme:
name: 'readme-create'
runs-on: ubuntu-latest
steps:
- name: 'Checkout'
uses: actions/checkout@master

- name: 'Set up Python 3.7'
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: '3.x'

- name: 'create readme'
uses: 'clouddrove/github-actions@v9.0.2'
with:
actions_subcommand: 'readme'
github_token: '${{ secrets.GITHUB}}'
github_token: '${{ secrets.GITHUB }}'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN}}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}


- name: 'pre-commit check errors'
uses: pre-commit/action@v2.0.0
uses: pre-commit/action@v3.0.0
continue-on-error: true

- name: 'pre-commit fix erros'
uses: pre-commit/action@v2.0.0
uses: pre-commit/action@v3.0.0
continue-on-error: true

- name: 'push readme'
Expand All @@ -40,7 +39,7 @@ jobs:
with:
actions_subcommand: 'push'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN}}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: 'Slack Notification'
uses: clouddrove/action-slack@v2
Expand Down
86 changes: 0 additions & 86 deletions .github/workflows/terraform.yml

This file was deleted.

40 changes: 0 additions & 40 deletions .github/workflows/terratest.yml

This file was deleted.

19 changes: 19 additions & 0 deletions .github/workflows/tf-checks.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: tf-checks
on:
push:
branches: [ master ]
pull_request:
workflow_dispatch:
jobs:
tf-checks-aws-managed-example:
uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@master
with:
working_directory: './_example/aws_managed/'
tf-checks-complete-example:
uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@master
with:
working_directory: './_example/complete/'
tf-checks-self-managed-example:
uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@master
with:
working_directory: './_example/self_managed/'
11 changes: 11 additions & 0 deletions .github/workflows/tflint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
name: tf-lint
on:
push:
branches: [ master ]
pull_request:
workflow_dispatch:
jobs:
tf-lint:
uses: clouddrove/github-shared-workflows/.github/workflows/tf-lint.yml@master
secrets:
GITHUB: ${{ secrets.GITHUB }}
29 changes: 12 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ environment = "test"
label_order = ["environment", "name"]
enabled = true
kubernetes_version = "1.25"
kubernetes_version = "1.27"
endpoint_private_access = true
endpoint_public_access = true
enabled_cluster_log_types = ["api", "audit", "authenticator", "controllerManager", "scheduler"]
Expand Down Expand Up @@ -154,16 +154,16 @@ self_node_groups = {
min_size = 2
max_size = 2 # Retains current max size
desired_size = 2
start_time = "2023-05-15T19:00:00Z"
end_time = "2023-05-19T19:00:00Z"
start_time = "2023-08-15T19:00:00Z"
end_time = "2023-08-19T19:00:00Z"
timezone = "Europe/Amsterdam"
recurrence = "0 7 * * 1"
},
scale-down = {
min_size = 0
max_size = 0 # Retains current max size
desired_size = 0
start_time = "2023-05-12T12:00:00Z"
start_time = "2023-08-12T12:00:00Z"
end_time = "2024-03-05T12:00:00Z"
timezone = "Europe/Amsterdam"
recurrence = "0 7 * * 5"
Expand Down Expand Up @@ -215,32 +215,27 @@ managed_node_group = {
apply_config_map_aws_auth = true
map_additional_iam_users = [
{
userarn = "arn:aws:iam::xxxxxx:user/nikita@clouddrove.com"
username = "nikita@clouddrove.com"
groups = ["system:masters"]
},
{
userarn = "arn:aws:iam::xxxxxx:user/sohan@clouddrove.com"
username = "sohan@clouddrove.com"
groups = ["system:masters"]
}
]
userarn = "arn:aws:iam::123456789:user/hello@clouddrove.com"
username = "hello@clouddrove.com"
groups = ["system:masters"]
}
]
# Schdule EKS Managed Auto Scaling node group
schedules = {
scale-up = {
min_size = 2
max_size = 2 # Retains current max size
desired_size = 2
start_time = "2023-05-15T19:00:00Z"
end_time = "2023-05-19T19:00:00Z"
start_time = "2023-08-15T19:00:00Z"
end_time = "2023-08-19T19:00:00Z"
timezone = "Europe/Amsterdam"
recurrence = "0 7 * * 1"
},
scale-down = {
min_size = 0
max_size = 0 # Retains current max size
desired_size = 0
start_time = "2023-05-12T12:00:00Z"
start_time = "2023-08-12T12:00:00Z"
end_time = "2024-03-05T12:00:00Z"
timezone = "Europe/Amsterdam"
recurrence = "0 7 * * 5"
Expand Down
Loading

0 comments on commit 4c616f2

Please sign in to comment.