diff --git a/.versionrc b/.versionrc new file mode 100644 index 0000000..5795d32 --- /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 fce4c94..ab835c6 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 808f73b..a0b2c7e 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/Chart.yaml b/charts/kubezero-logging/Chart.yaml index cf6db4a..38c97ef 100644 --- a/charts/kubezero-logging/Chart.yaml +++ b/charts/kubezero-logging/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: kubezero-logging description: KubeZero Umbrella Chart for complete EFK stack type: application -version: 0.6.4 -appVersion: 1.4.1 +version: 0.6.5 +appVersion: 1.5.0 home: https://kubezero.com icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png keywords: @@ -19,8 +19,8 @@ dependencies: version: ">= 0.1.3" repository: https://zero-down-time.github.io/kubezero/ - name: eck-operator - version: 1.4.1 - repository: https://helm.elastic.co + version: 1.5.0 + # repository: https://helm.elastic.co condition: eck-operator.enabled - name: fluentd version: 0.2.2 diff --git a/charts/kubezero-logging/README.md b/charts/kubezero-logging/README.md index 89edc99..171c670 100644 --- a/charts/kubezero-logging/README.md +++ b/charts/kubezero-logging/README.md @@ -1,6 +1,6 @@ # kubezero-logging -![Version: 0.6.2](https://img.shields.io/badge/Version-0.6.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.4.1](https://img.shields.io/badge/AppVersion-1.4.1-informational?style=flat-square) +![Version: 0.6.5](https://img.shields.io/badge/Version-0.6.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.5.0](https://img.shields.io/badge/AppVersion-1.5.0-informational?style=flat-square) KubeZero Umbrella Chart for complete EFK stack @@ -14,13 +14,13 @@ KubeZero Umbrella Chart for complete EFK stack ## Requirements -Kubernetes: `>= 1.16.0` +Kubernetes: `>= 1.18.0` | Repository | Name | Version | |------------|------|---------| -| | fluent-bit | 0.12.3 | +| | fluent-bit | 0.15.4 | | | fluentd | 0.2.2 | -| https://helm.elastic.co | eck-operator | 1.4.1 | +| https://helm.elastic.co | eck-operator | 1.5.0 | | https://zero-down-time.github.io/kubezero/ | kubezero-lib | >= 0.1.3 | ## Changes from upstream @@ -70,21 +70,31 @@ Kubernetes: `>= 1.16.0` | fluent-bit.config.customParsers | string | `"[PARSER]\n Name cri-log\n Format regex\n Regex ^(?