From 117ee6be491b601d314e8672619cfb3e20367d25 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Fri, 14 May 2021 00:11:13 +0200 Subject: [PATCH] fix: fix broken CRDs handling for ECK operator --- charts/kubezero-logging/Chart.yaml | 4 +- charts/kubezero-logging/README.md | 28 +- .../charts/eck-operator/.helmignore | 23 + .../charts/eck-operator/Chart.yaml | 20 + .../charts/eck-operator/README.md | 20 + .../charts/eck-operator/crds/all-crds.yaml | 3539 +++++++++++++++++ .../charts/eck-operator/profile-global.yaml | 6 + .../charts/eck-operator/profile-istio.yaml | 11 + .../eck-operator/profile-restricted.yaml | 12 + .../profile-soft-multi-tenancy.yaml | 18 + .../charts/eck-operator/templates/NOTES.txt | 2 + .../eck-operator/templates/_helpers.tpl | 333 ++ .../eck-operator/templates/cluster-roles.yaml | 63 + .../eck-operator/templates/configmap.yaml | 43 + .../templates/managed-namespaces.yaml | 13 + .../templates/managed-ns-network-policy.yaml | 228 ++ .../templates/operator-namespace.yaml | 10 + .../templates/operator-network-policy.yaml | 59 + .../eck-operator/templates/role-bindings.yaml | 80 + .../templates/service-account.yaml | 14 + .../eck-operator/templates/statefulset.yaml | 118 + .../templates/validate-chart.yaml | 23 + .../eck-operator/templates/webhook.yaml | 329 ++ .../charts/eck-operator/values.yaml | 177 + charts/kubezero-logging/update.sh | 11 + 25 files changed, 5173 insertions(+), 11 deletions(-) create mode 100644 charts/kubezero-logging/charts/eck-operator/.helmignore create mode 100644 charts/kubezero-logging/charts/eck-operator/Chart.yaml create mode 100644 charts/kubezero-logging/charts/eck-operator/README.md create mode 100644 charts/kubezero-logging/charts/eck-operator/crds/all-crds.yaml create mode 100644 charts/kubezero-logging/charts/eck-operator/profile-global.yaml create mode 100644 charts/kubezero-logging/charts/eck-operator/profile-istio.yaml create mode 100644 charts/kubezero-logging/charts/eck-operator/profile-restricted.yaml create mode 100644 charts/kubezero-logging/charts/eck-operator/profile-soft-multi-tenancy.yaml create mode 100644 charts/kubezero-logging/charts/eck-operator/templates/NOTES.txt create mode 100644 charts/kubezero-logging/charts/eck-operator/templates/_helpers.tpl create mode 100644 charts/kubezero-logging/charts/eck-operator/templates/cluster-roles.yaml create mode 100644 charts/kubezero-logging/charts/eck-operator/templates/configmap.yaml create mode 100644 charts/kubezero-logging/charts/eck-operator/templates/managed-namespaces.yaml create mode 100644 charts/kubezero-logging/charts/eck-operator/templates/managed-ns-network-policy.yaml create mode 100644 charts/kubezero-logging/charts/eck-operator/templates/operator-namespace.yaml create mode 100644 charts/kubezero-logging/charts/eck-operator/templates/operator-network-policy.yaml create mode 100644 charts/kubezero-logging/charts/eck-operator/templates/role-bindings.yaml create mode 100644 charts/kubezero-logging/charts/eck-operator/templates/service-account.yaml create mode 100644 charts/kubezero-logging/charts/eck-operator/templates/statefulset.yaml create mode 100644 charts/kubezero-logging/charts/eck-operator/templates/validate-chart.yaml create mode 100644 charts/kubezero-logging/charts/eck-operator/templates/webhook.yaml create mode 100644 charts/kubezero-logging/charts/eck-operator/values.yaml diff --git a/charts/kubezero-logging/Chart.yaml b/charts/kubezero-logging/Chart.yaml index 4f5c239c..38c97efe 100644 --- a/charts/kubezero-logging/Chart.yaml +++ b/charts/kubezero-logging/Chart.yaml @@ -3,7 +3,7 @@ name: kubezero-logging description: KubeZero Umbrella Chart for complete EFK stack type: application version: 0.6.5 -appVersion: 1.4.1 +appVersion: 1.5.0 home: https://kubezero.com icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png keywords: @@ -20,7 +20,7 @@ dependencies: repository: https://zero-down-time.github.io/kubezero/ - name: eck-operator version: 1.5.0 - repository: https://helm.elastic.co + # 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 89edc99a..171c670f 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 ^(?