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 Mar 26, 2022
2 parents 61a1e36 + fced6d5 commit 4bcf8ec
Show file tree
Hide file tree
Showing 13 changed files with 42 additions and 36 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ here](https://github.com/particuleio/terraform-kubernetes-addons/blob/master/.gi
| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
| <a name="requirement_flux"></a> [flux](#requirement\_flux) | ~> 0.11 |
| <a name="requirement_flux"></a> [flux](#requirement\_flux) | <= 0.12 |
| <a name="requirement_github"></a> [github](#requirement\_github) | ~> 4.0 |
| <a name="requirement_helm"></a> [helm](#requirement\_helm) | ~> 2.0 |
| <a name="requirement_kubectl"></a> [kubectl](#requirement\_kubectl) | ~> 1.0 |
Expand All @@ -97,7 +97,7 @@ here](https://github.com/particuleio/terraform-kubernetes-addons/blob/master/.gi

| Name | Version |
|------|---------|
| <a name="provider_flux"></a> [flux](#provider\_flux) | ~> 0.11 |
| <a name="provider_flux"></a> [flux](#provider\_flux) | <= 0.12 |
| <a name="provider_github"></a> [github](#provider\_github) | ~> 4.0 |
| <a name="provider_helm"></a> [helm](#provider\_helm) | ~> 2.0 |
| <a name="provider_http"></a> [http](#provider\_http) | n/a |
Expand Down
2 changes: 1 addition & 1 deletion flux2.tf
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ locals {
namespace = "flux-system"
target_path = "production"
default_network_policy = true
version = "v0.26.0"
version = "v0.28.2"
github_url = "ssh://git@<host>/<org>/<repository>"
create_github_repository = false
github_token = ""
Expand Down
30 changes: 15 additions & 15 deletions helm-dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ dependencies:
version: 0.1.14
repository: https://aws.github.io/eks-charts
- name: aws-load-balancer-controller
version: 1.4.0
version: 1.4.1
repository: https://aws.github.io/eks-charts
- name: aws-node-termination-handler
version: 0.18.0
Expand All @@ -27,13 +27,13 @@ dependencies:
version: 0.3.11
repository: https://aws.github.io/eks-charts
- name: cert-manager
version: v1.7.1
version: v1.7.2
repository: https://charts.jetstack.io
- name: cert-manager-csi-driver
version: v0.2.1
repository: https://charts.jetstack.io
- name: cluster-autoscaler
version: 9.16.1
version: 9.16.2
repository: https://kubernetes.github.io/autoscaler
- name: external-dns
version: 1.7.1
Expand All @@ -48,7 +48,7 @@ dependencies:
version: 1.7.0
repository: https://clusterfrak-dynamics.github.io/istio/
- name: k8gb
version: v0.8.7
version: v0.8.8
repository: https://www.k8gb.io
- name: karma
version: 1.7.2
Expand All @@ -57,13 +57,13 @@ dependencies:
version: 2.6.2
repository: https://kedacore.github.io/charts
- name: keycloak
version: 17.0.2
version: 17.0.3
repository: https://codecentric.github.io/helm-charts
- name: kong
version: 2.7.0
repository: https://charts.konghq.com
- name: kube-prometheus-stack
version: 33.2.0
version: 34.1.1
repository: https://prometheus-community.github.io/helm-charts
- name: kyverno
version: v2.3.1
Expand All @@ -84,7 +84,7 @@ dependencies:
version: 2.6.1
repository: https://grafana.github.io/helm-charts
- name: loki
version: 2.10.1
version: 2.10.2
repository: https://grafana.github.io/helm-charts
- name: promtail
version: 3.11.0
Expand All @@ -93,19 +93,19 @@ dependencies:
version: 3.8.2
repository: https://kubernetes-sigs.github.io/metrics-server/
- name: node-problem-detector
version: 2.0.9
version: 2.1.0
repository: https://charts.deliveryhero.io/
- name: prometheus-adapter
version: 3.0.2
version: 3.0.3
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.4.1
version: 5.5.1
repository: https://prometheus-community.github.io/helm-charts
- name: rabbitmq-cluster-operator
version: 2.3.4
version: 2.5.0
repository: https://charts.bitnami.com/bitnami
- name: scaleway-webhook
version: v0.0.1
Expand All @@ -117,7 +117,7 @@ dependencies:
version: 0.28.0
repository: https://strimzi.io/charts/
- name: thanos
version: 10.1.1
version: 10.2.3
repository: https://charts.bitnami.com/bitnami
- name: tigera-operator
version: v3.22.1
Expand All @@ -126,14 +126,14 @@ dependencies:
version: 10.15.0
repository: https://helm.traefik.io/traefik
- name: memcached
version: 6.0.5
version: 6.0.7
repository: https://charts.bitnami.com/bitnami
- name: vault
version: 0.19.0
repository: https://helm.releases.hashicorp.com
- name: velero
version: 2.28.0
version: 2.29.1
repository: https://vmware-tanzu.github.io/helm-charts
- name: victoria-metrics-k8s-stack
version: 0.7.10
version: 0.7.11
repository: https://victoriametrics.github.io/helm-charts/
2 changes: 2 additions & 0 deletions modules/aws/.terraform-docs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
settings:
lockfile: false
8 changes: 4 additions & 4 deletions modules/aws/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ This module can uses [IRSA](https://aws.amazon.com/blogs/opensource/introducing-
| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 3.0 |
| <a name="requirement_flux"></a> [flux](#requirement\_flux) | ~> 0.11 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.72 |
| <a name="requirement_flux"></a> [flux](#requirement\_flux) | <= 0.12 |
| <a name="requirement_github"></a> [github](#requirement\_github) | ~> 4.0 |
| <a name="requirement_helm"></a> [helm](#requirement\_helm) | ~> 2.0 |
| <a name="requirement_kubectl"></a> [kubectl](#requirement\_kubectl) | ~> 1.0 |
Expand All @@ -32,8 +32,8 @@ This module can uses [IRSA](https://aws.amazon.com/blogs/opensource/introducing-

| Name | Version |
|------|---------|
| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 3.0 |
| <a name="provider_flux"></a> [flux](#provider\_flux) | ~> 0.11 |
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.72 |
| <a name="provider_flux"></a> [flux](#provider\_flux) | <= 0.12 |
| <a name="provider_github"></a> [github](#provider\_github) | ~> 4.0 |
| <a name="provider_helm"></a> [helm](#provider\_helm) | ~> 2.0 |
| <a name="provider_http"></a> [http](#provider\_http) | n/a |
Expand Down
4 changes: 2 additions & 2 deletions modules/aws/versions.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_version = ">= 0.13"
required_providers {
aws = "~> 3.0"
aws = ">= 3.72"
helm = "~> 2.0"
kubernetes = "~> 2.0"
kubectl = {
Expand All @@ -10,7 +10,7 @@ terraform {
}
flux = {
source = "fluxcd/flux"
version = "~> 0.11"
version = "<= 0.12"
}
github = {
source = "integrations/github"
Expand Down
2 changes: 2 additions & 0 deletions modules/azure/.terraform-docs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
settings:
lockfile: false
6 changes: 3 additions & 3 deletions modules/azure/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ Provides various Kubernetes addons that are often used on Kubernetes with Azure
| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | ~> 2.0 |
| <a name="requirement_flux"></a> [flux](#requirement\_flux) | ~> 0.11 |
| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | >= 2.0.0 |
| <a name="requirement_flux"></a> [flux](#requirement\_flux) | <= 0.12 |
| <a name="requirement_github"></a> [github](#requirement\_github) | ~> 4.0 |
| <a name="requirement_helm"></a> [helm](#requirement\_helm) | ~> 2.0 |
| <a name="requirement_kubectl"></a> [kubectl](#requirement\_kubectl) | ~> 1.0 |
Expand All @@ -19,7 +19,7 @@ Provides various Kubernetes addons that are often used on Kubernetes with Azure

| Name | Version |
|------|---------|
| <a name="provider_flux"></a> [flux](#provider\_flux) | ~> 0.11 |
| <a name="provider_flux"></a> [flux](#provider\_flux) | <= 0.12 |
| <a name="provider_github"></a> [github](#provider\_github) | ~> 4.0 |
| <a name="provider_helm"></a> [helm](#provider\_helm) | ~> 2.0 |
| <a name="provider_http"></a> [http](#provider\_http) | n/a |
Expand Down
4 changes: 2 additions & 2 deletions modules/azure/version.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_version = ">= 0.13"
required_providers {
azurerm = "~> 2.0"
azurerm = ">= 2.0.0"
helm = "~> 2.0"
kubernetes = "~> 2.0"
kubectl = {
Expand All @@ -10,7 +10,7 @@ terraform {
}
flux = {
source = "fluxcd/flux"
version = "~> 0.11"
version = "<= 0.12"
}
github = {
source = "integrations/github"
Expand Down
2 changes: 2 additions & 0 deletions modules/scaleway/.terraform-docs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
settings:
lockfile: false
8 changes: 4 additions & 4 deletions modules/scaleway/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,25 +20,25 @@ User guides, feature documentation and examples are available [here](https://git
| Name | Version |
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
| <a name="requirement_flux"></a> [flux](#requirement\_flux) | ~> 0.11 |
| <a name="requirement_flux"></a> [flux](#requirement\_flux) | <= 0.12 |
| <a name="requirement_github"></a> [github](#requirement\_github) | ~> 4.0 |
| <a name="requirement_helm"></a> [helm](#requirement\_helm) | ~> 2.0 |
| <a name="requirement_kubectl"></a> [kubectl](#requirement\_kubectl) | ~> 1.0 |
| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | ~> 2.0 |
| <a name="requirement_scaleway"></a> [scaleway](#requirement\_scaleway) | ~> 2.0 |
| <a name="requirement_scaleway"></a> [scaleway](#requirement\_scaleway) | >= 2.2.0 |

## Providers

| Name | Version |
|------|---------|
| <a name="provider_flux"></a> [flux](#provider\_flux) | ~> 0.11 |
| <a name="provider_flux"></a> [flux](#provider\_flux) | <= 0.12 |
| <a name="provider_github"></a> [github](#provider\_github) | ~> 4.0 |
| <a name="provider_helm"></a> [helm](#provider\_helm) | ~> 2.0 |
| <a name="provider_http"></a> [http](#provider\_http) | n/a |
| <a name="provider_kubectl"></a> [kubectl](#provider\_kubectl) | ~> 1.0 |
| <a name="provider_kubernetes"></a> [kubernetes](#provider\_kubernetes) | ~> 2.0 |
| <a name="provider_random"></a> [random](#provider\_random) | n/a |
| <a name="provider_scaleway"></a> [scaleway](#provider\_scaleway) | ~> 2.0 |
| <a name="provider_scaleway"></a> [scaleway](#provider\_scaleway) | >= 2.2.0 |
| <a name="provider_time"></a> [time](#provider\_time) | n/a |
| <a name="provider_tls"></a> [tls](#provider\_tls) | n/a |

Expand Down
4 changes: 2 additions & 2 deletions modules/scaleway/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ terraform {
}
flux = {
source = "fluxcd/flux"
version = "~> 0.11"
version = "<= 0.12"
}
github = {
source = "integrations/github"
version = "~> 4.0"
}
scaleway = {
source = "scaleway/scaleway"
version = "~> 2.0"
version = ">= 2.2.0"
}
}
}
2 changes: 1 addition & 1 deletion versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ terraform {
}
flux = {
source = "fluxcd/flux"
version = "~> 0.11"
version = "<= 0.12"
}
github = {
source = "integrations/github"
Expand Down

0 comments on commit 4bcf8ec

Please sign in to comment.