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 12, 2022
2 parents 0a52790 + f86ca47 commit 267b496
Show file tree
Hide file tree
Showing 12 changed files with 29 additions and 26 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.13 |
| <a name="requirement_flux"></a> [flux](#requirement\_flux) | <= 0.14 |
| <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.13 |
| <a name="provider_flux"></a> [flux](#provider\_flux) | <= 0.14 |
| <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.29.4"
version = "v0.30.2"
github_url = "ssh://git@<host>/<org>/<repository>"
create_github_repository = false
github_token = ""
Expand Down
26 changes: 13 additions & 13 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.6
version: 2.6.7
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.2
version: 0.18.3
repository: https://aws.github.io/eks-charts
- name: aws-calico
version: 0.3.11
Expand All @@ -39,10 +39,10 @@ dependencies:
version: 1.9.0
repository: https://kubernetes-sigs.github.io/external-dns/
- name: flux
version: 1.12.0
version: 1.13.0
repository: https://charts.fluxcd.io
- name: ingress-nginx
version: 4.1.0
version: 4.1.1
repository: https://kubernetes.github.io/ingress-nginx
- name: istio-operator
version: 1.7.0
Expand All @@ -54,7 +54,7 @@ dependencies:
version: 1.7.2
repository: https://charts.helm.sh/stable
- name: keda
version: 2.6.2
version: 2.7.2
repository: https://kedacore.github.io/charts
- name: keycloak
version: 18.1.1
Expand All @@ -63,7 +63,7 @@ dependencies:
version: 2.8.0
repository: https://charts.konghq.com
- name: kube-prometheus-stack
version: 35.0.3
version: 35.2.0
repository: https://prometheus-community.github.io/helm-charts
- name: kyverno
version: v2.3.3
Expand Down Expand Up @@ -102,7 +102,7 @@ dependencies:
version: 0.18.0
repository: https://prometheus-community.github.io/helm-charts
- name: prometheus-blackbox-exporter
version: 5.7.0
version: 5.8.0
repository: https://prometheus-community.github.io/helm-charts
- name: rabbitmq-cluster-operator
version: 2.6.1
Expand All @@ -111,19 +111,19 @@ dependencies:
version: v0.0.1
repository: https://particuleio.github.io/charts
- name: sealed-secrets
version: 2.1.7
version: 2.1.8
repository: https://bitnami-labs.github.io/sealed-secrets
- name: strimzi-kafka-operator
version: 0.28.0
repository: https://strimzi.io/charts/
- name: thanos
version: 10.3.6
version: 10.3.8
repository: https://charts.bitnami.com/bitnami
- name: tigera-operator
version: v3.22.2
version: v3.23.0
repository: https://docs.projectcalico.org/charts
- name: traefik
version: 10.19.4
version: 10.19.5
repository: https://helm.traefik.io/traefik
- name: memcached
version: 6.0.17
Expand All @@ -132,8 +132,8 @@ dependencies:
version: 0.19.0
repository: https://helm.releases.hashicorp.com
- name: velero
version: 2.29.4
version: 2.29.5
repository: https://vmware-tanzu.github.io/helm-charts
- name: victoria-metrics-k8s-stack
version: 0.8.1
version: 0.8.3
repository: https://victoriametrics.github.io/helm-charts/
4 changes: 2 additions & 2 deletions modules/aws/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ This module can uses [IRSA](https://aws.amazon.com/blogs/opensource/introducing-
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.72 |
| <a name="requirement_flux"></a> [flux](#requirement\_flux) | <= 0.13 |
| <a name="requirement_flux"></a> [flux](#requirement\_flux) | <= 0.14 |
| <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 @@ -33,7 +33,7 @@ This module can uses [IRSA](https://aws.amazon.com/blogs/opensource/introducing-
| Name | Version |
|------|---------|
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.72 |
| <a name="provider_flux"></a> [flux](#provider\_flux) | <= 0.13 |
| <a name="provider_flux"></a> [flux](#provider\_flux) | <= 0.14 |
| <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: 2 additions & 0 deletions modules/aws/loki-stack.tf
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,8 @@ module "loki_bucket" {
}
}

tags = local.tags

lifecycle_rule = local.loki-stack["bucket_lifecycle_rule"]
}

Expand Down
2 changes: 1 addition & 1 deletion modules/aws/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ terraform {
}
flux = {
source = "fluxcd/flux"
version = "<= 0.13"
version = "<= 0.14"
}
github = {
source = "integrations/github"
Expand Down
4 changes: 2 additions & 2 deletions modules/azure/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Provides various Kubernetes addons that are often used on Kubernetes with Azure
|------|---------|
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | >= 2.0.0 |
| <a name="requirement_flux"></a> [flux](#requirement\_flux) | <= 0.13 |
| <a name="requirement_flux"></a> [flux](#requirement\_flux) | <= 0.14 |
| <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.13 |
| <a name="provider_flux"></a> [flux](#provider\_flux) | <= 0.14 |
| <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 modules/azure/version.tf
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ terraform {
}
flux = {
source = "fluxcd/flux"
version = "<= 0.13"
version = "<= 0.14"
}
github = {
source = "integrations/github"
Expand Down
4 changes: 2 additions & 2 deletions modules/scaleway/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ 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.13 |
| <a name="requirement_flux"></a> [flux](#requirement\_flux) | <= 0.14 |
| <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 @@ -31,7 +31,7 @@ User guides, feature documentation and examples are available [here](https://git

| Name | Version |
|------|---------|
| <a name="provider_flux"></a> [flux](#provider\_flux) | <= 0.13 |
| <a name="provider_flux"></a> [flux](#provider\_flux) | <= 0.14 |
| <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
1 change: 1 addition & 0 deletions modules/scaleway/ingress-nginx.tf
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ resource "kubernetes_namespace" "ingress-nginx" {

metadata {
labels = {
name = local.ingress-nginx["namespace"]
"${local.labels_prefix}/component" = "ingress"
}

Expand Down
2 changes: 1 addition & 1 deletion modules/scaleway/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.13"
version = "<= 0.14"
}
github = {
source = "integrations/github"
Expand Down
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.13"
version = "<= 0.14"
}
github = {
source = "integrations/github"
Expand Down

0 comments on commit 267b496

Please sign in to comment.