Skip to content

Commit

Permalink
Merge branch 'main' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
ArchiFleKs committed May 23, 2022
2 parents 71c99fa + 726f1e0 commit ffbed97
Show file tree
Hide file tree
Showing 17 changed files with 47 additions and 47 deletions.
30 changes: 15 additions & 15 deletions helm-dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dependencies:
version: 0.2.0
repository: https://raw.githubusercontent.com/kubernetes-sigs/secrets-store-csi-driver/master/charts
- name: aws-ebs-csi-driver
version: 2.6.7
version: 2.6.8
repository: https://kubernetes-sigs.github.io/aws-ebs-csi-driver
- name: aws-efs-csi-driver
version: 2.2.6
Expand All @@ -21,7 +21,7 @@ dependencies:
version: 1.4.1
repository: https://aws.github.io/eks-charts
- name: aws-node-termination-handler
version: 0.18.3
version: 0.18.4
repository: https://aws.github.io/eks-charts
- name: aws-calico
version: 0.3.11
Expand All @@ -33,7 +33,7 @@ dependencies:
version: v0.2.1
repository: https://charts.jetstack.io
- name: cluster-autoscaler
version: 9.18.0
version: 9.18.1
repository: https://kubernetes.github.io/autoscaler
- name: external-dns
version: 1.9.0
Expand All @@ -60,10 +60,10 @@ dependencies:
version: 18.1.1
repository: https://codecentric.github.io/helm-charts
- name: kong
version: 2.8.0
version: 2.8.2
repository: https://charts.konghq.com
- name: kube-prometheus-stack
version: 35.2.0
version: 35.3.1
repository: https://prometheus-community.github.io/helm-charts
- name: kyverno
version: v2.3.3
Expand Down Expand Up @@ -96,16 +96,16 @@ dependencies:
version: 2.2.1
repository: https://charts.deliveryhero.io/
- name: prometheus-adapter
version: 3.2.2
version: 3.3.0
repository: https://prometheus-community.github.io/helm-charts
- name: prometheus-cloudwatch-exporter
version: 0.18.0
repository: https://prometheus-community.github.io/helm-charts
- name: prometheus-blackbox-exporter
version: 5.8.0
version: 5.8.1
repository: https://prometheus-community.github.io/helm-charts
- name: rabbitmq-cluster-operator
version: 2.6.1
version: 2.6.3
repository: https://charts.bitnami.com/bitnami
- name: scaleway-webhook
version: v0.0.1
Expand All @@ -114,26 +114,26 @@ dependencies:
version: 2.1.8
repository: https://bitnami-labs.github.io/sealed-secrets
- name: strimzi-kafka-operator
version: 0.28.0
version: 0.29.0
repository: https://strimzi.io/charts/
- name: thanos
version: 10.3.8
version: 10.4.2
repository: https://charts.bitnami.com/bitnami
- name: tigera-operator
version: v3.23.0
version: v3.23.1
repository: https://docs.projectcalico.org/charts
- name: traefik
version: 10.19.5
repository: https://helm.traefik.io/traefik
- name: memcached
version: 6.0.17
version: 6.0.21
repository: https://charts.bitnami.com/bitnami
- name: vault
version: 0.19.0
version: 0.20.0
repository: https://helm.releases.hashicorp.com
- name: velero
version: 2.29.5
version: 2.29.6
repository: https://vmware-tanzu.github.io/helm-charts
- name: victoria-metrics-k8s-stack
version: 0.8.3
version: 0.9.2
repository: https://victoriametrics.github.io/helm-charts/
32 changes: 16 additions & 16 deletions modules/aws/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,22 +47,22 @@ This module can uses [IRSA](https://aws.amazon.com/blogs/opensource/introducing-

| Name | Source | Version |
|------|--------|---------|
| <a name="module_iam_assumable_role_aws-ebs-csi-driver"></a> [iam\_assumable\_role\_aws-ebs-csi-driver](#module\_iam\_assumable\_role\_aws-ebs-csi-driver) | terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc | ~> 4.0 |
| <a name="module_iam_assumable_role_aws-efs-csi-driver"></a> [iam\_assumable\_role\_aws-efs-csi-driver](#module\_iam\_assumable\_role\_aws-efs-csi-driver) | terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc | ~> 4.0 |
| <a name="module_iam_assumable_role_aws-for-fluent-bit"></a> [iam\_assumable\_role\_aws-for-fluent-bit](#module\_iam\_assumable\_role\_aws-for-fluent-bit) | terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc | ~> 4.0 |
| <a name="module_iam_assumable_role_aws-load-balancer-controller"></a> [iam\_assumable\_role\_aws-load-balancer-controller](#module\_iam\_assumable\_role\_aws-load-balancer-controller) | terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc | ~> 4.0 |
| <a name="module_iam_assumable_role_cert-manager"></a> [iam\_assumable\_role\_cert-manager](#module\_iam\_assumable\_role\_cert-manager) | terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc | ~> 4.0 |
| <a name="module_iam_assumable_role_cluster-autoscaler"></a> [iam\_assumable\_role\_cluster-autoscaler](#module\_iam\_assumable\_role\_cluster-autoscaler) | terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc | ~> 4.0 |
| <a name="module_iam_assumable_role_cni-metrics-helper"></a> [iam\_assumable\_role\_cni-metrics-helper](#module\_iam\_assumable\_role\_cni-metrics-helper) | terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc | ~> 4.0 |
| <a name="module_iam_assumable_role_external-dns"></a> [iam\_assumable\_role\_external-dns](#module\_iam\_assumable\_role\_external-dns) | terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc | ~> 4.0 |
| <a name="module_iam_assumable_role_kube-prometheus-stack_grafana"></a> [iam\_assumable\_role\_kube-prometheus-stack\_grafana](#module\_iam\_assumable\_role\_kube-prometheus-stack\_grafana) | terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc | ~> 4.0 |
| <a name="module_iam_assumable_role_kube-prometheus-stack_thanos"></a> [iam\_assumable\_role\_kube-prometheus-stack\_thanos](#module\_iam\_assumable\_role\_kube-prometheus-stack\_thanos) | terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc | ~> 4.0 |
| <a name="module_iam_assumable_role_loki-stack"></a> [iam\_assumable\_role\_loki-stack](#module\_iam\_assumable\_role\_loki-stack) | terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc | ~> 4.0 |
| <a name="module_iam_assumable_role_prometheus-cloudwatch-exporter"></a> [iam\_assumable\_role\_prometheus-cloudwatch-exporter](#module\_iam\_assumable\_role\_prometheus-cloudwatch-exporter) | terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc | ~> 4.0 |
| <a name="module_iam_assumable_role_thanos"></a> [iam\_assumable\_role\_thanos](#module\_iam\_assumable\_role\_thanos) | terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc | ~> 4.0 |
| <a name="module_iam_assumable_role_thanos-storegateway"></a> [iam\_assumable\_role\_thanos-storegateway](#module\_iam\_assumable\_role\_thanos-storegateway) | terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc | ~> 4.0 |
| <a name="module_iam_assumable_role_vault"></a> [iam\_assumable\_role\_vault](#module\_iam\_assumable\_role\_vault) | terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc | ~> 4.0 |
| <a name="module_iam_assumable_role_velero"></a> [iam\_assumable\_role\_velero](#module\_iam\_assumable\_role\_velero) | terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc | ~> 4.0 |
| <a name="module_iam_assumable_role_aws-ebs-csi-driver"></a> [iam\_assumable\_role\_aws-ebs-csi-driver](#module\_iam\_assumable\_role\_aws-ebs-csi-driver) | terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc | ~> 5.0 |
| <a name="module_iam_assumable_role_aws-efs-csi-driver"></a> [iam\_assumable\_role\_aws-efs-csi-driver](#module\_iam\_assumable\_role\_aws-efs-csi-driver) | terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc | ~> 5.0 |
| <a name="module_iam_assumable_role_aws-for-fluent-bit"></a> [iam\_assumable\_role\_aws-for-fluent-bit](#module\_iam\_assumable\_role\_aws-for-fluent-bit) | terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc | ~> 5.0 |
| <a name="module_iam_assumable_role_aws-load-balancer-controller"></a> [iam\_assumable\_role\_aws-load-balancer-controller](#module\_iam\_assumable\_role\_aws-load-balancer-controller) | terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc | ~> 5.0 |
| <a name="module_iam_assumable_role_cert-manager"></a> [iam\_assumable\_role\_cert-manager](#module\_iam\_assumable\_role\_cert-manager) | terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc | ~> 5.0 |
| <a name="module_iam_assumable_role_cluster-autoscaler"></a> [iam\_assumable\_role\_cluster-autoscaler](#module\_iam\_assumable\_role\_cluster-autoscaler) | terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc | ~> 5.0 |
| <a name="module_iam_assumable_role_cni-metrics-helper"></a> [iam\_assumable\_role\_cni-metrics-helper](#module\_iam\_assumable\_role\_cni-metrics-helper) | terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc | ~> 5.0 |
| <a name="module_iam_assumable_role_external-dns"></a> [iam\_assumable\_role\_external-dns](#module\_iam\_assumable\_role\_external-dns) | terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc | ~> 5.0 |
| <a name="module_iam_assumable_role_kube-prometheus-stack_grafana"></a> [iam\_assumable\_role\_kube-prometheus-stack\_grafana](#module\_iam\_assumable\_role\_kube-prometheus-stack\_grafana) | terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc | ~> 5.0 |
| <a name="module_iam_assumable_role_kube-prometheus-stack_thanos"></a> [iam\_assumable\_role\_kube-prometheus-stack\_thanos](#module\_iam\_assumable\_role\_kube-prometheus-stack\_thanos) | terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc | ~> 5.0 |
| <a name="module_iam_assumable_role_loki-stack"></a> [iam\_assumable\_role\_loki-stack](#module\_iam\_assumable\_role\_loki-stack) | terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc | ~> 5.0 |
| <a name="module_iam_assumable_role_prometheus-cloudwatch-exporter"></a> [iam\_assumable\_role\_prometheus-cloudwatch-exporter](#module\_iam\_assumable\_role\_prometheus-cloudwatch-exporter) | terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc | ~> 5.0 |
| <a name="module_iam_assumable_role_thanos"></a> [iam\_assumable\_role\_thanos](#module\_iam\_assumable\_role\_thanos) | terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc | ~> 5.0 |
| <a name="module_iam_assumable_role_thanos-storegateway"></a> [iam\_assumable\_role\_thanos-storegateway](#module\_iam\_assumable\_role\_thanos-storegateway) | terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc | ~> 5.0 |
| <a name="module_iam_assumable_role_vault"></a> [iam\_assumable\_role\_vault](#module\_iam\_assumable\_role\_vault) | terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc | ~> 5.0 |
| <a name="module_iam_assumable_role_velero"></a> [iam\_assumable\_role\_velero](#module\_iam\_assumable\_role\_velero) | terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc | ~> 5.0 |
| <a name="module_kube-prometheus-stack_thanos_bucket"></a> [kube-prometheus-stack\_thanos\_bucket](#module\_kube-prometheus-stack\_thanos\_bucket) | terraform-aws-modules/s3-bucket/aws | ~> 3.0 |
| <a name="module_loki_bucket"></a> [loki\_bucket](#module\_loki\_bucket) | terraform-aws-modules/s3-bucket/aws | ~> 3.0 |
| <a name="module_security-group-efs-csi-driver"></a> [security-group-efs-csi-driver](#module\_security-group-efs-csi-driver) | terraform-aws-modules/security-group/aws//modules/nfs | ~> 4.0 |
Expand Down
2 changes: 1 addition & 1 deletion modules/aws/aws-ebs-csi-driver.tf
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ VALUES

module "iam_assumable_role_aws-ebs-csi-driver" {
source = "terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc"
version = "~> 4.0"
version = "~> 5.0"
create_role = local.aws-ebs-csi-driver["enabled"] && local.aws-ebs-csi-driver["create_iam_resources_irsa"]
role_name = local.aws-ebs-csi-driver["name_prefix"]
provider_url = replace(var.eks["cluster_oidc_issuer_url"], "https://", "")
Expand Down
2 changes: 1 addition & 1 deletion modules/aws/aws-efs-csi-driver.tf
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ locals {

module "iam_assumable_role_aws-efs-csi-driver" {
source = "terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc"
version = "~> 4.0"
version = "~> 5.0"
create_role = local.aws-efs-csi-driver["enabled"] && local.aws-efs-csi-driver["create_iam_resources_irsa"]
role_name = local.aws-efs-csi-driver["name_prefix"]
provider_url = replace(var.eks["cluster_oidc_issuer_url"], "https://", "")
Expand Down
2 changes: 1 addition & 1 deletion modules/aws/aws-for-fluent-bit.tf
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ VALUES

module "iam_assumable_role_aws-for-fluent-bit" {
source = "terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc"
version = "~> 4.0"
version = "~> 5.0"
create_role = local.aws-for-fluent-bit["enabled"] && local.aws-for-fluent-bit["create_iam_resources_irsa"]
role_name = local.aws-for-fluent-bit["name_prefix"]
provider_url = replace(var.eks["cluster_oidc_issuer_url"], "https://", "")
Expand Down
2 changes: 1 addition & 1 deletion modules/aws/aws-load-balancer-controller.tf
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ VALUES

module "iam_assumable_role_aws-load-balancer-controller" {
source = "terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc"
version = "~> 4.0"
version = "~> 5.0"
create_role = local.aws-load-balancer-controller["enabled"] && local.aws-load-balancer-controller["create_iam_resources_irsa"]
role_name = local.aws-load-balancer-controller["name_prefix"]
provider_url = replace(var.eks["cluster_oidc_issuer_url"], "https://", "")
Expand Down
2 changes: 1 addition & 1 deletion modules/aws/cert-manager.tf
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ VALUES

module "iam_assumable_role_cert-manager" {
source = "terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc"
version = "~> 4.0"
version = "~> 5.0"
create_role = local.cert-manager["enabled"] && local.cert-manager["create_iam_resources_irsa"]
role_name = local.cert-manager["name_prefix"]
provider_url = replace(var.eks["cluster_oidc_issuer_url"], "https://", "")
Expand Down
2 changes: 1 addition & 1 deletion modules/aws/cluster-autoscaler.tf
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ VALUES

module "iam_assumable_role_cluster-autoscaler" {
source = "terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc"
version = "~> 4.0"
version = "~> 5.0"
create_role = local.cluster-autoscaler["enabled"] && local.cluster-autoscaler["create_iam_resources_irsa"]
role_name = local.cluster-autoscaler["name_prefix"]
provider_url = replace(var.eks["cluster_oidc_issuer_url"], "https://", "")
Expand Down
2 changes: 1 addition & 1 deletion modules/aws/cni-metrics-helper.tf
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ locals {

module "iam_assumable_role_cni-metrics-helper" {
source = "terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc"
version = "~> 4.0"
version = "~> 5.0"
create_role = local.cni-metrics-helper["enabled"] && local.cni-metrics-helper["create_iam_resources_irsa"]
role_name = local.cni-metrics-helper["name_prefix"]
provider_url = replace(var.eks["cluster_oidc_issuer_url"], "https://", "")
Expand Down
2 changes: 1 addition & 1 deletion modules/aws/external-dns.tf
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ locals {
module "iam_assumable_role_external-dns" {
for_each = local.external-dns
source = "terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc"
version = "~> 4.0"
version = "~> 5.0"
create_role = each.value["enabled"] && each.value["create_iam_resources_irsa"]
role_name = "${each.value.name_prefix}-${each.key}"
provider_url = replace(var.eks["cluster_oidc_issuer_url"], "https://", "")
Expand Down
4 changes: 2 additions & 2 deletions modules/aws/kube-prometheus.tf
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ VALUES

module "iam_assumable_role_kube-prometheus-stack_grafana" {
source = "terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc"
version = "~> 4.0"
version = "~> 5.0"
create_role = local.kube-prometheus-stack["enabled"] && local.kube-prometheus-stack["grafana_create_iam_resources_irsa"]
role_name = "${local.kube-prometheus-stack["name_prefix"]}-grafana"
provider_url = replace(var.eks["cluster_oidc_issuer_url"], "https://", "")
Expand All @@ -280,7 +280,7 @@ module "iam_assumable_role_kube-prometheus-stack_grafana" {

module "iam_assumable_role_kube-prometheus-stack_thanos" {
source = "terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc"
version = "~> 4.0"
version = "~> 5.0"
create_role = local.kube-prometheus-stack["enabled"] && local.kube-prometheus-stack["thanos_create_iam_resources_irsa"] && local.kube-prometheus-stack["thanos_sidecar_enabled"]
role_name = "${local.kube-prometheus-stack["name_prefix"]}-thanos"
provider_url = replace(var.eks["cluster_oidc_issuer_url"], "https://", "")
Expand Down
2 changes: 1 addition & 1 deletion modules/aws/loki-stack.tf
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ locals {

module "iam_assumable_role_loki-stack" {
source = "terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc"
version = "~> 4.0"
version = "~> 5.0"
create_role = local.loki-stack["enabled"] && local.loki-stack["create_iam_resources_irsa"]
role_name = local.loki-stack["name_prefix"]
provider_url = replace(var.eks["cluster_oidc_issuer_url"], "https://", "")
Expand Down
2 changes: 1 addition & 1 deletion modules/aws/prometheus-cloudwatch-exporter.tf
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ locals {

module "iam_assumable_role_prometheus-cloudwatch-exporter" {
source = "terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc"
version = "~> 4.0"
version = "~> 5.0"
create_role = local.prometheus-cloudwatch-exporter["enabled"] && local.prometheus-cloudwatch-exporter["create_iam_resources_irsa"]
role_name = local.prometheus-cloudwatch-exporter["name_prefix"]
provider_url = replace(var.eks["cluster_oidc_issuer_url"], "https://", "")
Expand Down
2 changes: 1 addition & 1 deletion modules/aws/thanos-storegateway.tf
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ locals {
module "iam_assumable_role_thanos-storegateway" {
for_each = local.thanos-storegateway
source = "terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc"
version = "~> 4.0"
version = "~> 5.0"
create_role = each.value["enabled"] && each.value["create_iam_resources_irsa"]
role_name = "${each.value.name_prefix}-${each.key}"
provider_url = replace(var.eks["cluster_oidc_issuer_url"], "https://", "")
Expand Down
2 changes: 1 addition & 1 deletion modules/aws/thanos.tf
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ locals {

module "iam_assumable_role_thanos" {
source = "terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc"
version = "~> 4.0"
version = "~> 5.0"
create_role = local.thanos["enabled"] && local.thanos["create_iam_resources_irsa"]
role_name = local.thanos["name_prefix"]
provider_url = replace(var.eks["cluster_oidc_issuer_url"], "https://", "")
Expand Down
2 changes: 1 addition & 1 deletion modules/aws/vault.tf
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ locals {

module "iam_assumable_role_vault" {
source = "terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc"
version = "~> 4.0"
version = "~> 5.0"
create_role = local.vault["enabled"] && local.vault["create_iam_resources_irsa"] && local.vault["use_kms"]
role_name = local.vault["name_prefix"]
provider_url = replace(var.eks["cluster_oidc_issuer_url"], "https://", "")
Expand Down
2 changes: 1 addition & 1 deletion modules/aws/velero.tf
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ VALUES

module "iam_assumable_role_velero" {
source = "terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc"
version = "~> 4.0"
version = "~> 5.0"
create_role = local.velero["enabled"] && local.velero["create_iam_resources_irsa"]
role_name = local.velero["name_prefix"]
provider_url = replace(var.eks["cluster_oidc_issuer_url"], "https://", "")
Expand Down

0 comments on commit ffbed97

Please sign in to comment.