From 445017025cbd531b274868888660b4569f750969 Mon Sep 17 00:00:00 2001 From: Chris Alfano Date: Sun, 27 Mar 2022 14:06:30 -0400 Subject: [PATCH 1/2] chore(deps): target k8s 1.22 with all helm renders --- README.md | 4 ++++ k8s-common/.holo/lenses/cert-manager.toml | 2 +- k8s-common/.holo/lenses/grafana.toml | 2 +- k8s-common/.holo/lenses/ingress-nginx.toml | 2 +- k8s-common/.holo/lenses/loki.toml | 2 +- k8s-common/.holo/lenses/prometheus.toml | 2 +- k8s-common/.holo/lenses/promtail.toml | 2 +- k8s-common/.holo/lenses/sealed-secrets.toml | 2 +- 8 files changed, 11 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index cf62296..68fd8f4 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,10 @@ This template provides a common foundation for lightweight k8s clusters. +## Kubernetes version + +The current release targets **Kubernetes 1.22** + ## Getting started The `.holo/branches/k8s-manifests` tree defines a holobranch named `k8s-manifests`, which can be projected with the [`git-holo`](https://github.com/JarvusInnovations/hologit) tool: diff --git a/k8s-common/.holo/lenses/cert-manager.toml b/k8s-common/.holo/lenses/cert-manager.toml index faebfa8..196d1cb 100644 --- a/k8s-common/.holo/lenses/cert-manager.toml +++ b/k8s-common/.holo/lenses/cert-manager.toml @@ -1,5 +1,5 @@ [hololens] -package = "holo/lens-helm3/1.2" +package = "holo/lens-helm3/1.22" [hololens.helm] namespace = "cert-manager" diff --git a/k8s-common/.holo/lenses/grafana.toml b/k8s-common/.holo/lenses/grafana.toml index 8b3e0e1..ff39bae 100644 --- a/k8s-common/.holo/lenses/grafana.toml +++ b/k8s-common/.holo/lenses/grafana.toml @@ -1,5 +1,5 @@ [hololens] -package = "holo/lens-helm3/1.3" +package = "holo/lens-helm3/1.22" before = "k8s-normalize" [hololens.input] diff --git a/k8s-common/.holo/lenses/ingress-nginx.toml b/k8s-common/.holo/lenses/ingress-nginx.toml index 59cc29f..4432101 100644 --- a/k8s-common/.holo/lenses/ingress-nginx.toml +++ b/k8s-common/.holo/lenses/ingress-nginx.toml @@ -1,5 +1,5 @@ [hololens] -package = "holo/lens-helm3/1.4" +package = "holo/lens-helm3/1.22" [hololens.helm] namespace = "ingress-nginx" diff --git a/k8s-common/.holo/lenses/loki.toml b/k8s-common/.holo/lenses/loki.toml index 5f553e6..0166097 100644 --- a/k8s-common/.holo/lenses/loki.toml +++ b/k8s-common/.holo/lenses/loki.toml @@ -1,5 +1,5 @@ [hololens] -package = "holo/lens-helm3/1.3" +package = "holo/lens-helm3/1.22" before = "k8s-normalize" [hololens.input] diff --git a/k8s-common/.holo/lenses/prometheus.toml b/k8s-common/.holo/lenses/prometheus.toml index 5dbe1b7..f56ba67 100644 --- a/k8s-common/.holo/lenses/prometheus.toml +++ b/k8s-common/.holo/lenses/prometheus.toml @@ -1,5 +1,5 @@ [hololens] -package = "holo/lens-helm3/1.3" +package = "holo/lens-helm3/1.22" [hololens.helm] namespace = "prometheus" diff --git a/k8s-common/.holo/lenses/promtail.toml b/k8s-common/.holo/lenses/promtail.toml index 60c646a..3d3cbbc 100644 --- a/k8s-common/.holo/lenses/promtail.toml +++ b/k8s-common/.holo/lenses/promtail.toml @@ -1,5 +1,5 @@ [hololens] -package = "holo/lens-helm3/1.3" +package = "holo/lens-helm3/1.22" before = "k8s-normalize" [hololens.input] diff --git a/k8s-common/.holo/lenses/sealed-secrets.toml b/k8s-common/.holo/lenses/sealed-secrets.toml index 5d9ce34..8eddfcd 100644 --- a/k8s-common/.holo/lenses/sealed-secrets.toml +++ b/k8s-common/.holo/lenses/sealed-secrets.toml @@ -1,5 +1,5 @@ [hololens] -package = "holo/lens-helm3/1.5" +package = "holo/lens-helm3/1.22" [hololens.helm] namespace = "sealed-secrets" From 8b16e4b278719d60a57339dc834d8d616a674e9f Mon Sep 17 00:00:00 2001 From: Chris Alfano Date: Sun, 27 Mar 2022 14:08:22 -0400 Subject: [PATCH 2/2] docs: clarify supported k8s versions --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 68fd8f4..7ba9694 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,10 @@ This template provides a common foundation for lightweight k8s clusters. ## Kubernetes version -The current release targets **Kubernetes 1.22** +Currently supported Kubernetes API versions: + +- 1.21 +- 1.22 ## Getting started