kube-logging · pepov · Mar 29, 2023 · Mar 29, 2023 · Mar 29, 2023 · Mar 29, 2023
diff --git a/charts/logging-operator-logging/README.md b/charts/logging-operator-logging/README.md
@@ -1,3 +1,7 @@
 # Logging operator logging chart
 
-The chart has been relocated [here](https://github.com/kube-logging/helm-charts/tree/main/charts/logging-operator-logging).
+This chart has been relocated under e2e/charts where it is used to run the e2e tests with.
+
+All modifications should go there first, get tested and then synchronized to https://github.com/kube-logging/helm-charts/ where it is linted and released.
+
+This is an unfortunate temporary workflow, but the plan is to move the charts back here and release from this repo to an OCI registry in the near future.
diff --git a/charts/logging-operator/README.md b/charts/logging-operator/README.md
@@ -1,3 +1,7 @@
 # Logging operator chart
 
-The chart has been relocated [here](https://github.com/kube-logging/helm-charts/tree/main/charts/logging-operator).
+This chart has been relocated under e2e/charts where it is used to run the e2e tests with. 
+
+All modifications should go there first, get tested and then synchronized to https://github.com/kube-logging/helm-charts/ where it is linted and released.
+
+This is an unfortunate temporary workflow, but the plan is to move the charts back here and release from this repo to an OCI registry in the near future.
diff --git a/e2e/charts/logging-operator-logging/Chart.yaml b/e2e/charts/logging-operator-logging/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 type: application
 name: logging-operator-logging
-version: 4.1.0-dev.1
+version: 4.1.0-dev.2
 kubeVersion: ">=1.16.0-0"
 description: A Helm chart to configure logging resource for the Logging operator.
 keywords:
@@ -20,10 +20,12 @@ annotations:
     - name: fluent-bit
       image: fluent/fluent-bit:1.9.5
     - name: fluentd
-      image: ghcr.io/kube-logging/fluentd:v1.14.6
+      image: ghcr.io/kube-logging/fluentd:v1.14
     - name: syslog-ng
-      image: ghcr.io/axoflow/syslog-ng:4.0.1_git20230225
+      image: ghcr.io/axoflow/syslog-ng:4.1.1
     - name: logging-operator
       image: ghcr.io/kube-logging/logging-operator:4.0.0
     - name: config-reloader
       image: ghcr.io/kube-logging/config-reloader:v0.0.2
+    - name: node-exporter
+      image: ghcr.io/kube-logging/node-exporter:v0.3.0
diff --git a/e2e/charts/logging-operator-logging/README.md b/e2e/charts/logging-operator-logging/README.md
@@ -1,44 +1 @@
-# logging-operator-logging
-
-![version: 4.0.0-rc18-1](https://img.shields.io/badge/version-4.0.0--rc18--1-informational?style=flat-square) ![type: application](https://img.shields.io/badge/type-application-informational?style=flat-square) ![app version: 4.0.0-rc17](https://img.shields.io/badge/app%20version-4.0.0--rc17-informational?style=flat-square) ![kube version: >=1.16.0-0](https://img.shields.io/badge/kube%20version->=1.16.0--0-informational?style=flat-square) [![artifact hub](https://img.shields.io/badge/artifact%20hub-logging--operator--logging-informational?style=flat-square)](https://artifacthub.io/packages/helm/kube-logging/logging-operator-logging)
-
-A Helm chart to configure logging resource for the Logging operator.
-
-**Homepage:** <https://kube-logging.github.io>
-
-## TL;DR;
-
-```bash
-helm repo add kube-logging https://kube-logging.github.io/helm-charts
-helm install --generate-name --wait kube-logging/logging-operator-logging
-```
-
-## Values
-
-| Key | Type | Default | Description |
-|-----|------|---------|-------------|
-| loggingRef | string | `""` |  |
-| flowConfigCheckDisabled | bool | `false` |  |
-| flowConfigOverride | string | `""` |  |
-| nameOverride | string | `""` |  |
-| fullnameOverride | string | `""` |  |
-| enableRecreateWorkloadOnImmutableFieldChange | bool | `false` | Permit deletion and recreation of resources on update of immutable field. |
-| tls.enabled | bool | `true` | Enable secure connection between fluentd and fluent-bit |
-| tls.fluentdSecretName | string | `""` | Specified secret name, which contain tls certs |
-| tls.fluentbitSecretName | string | `""` | Specified secret name, which contain tls certs |
-| tls.sharedKey | string | `""` |  |
-| fluentbit | object | `{}` | Fluent-bit configurations https://banzaicloud.com/docs/one-eye/logging-operator/configuration/crds/v1beta1/fluentbit_types/ |
-| fluentd | object | `{}` | Fluentd configurations https://banzaicloud.com/docs/one-eye/logging-operator/configuration/crds/v1beta1/fluentd_types/ |
-| nodeAgents | object | `{}` | Node agents definitions |
-| skipInvalidResources | bool | `false` | Whether to skip invalid Flow and ClusterFlow resources |
-| watchNamespaces | list | `[]` | Limit namespaces from where to read Flow and Output specs |
-| clusterDomain | string | `"cluster.local"` | Cluster domain name to be used when templating URLs to services |
-| controlNamespace | string | `""` | Control namespace that contains ClusterOutput and ClusterFlow resources |
-| allowClusterResourcesFromAllNamespaces | bool | `false` | Allow configuration of cluster resources from any namespace |
-| defaultFlow | object | `{}` | Default flow |
-| globalFilters | list | `[]` | Global filters |
-| clusterFlows | list | `[]` | ClusterFlows to deploy |
-| clusterOutputs | list | `[]` | ClusterOutputs to deploy |
-| eventTailer | object | `{}` | EventTailer config |
-| hostTailer | object | `{}` | HostTailer config |
-| scc.enabled | bool | `false` | OpenShift SecurityContextConstraints enabled |
+This file will be generated in https://github.com/kube-logging/helm-charts/ by running `make docs` there
diff --git a/e2e/charts/logging-operator/Chart.yaml b/e2e/charts/logging-operator/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 type: application
 name: logging-operator
-version: 4.1.0-dev.1
+version: 4.1.0-dev.2
 appVersion: 4.0.0
 kubeVersion: ">=1.16.0-0"
 description: Logging operator for Kubernetes based on Fluentd and Fluentbit.

diff --git a/e2e/charts/logging-operator/README.md b/e2e/charts/logging-operator/README.md
@@ -1,69 +1 @@
-# logging-operator
-
-![version: 4.0.0-rc19-3](https://img.shields.io/badge/version-4.0.0--rc19--3-informational?style=flat-square) ![type: application](https://img.shields.io/badge/type-application-informational?style=flat-square) ![app version: 4.0.0-rc19](https://img.shields.io/badge/app%20version-4.0.0--rc19-informational?style=flat-square) ![kube version: >=1.16.0-0](https://img.shields.io/badge/kube%20version->=1.16.0--0-informational?style=flat-square) [![artifact hub](https://img.shields.io/badge/artifact%20hub-logging--operator-informational?style=flat-square)](https://artifacthub.io/packages/helm/kube-logging/logging-operator)
-
-Logging operator for Kubernetes based on Fluentd and Fluentbit.
-
-**Homepage:** <https://kube-logging.github.io>
-
-## TL;DR;
-
-```bash
-helm repo add kube-logging https://kube-logging.github.io/helm-charts
-helm install --generate-name --wait kube-logging/logging-operator
-```
-
-## Introduction
-
-This chart bootstraps a [Logging Operator](https://github.com/kube-logging/logging-operator) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager.
-
-## Prerequisites
-
-- Kubernetes 1.19+
-
-## Installing CRDs
-
-Use `createCustomResource=false` with Helm v3 to avoid trying to create CRDs from the `crds` folder and from templates at the same time.
-
-## Values
-
-| Key | Type | Default | Description |
-|-----|------|---------|-------------|
-| replicaCount | int | `1` |  |
-| image.repository | string | `"ghcr.io/kube-logging/logging-operator"` | Name of the image repository to pull the container image from. |
-| image.tag | string | `"4.0.0"` | Image tag override for the default value (chart appVersion). |
-| image.pullPolicy | string | `"IfNotPresent"` | [Image pull policy](https://kubernetes.io/docs/concepts/containers/images/#updating-images) for updating already existing images on a node. |
-| env | list | `[]` |  |
-| volumes | list | `[]` |  |
-| volumeMounts | list | `[]` |  |
-| extraArgs[0] | string | `"-enable-leader-election=true"` |  |
-| imagePullSecrets | list | `[]` |  |
-| nameOverride | string | `""` | A name in place of the chart name for `app:` labels. |
-| fullnameOverride | string | `""` | A name to substitute for the full names of resources. |
-| namespaceOverride | string | `""` | A namespace override for the app. |
-| watchNamespace | string | `""` | Namespace to watch for LoggingOperator Custom Resources. |
-| annotations | object | `{}` | Define annotations for logging-operator pods. |
-| createCustomResource | bool | `false` | Deploy CRDs used by Logging Operator. |
-| http.port | int | `8080` | HTTP listen port number. |
-| http.service | object | `{"annotations":{},"clusterIP":"None","labels":{},"type":"ClusterIP"}` | Service definition for query http service. |
-| rbac.enabled | bool | `true` | Create rbac service account and roles. |
-| rbac.psp.enabled | bool | `true` | Must be used with `rbac.enabled` true. If true, creates & uses RBAC resources required in the cluster with [Pod Security Policies](https://kubernetes.io/docs/concepts/policy/pod-security-policy/) enabled. |
-| rbac.psp.annotations | object | `{"seccomp.security.alpha.kubernetes.io/allowedProfileNames":"docker/default,runtime/default","seccomp.security.alpha.kubernetes.io/defaultProfileName":"runtime/default"}` | PSP annotations |
-| monitoring.serviceMonitor.enabled | bool | `false` | Create a Prometheus Operator ServiceMonitor object. |
-| monitoring.serviceMonitor.additionalLabels | object | `{}` |  |
-| monitoring.serviceMonitor.metricRelabelings | list | `[]` |  |
-| monitoring.serviceMonitor.relabelings | list | `[]` |  |
-| podSecurityContext | object | `{}` | Pod SecurityContext for Logging operator. [More info](https://kubernetes.io/docs/concepts/policy/security-context/) # SecurityContext holds pod-level security attributes and common container settings. # This defaults to non root user with uid 1000 and gid 2000.	*v1.PodSecurityContext	false # ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/ |
-| securityContext | object | `{}` | Container SecurityContext for Logging operator. [More info](https://kubernetes.io/docs/concepts/policy/security-context/) |
-| priorityClassName | object | `{}` | Operator priorityClassName. |
-| serviceAccount.annotations | object | `{}` | Define annotations for logging-operator ServiceAccount. |
-| resources | object | `{}` | CPU/Memory resource requests/limits |
-| nodeSelector | object | `{}` |  |
-| tolerations | list | `[]` | Node Tolerations |
-| affinity | object | `{}` | Node Affinity |
-| podLabels | object | `{}` | Define which Nodes the Pods are scheduled on. |
-
-## Installing Fluentd and Fluent-bit via logging
-
-The previous chart does **not** install `logging` resource to deploy Fluentd and Fluent-bit on cluster.
-To install them please use the [Logging Operator Logging](https://github.com/kube-logging/helm-charts/tree/main/charts/logging-operator-logging) chart.
+This file will be generated in https://github.com/kube-logging/helm-charts/ by running `make docs` there