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 Jan 26, 2024
2 parents 768d372 + 529cf13 commit c40cdee
Show file tree
Hide file tree
Showing 23 changed files with 265 additions and 200 deletions.
90 changes: 57 additions & 33 deletions .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
":automergeDisabled",
":disableRateLimiting",
":ignoreModulesAndTests",
":autodetectPinVersions",
":gitSignOff",
"group:monorepos",
"group:recommended",
Expand All @@ -18,47 +17,72 @@
":automergeMinor",
":dependencyDashboard"
],
"baseBranches": ["main"],
"enabledManagers": ["helmv3", "github-actions", "pre-commit", "terraform"],
"baseBranches": [
"main"
],
"enabledManagers": [
"helmv3",
"github-actions",
"pre-commit",
"terraform"
],
"semanticCommits": "enabled",
"automergeType": "pr-comment",
"automergeComment": "renovate:merge",
"helmv3": {
"enabled": true,
"fileMatch": ["(^|/)helm-dependencies.yaml$"]
"fileMatch": [
"(^|/)helm-dependencies.yaml$"
]
},
"reviewers": [
"team:team"
],
"prHourlyLimit": 0,
"packageRules": [
{
"matchManagers": ["github-actions"],
"semanticCommitScope": "ci",
"semanticCommitType": "chore"
},
{
"matchManagers": ["pre-commit"],
"semanticCommitScope": "ci",
"semanticCommitType": "chore"
},
{
"matchManagers": ["helmv3"],
"semanticCommitScope": "charts",
"semanticCommitType": "fix",
"matchUpdateTypes": ["patch", "digest"]
},
{
"matchManagers": ["helmv3"],
"semanticCommitScope": "charts",
"semanticCommitType": "feat",
"matchUpdateTypes": ["major", "minor"]
},
{
"matchManagers": ["terraform"],
"semanticCommitScope": "tf",
"semanticCommitType": "feat",
"automerge": false
}
]
{
"matchManagers": [
"github-actions"
],
"semanticCommitScope": "ci",
"semanticCommitType": "chore"
},
{
"matchManagers": [
"pre-commit"
],
"semanticCommitScope": "ci",
"semanticCommitType": "chore"
},
{
"matchManagers": [
"helmv3"
],
"semanticCommitScope": "charts",
"semanticCommitType": "fix",
"matchUpdateTypes": [
"patch",
"digest"
]
},
{
"matchManagers": [
"helmv3"
],
"semanticCommitScope": "charts",
"semanticCommitType": "feat",
"matchUpdateTypes": [
"major",
"minor"
]
},
{
"matchManagers": [
"terraform"
],
"semanticCommitScope": "tf",
"semanticCommitType": "feat",
"automerge": false
}
]
}
2 changes: 1 addition & 1 deletion .github/workflows/renovate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ jobs:
uses: actions/checkout@v4

