Skip to content

Commit

Permalink
FEAT: add ecr-cred-provider (#165)
Browse files Browse the repository at this point in the history
<!--  Thanks for sending a pull request! See below for tips! -->

**Before submitting a pull request**, please make sure the following is
done:

### Checklist

- [x] Fork [the repository](https://github.com/getamis/vishwakarma) and
create your new branch from `master`.
- [x] Please mention the name of community in Pull Request title.
- [x] Git Commit Messages
- [ ] Use the present tense (Also in Pull Request title): "Add feature"
not "Added feature"
- [ ] Use the imperative mood (Also in Pull Request title): "Move cursor
to..." not "Moves cursor to..."
- [ ] Use rebase to squash/fixup dummy/unnecessary commits into only one
commit.
  • Loading branch information
imo-ininder authored Jun 26, 2023
1 parent 20a3c07 commit 20728f5
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 8 deletions.
2 changes: 1 addition & 1 deletion docs/variables/aws/kube-worker.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ This document gives an overview of variables used in the AWS platform of the kub

| Name | Source | Version |
|------|--------|---------|
| <a name="module_ignition_docker"></a> [ignition\_docker](#module\_ignition\_docker) | github.com/getamis/terraform-ignition-reinforcements//modules/docker | v1.23.10.1 |
| <a name="module_ignition_docker"></a> [ignition\_docker](#module\_ignition\_docker) | github.com/getamis/terraform-ignition-reinforcements//modules/docker | v1.27.2.0 |
| <a name="module_ignition_kubelet"></a> [ignition\_kubelet](#module\_ignition\_kubelet) | github.com/getamis/terraform-ignition-kubernetes//modules/kubelet | v1.27.2.0 |
| <a name="module_ignition_legacy_cgroups"></a> [ignition\_legacy\_cgroups](#module\_ignition\_legacy\_cgroups) | github.com/getamis/terraform-ignition-reinforcements//modules/legacy-cgroups | v1.23.10.1 |
| <a name="module_ignition_locksmithd"></a> [ignition\_locksmithd](#module\_ignition\_locksmithd) | github.com/getamis/terraform-ignition-reinforcements//modules/locksmithd | v1.23.10.1 |
Expand Down
3 changes: 2 additions & 1 deletion modules/aws/kube-etcd/ignition.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
module "ignition_docker" {
source = "github.com/getamis/terraform-ignition-reinforcements//modules/docker?ref=v1.23.10.1"
source = "github.com/getamis/terraform-ignition-reinforcements//modules/docker?ref=v1.27.2.0"
docker_cgroup_driver = "systemd"
}

module "ignition_locksmithd" {
Expand Down
16 changes: 11 additions & 5 deletions modules/aws/kube-master/ignition.tf
Original file line number Diff line number Diff line change
Expand Up @@ -95,20 +95,21 @@ module "ignition_kubernetes" {
}

module "ignition_docker" {
source = "github.com/getamis/terraform-ignition-reinforcements//modules/docker?ref=v1.23.10.1"
source = "github.com/getamis/terraform-ignition-reinforcements//modules/docker?ref=v1.27.2.0"
docker_cgroup_driver = "systemd"
}

module "ignition_locksmithd" {
source = "github.com/getamis/terraform-ignition-reinforcements//modules/locksmithd?ref=v1.23.10.1"
source = "github.com/getamis/terraform-ignition-reinforcements//modules/locksmithd?ref=v1.27.2.0"
reboot_strategy = var.reboot_strategy
}

module "ignition_update_ca_certificates" {
source = "github.com/getamis/terraform-ignition-reinforcements//modules/update-ca-certificates?ref=v1.23.10.1"
source = "github.com/getamis/terraform-ignition-reinforcements//modules/update-ca-certificates?ref=v1.27.2.0"
}

module "ignition_sshd" {
source = "github.com/getamis/terraform-ignition-reinforcements//modules/sshd?ref=v1.23.10.1"
source = "github.com/getamis/terraform-ignition-reinforcements//modules/sshd?ref=v1.27.2.0"

enable = var.debug_mode
}
Expand All @@ -118,8 +119,12 @@ module "ignition_containerd" {

}

module "ignition_ecr_credentail_provider" {
source = "github.com/getamis/terraform-ignition-reinforcements//modules/ecr-credential-provider?ref=v1.27.2.0"
}

module "ignition_systemd_networkd" {
source = "github.com/getamis/terraform-ignition-reinforcements//modules/systemd-networkd?ref=v1.23.10.1"
source = "github.com/getamis/terraform-ignition-reinforcements//modules/systemd-networkd?ref=v1.27.2.0"

debug = var.debug_mode
}
Expand All @@ -133,6 +138,7 @@ data "ignition_config" "main" {
module.ignition_kubernetes.files,
module.ignition_kubernetes.cert_files,
module.ignition_containerd.files,
module.ignition_ecr_credentail_provider.files,
var.extra_ignition_file_ids,
))

Expand Down
8 changes: 7 additions & 1 deletion modules/aws/kube-worker/ignition.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ locals {
}

module "ignition_docker" {
source = "github.com/getamis/terraform-ignition-reinforcements//modules/docker?ref=v1.23.10.1"
source = "github.com/getamis/terraform-ignition-reinforcements//modules/docker?ref=v1.27.2.0"
docker_cgroup_driver = "systemd"
}

module "ignition_locksmithd" {
Expand Down Expand Up @@ -38,6 +39,10 @@ module "ignition_containerd" {

}

module "ignition_ecr_credentail_provider" {
source = "github.com/getamis/terraform-ignition-reinforcements//modules/ecr-credential-provider?ref=v1.27.2.0"
}

data "aws_s3_object" "bootstrapping_kubeconfig" {
bucket = var.s3_bucket
key = "bootstrap-kubelet.conf"
Expand Down Expand Up @@ -77,6 +82,7 @@ data "ignition_config" "main" {
module.ignition_systemd_networkd.files,
module.ignition_kubelet.files,
module.ignition_containerd.files,
module.ignition_ecr_credentail_provider.files,
var.extra_ignition_file_ids,
))

Expand Down

0 comments on commit 20728f5

Please sign in to comment.