From fb95ba9024020ad281af89d9368311edc0ee5c7e Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Wed, 12 May 2021 16:32:24 +0200 Subject: [PATCH] chore: checkin diffs to sync desktop --- .versionrc | 2 ++ charts/kubeadm/README.md.gotmpl | 1 + charts/kubezero-lib/templates/_helpers.tpl | 1 + .../templates/eck/elasticsearch.yaml | 2 +- charts/kubezero-redis/README.md.gotmpl | 1 + charts/kubezero-timecapsule/values.yaml | 8 ++++---- charts/kubezero/Makefile | 5 +++++ docs/Upgrade-2.20.md | 5 +++-- docs/_release_hugo.md | 12 ++++++++++++ 9 files changed, 30 insertions(+), 7 deletions(-) create mode 100644 .versionrc create mode 100644 charts/kubezero/Makefile create mode 100644 docs/_release_hugo.md diff --git a/.versionrc b/.versionrc new file mode 100644 index 00000000..5795d32c --- /dev/null +++ b/.versionrc @@ -0,0 +1,2 @@ +# template: "/tmp/doesntexist" +linkReferences: true diff --git a/charts/kubeadm/README.md.gotmpl b/charts/kubeadm/README.md.gotmpl index fce4c948..ab835c66 100644 --- a/charts/kubeadm/README.md.gotmpl +++ b/charts/kubeadm/README.md.gotmpl @@ -29,6 +29,7 @@ Installs the Istio control plane - https://kubernetes.io/docs/setup/production-environment/tools/kubeadm/troubleshooting-kubeadm/ - https://godoc.org/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2 +- https://pkg.go.dev/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3 - https://github.com/kubernetes/kubernetes/blob/master/staging/src/k8s.io/kubelet/config/v1beta1/types.go - https://kubernetes.io/docs/setup/production-environment/tools/kubeadm/control-plane-flags/ - https://godoc.org/k8s.io/kube-proxy/config/v1alpha1#KubeProxyConfiguration diff --git a/charts/kubezero-lib/templates/_helpers.tpl b/charts/kubezero-lib/templates/_helpers.tpl index 808f73b8..a0b2c7eb 100644 --- a/charts/kubezero-lib/templates/_helpers.tpl +++ b/charts/kubezero-lib/templates/_helpers.tpl @@ -5,6 +5,7 @@ Common set of labels helm.sh/chart: {{ include "kubezero-lib.chart" . }} app.kubernetes.io/name: {{ include "kubezero-lib.name" . }} app.kubernetes.io/managed-by: {{ .Release.Service }} +app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/part-of: kubezero {{- end -}} diff --git a/charts/kubezero-logging/templates/eck/elasticsearch.yaml b/charts/kubezero-logging/templates/eck/elasticsearch.yaml index 5fdc70c7..145f3d2b 100644 --- a/charts/kubezero-logging/templates/eck/elasticsearch.yaml +++ b/charts/kubezero-logging/templates/eck/elasticsearch.yaml @@ -72,7 +72,7 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - matchExpressions: - - key: failure-domain.beta.kubernetes.io/zone + - key: topology.kubernetes.io/zone operator: In values: - {{ .zone }} diff --git a/charts/kubezero-redis/README.md.gotmpl b/charts/kubezero-redis/README.md.gotmpl index bda58610..3fc4fc78 100644 --- a/charts/kubezero-redis/README.md.gotmpl +++ b/charts/kubezero-redis/README.md.gotmpl @@ -21,6 +21,7 @@ https://grafana.com/grafana/dashboards/11835 ## Redis # Resources +- https://ot-container-kit.github.io/redis-operator/ - https://github.com/helm/charts/tree/master/stable/redis - https://github.com/rustudorcalin/deploying-redis-cluster - diff --git a/charts/kubezero-timecapsule/values.yaml b/charts/kubezero-timecapsule/values.yaml index b197d8a9..3fe4cfb3 100644 --- a/charts/kubezero-timecapsule/values.yaml +++ b/charts/kubezero-timecapsule/values.yaml @@ -6,8 +6,8 @@ gemini: resources: requests: - memory: 64Mi - cpu: 50m + memory: 32Mi + cpu: 20m limits: - memory: 256Mi - cpu: 200m + memory: 128Mi + cpu: 400m diff --git a/charts/kubezero/Makefile b/charts/kubezero/Makefile new file mode 100644 index 00000000..e8c15cb5 --- /dev/null +++ b/charts/kubezero/Makefile @@ -0,0 +1,5 @@ +.PHONY: sync + +sync: + rm -rf scripts templates + cp -r ../../kubezero/charts/kubezero/* . diff --git a/docs/Upgrade-2.20.md b/docs/Upgrade-2.20.md index 6414a888..b6107876 100644 --- a/docs/Upgrade-2.20.md +++ b/docs/Upgrade-2.20.md @@ -42,11 +42,12 @@ Providing backup solutions for KubeZero clusters: ## Metrics - Added various dashboards for KubeZero modules - Updated / improved dashboard organization incl. folders and tags -- Grafana Dashboards are now all provided via configmaps, no more storing of state required +- Grafana Dashboards are now all provided via configmaps, no more state required, no manual changes persisted +- Grafana allows anonymous read-only access +- all dashboards ndefault to now-1h and prohibit less than 30s refresh - Custom dashboards can easily be provided by simple installing a ConfigMap along with workloads in any namespace - ## Upgrade - Without ArgoCD 1. Update CRDs of all enabled components: `./bootstrap.sh crds all clusters/$CLUSTER` diff --git a/docs/_release_hugo.md b/docs/_release_hugo.md new file mode 100644 index 00000000..61dce000 --- /dev/null +++ b/docs/_release_hugo.md @@ -0,0 +1,12 @@ +--- +title: "KubeZero release" +date: __now__ +author: Stefan Reimer +description : "KubeZero release" +summary: "Released KubeZero __tag__" +categories: +- News +- KubeZero +- Releases +--- +# Changelog