- name: Validate Renovate Config
uses: suzuki-shunsuke/github-action-renovate-config-validator@v0.1.3
uses: suzuki-shunsuke/github-action-renovate-config-validator@v1.0.1
2 changes: 1 addition & 1 deletion .github/workflows/stale-actions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v8
- uses: actions/stale@v9
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
# Staling issues and PR's
Expand Down
8 changes: 6 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/antonbabenko/pre-commit-terraform
rev: v1.83.4
rev: v1.86.0
hooks:
- id: terraform_fmt
- id: terraform_validate
Expand All @@ -9,7 +9,11 @@ repos:
- --tf-init-args=-upgrade
- id: terraform_docs
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v4.5.0
hooks:
- id: check-merge-conflict
- id: end-of-file-fixer
- repo: https://github.com/renovatebot/pre-commit-hooks
rev: 37.152.1
hooks:
- id: renovate-config-validator
30 changes: 15 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ here](https://github.com/particuleio/terraform-kubernetes-addons/blob/master/.gi
| <a name="requirement_github"></a> [github](#requirement\_github) | ~> 5.0 |
| <a name="requirement_helm"></a> [helm](#requirement\_helm) | ~> 2.0 |
| <a name="requirement_http"></a> [http](#requirement\_http) | >= 3 |
| <a name="requirement_kubectl"></a> [kubectl](#requirement\_kubectl) | ~> 1.0 |
| <a name="requirement_kubectl"></a> [kubectl](#requirement\_kubectl) | ~> 2.0 |
| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | ~> 2.0, != 2.12 |
| <a name="requirement_tls"></a> [tls](#requirement\_tls) | ~> 4.0 |

Expand All @@ -98,7 +98,7 @@ here](https://github.com/particuleio/terraform-kubernetes-addons/blob/master/.gi
| <a name="provider_github"></a> [github](#provider\_github) | ~> 5.0 |
| <a name="provider_helm"></a> [helm](#provider\_helm) | ~> 2.0 |
| <a name="provider_http"></a> [http](#provider\_http) | >= 3 |
| <a name="provider_kubectl"></a> [kubectl](#provider\_kubectl) | ~> 1.0 |
| <a name="provider_kubectl"></a> [kubectl](#provider\_kubectl) | ~> 2.0 |
| <a name="provider_kubernetes"></a> [kubernetes](#provider\_kubernetes) | ~> 2.0, != 2.12 |
| <a name="provider_random"></a> [random](#provider\_random) | n/a |
| <a name="provider_time"></a> [time](#provider\_time) | n/a |
Expand Down Expand Up @@ -140,14 +140,14 @@ No modules.
| [helm_release.tigera-operator](https://registry.terraform.io/providers/hashicorp/helm/latest/docs/resources/release) | resource |
| [helm_release.traefik](https://registry.terraform.io/providers/hashicorp/helm/latest/docs/resources/release) | resource |
| [helm_release.victoria-metrics-k8s-stack](https://registry.terraform.io/providers/hashicorp/helm/latest/docs/resources/release) | resource |
| [kubectl_manifest.calico_crds](https://registry.terraform.io/providers/gavinbunney/kubectl/latest/docs/resources/manifest) | resource |
| [kubectl_manifest.cert-manager_cluster_issuers](https://registry.terraform.io/providers/gavinbunney/kubectl/latest/docs/resources/manifest) | resource |
| [kubectl_manifest.csi-external-snapshotter](https://registry.terraform.io/providers/gavinbunney/kubectl/latest/docs/resources/manifest) | resource |
| [kubectl_manifest.kong_crds](https://registry.terraform.io/providers/gavinbunney/kubectl/latest/docs/resources/manifest) | resource |
| [kubectl_manifest.linkerd](https://registry.terraform.io/providers/gavinbunney/kubectl/latest/docs/resources/manifest) | resource |
| [kubectl_manifest.linkerd-viz](https://registry.terraform.io/providers/gavinbunney/kubectl/latest/docs/resources/manifest) | resource |
| [kubectl_manifest.prometheus-operator_crds](https://registry.terraform.io/providers/gavinbunney/kubectl/latest/docs/resources/manifest) | resource |
| [kubectl_manifest.tigera-operator_crds](https://registry.terraform.io/providers/gavinbunney/kubectl/latest/docs/resources/manifest) | resource |
| [kubectl_manifest.calico_crds](https://registry.terraform.io/providers/alekc/kubectl/latest/docs/resources/manifest) | resource |
| [kubectl_manifest.cert-manager_cluster_issuers](https://registry.terraform.io/providers/alekc/kubectl/latest/docs/resources/manifest) | resource |
| [kubectl_manifest.csi-external-snapshotter](https://registry.terraform.io/providers/alekc/kubectl/latest/docs/resources/manifest) | resource |
| [kubectl_manifest.kong_crds](https://registry.terraform.io/providers/alekc/kubectl/latest/docs/resources/manifest) | resource |
| [kubectl_manifest.linkerd](https://registry.terraform.io/providers/alekc/kubectl/latest/docs/resources/manifest) | resource |
| [kubectl_manifest.linkerd-viz](https://registry.terraform.io/providers/alekc/kubectl/latest/docs/resources/manifest) | resource |
| [kubectl_manifest.prometheus-operator_crds](https://registry.terraform.io/providers/alekc/kubectl/latest/docs/resources/manifest) | resource |
| [kubectl_manifest.tigera-operator_crds](https://registry.terraform.io/providers/alekc/kubectl/latest/docs/resources/manifest) | resource |
| [kubernetes_config_map.loki-stack_grafana_ds](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/config_map) | resource |
| [kubernetes_namespace.admiralty](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/namespace) | resource |
| [kubernetes_namespace.cert-manager](https://registry.terraform.io/providers/hashicorp/kubernetes/latest/docs/resources/namespace) | resource |
Expand Down Expand Up @@ -261,11 +261,11 @@ No modules.
| [http_http.prometheus-operator_crds](https://registry.terraform.io/providers/hashicorp/http/latest/docs/data-sources/http) | data source |
| [http_http.prometheus-operator_version](https://registry.terraform.io/providers/hashicorp/http/latest/docs/data-sources/http) | data source |
| [http_http.tigera-operator_crds](https://registry.terraform.io/providers/hashicorp/http/latest/docs/data-sources/http) | data source |
| [kubectl_file_documents.calico_crds](https://registry.terraform.io/providers/gavinbunney/kubectl/latest/docs/data-sources/file_documents) | data source |
| [kubectl_file_documents.csi-external-snapshotter](https://registry.terraform.io/providers/gavinbunney/kubectl/latest/docs/data-sources/file_documents) | data source |
| [kubectl_file_documents.kong_crds](https://registry.terraform.io/providers/gavinbunney/kubectl/latest/docs/data-sources/file_documents) | data source |
| [kubectl_file_documents.tigera-operator_crds](https://registry.terraform.io/providers/gavinbunney/kubectl/latest/docs/data-sources/file_documents) | data source |
| [kubectl_path_documents.cert-manager_cluster_issuers](https://registry.terraform.io/providers/gavinbunney/kubectl/latest/docs/data-sources/path_documents) | data source |
| [kubectl_file_documents.calico_crds](https://registry.terraform.io/providers/alekc/kubectl/latest/docs/data-sources/file_documents) | data source |
| [kubectl_file_documents.csi-external-snapshotter](https://registry.terraform.io/providers/alekc/kubectl/latest/docs/data-sources/file_documents) | data source |
| [kubectl_file_documents.kong_crds](https://registry.terraform.io/providers/alekc/kubectl/latest/docs/data-sources/file_documents) | data source |
| [kubectl_file_documents.tigera-operator_crds](https://registry.terraform.io/providers/alekc/kubectl/latest/docs/data-sources/file_documents) | data source |
| [kubectl_path_documents.cert-manager_cluster_issuers](https://registry.terraform.io/providers/alekc/kubectl/latest/docs/data-sources/path_documents) | data source |

## Inputs

Expand Down
58 changes: 29 additions & 29 deletions helm-dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ dependencies:
version: 0.13.2
repository: https://charts.admiralty.io
- name: secrets-store-csi-driver
version: 1.3.4
version: 1.4.1
repository: https://kubernetes-sigs.github.io/secrets-store-csi-driver/charts
- name: aws-ebs-csi-driver
version: 2.25.0
version: 2.27.0
repository: https://kubernetes-sigs.github.io/aws-ebs-csi-driver
- name: aws-efs-csi-driver
version: 2.5.1
version: 2.5.4
repository: https://kubernetes-sigs.github.io/aws-efs-csi-driver
- name: aws-for-fluent-bit
version: 0.1.31
version: 0.1.32
repository: https://aws.github.io/eks-charts
- name: aws-load-balancer-controller
version: 1.6.2
Expand All @@ -24,97 +24,97 @@ dependencies:
version: 0.21.0
repository: https://aws.github.io/eks-charts
- name: cert-manager
version: v1.13.2
version: v1.13.3
repository: https://charts.jetstack.io
- name: cert-manager-csi-driver
version: v0.5.0
version: v0.6.0
repository: https://charts.jetstack.io
- name: cluster-autoscaler
version: 9.29.4
version: 9.34.1
repository: https://kubernetes.github.io/autoscaler
- name: external-dns
version: 1.13.1
version: 1.14.3
repository: https://kubernetes-sigs.github.io/external-dns/
- name: flux
version: 1.13.3
repository: https://charts.fluxcd.io
- name: ingress-nginx
version: 4.8.3
version: 4.9.0
repository: https://kubernetes.github.io/ingress-nginx
- name: k8gb
version: v0.11.5
version: v0.12.2
repository: https://www.k8gb.io
- name: karma
version: 1.7.2
repository: https://charts.helm.sh/stable
- name: karpenter
version: v0.32.1
version: v0.33.1
repository: oci://public.ecr.aws/karpenter
- name: keda
version: 2.12.0
version: 2.13.1
repository: https://kedacore.github.io/charts
- name: kong
version: 2.31.0
version: 2.34.0
repository: https://charts.konghq.com
- name: kube-prometheus-stack
version: 54.0.1
version: 56.1.0
repository: https://prometheus-community.github.io/helm-charts
- name: linkerd2-cni
version: 30.12.1
version: 30.12.2
repository: https://helm.linkerd.io/stable
- name: linkerd-control-plane
version: 1.16.4
version: 1.16.10
repository: https://helm.linkerd.io/stable
- name: linkerd-crds
version: 1.8.0
repository: https://helm.linkerd.io/stable
- name: linkerd-viz
version: 30.12.4
version: 30.12.10
repository: https://helm.linkerd.io/stable
- name: loki
version: 5.36.3
version: 5.41.8
repository: https://grafana.github.io/helm-charts
- name: promtail
version: 6.15.3
version: 6.15.4
repository: https://grafana.github.io/helm-charts
- name: metrics-server
version: 3.11.0
repository: https://kubernetes-sigs.github.io/metrics-server/
- name: node-problem-detector
version: 2.3.11
version: 2.3.12
repository: https://charts.deliveryhero.io/
- name: prometheus-adapter
version: 4.8.1
version: 4.9.0
repository: https://prometheus-community.github.io/helm-charts
- name: prometheus-cloudwatch-exporter
version: 0.25.2
version: 0.25.3
repository: https://prometheus-community.github.io/helm-charts
- name: prometheus-blackbox-exporter
version: 8.4.0
version: 8.10.0
repository: https://prometheus-community.github.io/helm-charts
- name: scaleway-webhook
version: v0.0.1
repository: https://particuleio.github.io/charts
- name: sealed-secrets
version: 2.13.2
version: 2.14.2
repository: https://bitnami-labs.github.io/sealed-secrets
- name: thanos
version: 12.15.0
version: 12.22.0
repository: https://charts.bitnami.com/bitnami
- name: tigera-operator
version: v3.26.3
version: v3.27.0
repository: https://docs.projectcalico.org/charts
- name: traefik
version: 25.0.0
version: 26.0.0
repository: https://helm.traefik.io/traefik
- name: memcached
version: 6.7.0
version: 6.9.0
repository: https://charts.bitnami.com/bitnami
- name: velero
version: 4.4.1
repository: https://vmware-tanzu.github.io/helm-charts
- name: victoria-metrics-k8s-stack
version: 0.18.6
version: 0.18.11
repository: https://victoriametrics.github.io/helm-charts/
- name: yet-another-cloudwatch-exporter
version: 0.14.0
Expand Down
Loading

0 comments on commit c40cdee

Please sign in to comment.